merge from HEAD;

Author: Richard Jones

CHANGES.txt

@@ -17,6 +17,7 @@ Fixed:
 - fix permission check on RetireAction (sf bug 1407342)
 - timezone now applied to date for pretty-format (sf bug 1406861)
 - fix mangling of "_" in mail Subject class name (sf bug 1413852)
+- catch bad classname in URL (related to sf bug 1240541)
 
 
 2005-10-07 0.8.5

roundup/cgi/client.py

@@ -1,4 +1,4 @@
-# $Id: client.py,v 1.211.2.4 2005-07-18 02:20:13 richard Exp $
+# $Id: client.py,v 1.211.2.5 2006-01-25 03:01:51 richard Exp $
 
 """WWW request handler (also used in the stand-alone server).
 """
@@ -563,7 +563,11 @@ def determine_context(self, dre=re.compile(r'([^\d]+)0*(\d+)')):
         if m:
             self.classname = m.group(1)
             self.nodeid = m.group(2)
-            if not self.db.getclass(self.classname).hasnode(self.nodeid):
+            try:
+                klass = self.db.getclass(self.classname)
+            except KeyError:
+                raise NotFound, '%s/%s'%(self.classname, self.nodeid)
+            if not klass.hasnode(self.nodeid):
                 raise NotFound, '%s/%s'%(self.classname, self.nodeid)
             # with a designator, we default to item view
             self.template = 'item'