Changeset 707

Timestamp:

10/03/05 02:23:37

Author:

fumanchu

Message:

Fix for #307. Made InternalError? a subclass of HTTPError(500). Removed all use of InternalError? from the framework; it should be removed in 2.2.

Files:

• trunk/cherrypy/_cperror.py (modified) (2 diffs)
• trunk/cherrypy/_cputil.py (modified) (2 diffs)

trunk/cherrypy/_cperror.py

@@ -30 +30 @@
-
-class Error(Exception):
-    pass
-
-class InternalError(Error):
-    """ Error that should never happen """
-    pass
-
@@ -216 +212 @@
-        self.args = (path,)
-        HTTPError.__init__(self, 404, "The path %s was not found." % repr(path))
+
+
+class InternalError(HTTPError):
+    """ Error that should never happen """
+    
+    def __init__(self, message=None):
+        HTTPError.__init__(self, 500, message)

trunk/cherrypy/_cputil.py

@@ -90 +90 @@
-        return globals()[name]
-    except KeyError:
-raise cherrypy.InternalError("Special attribute %s could not be found"
-                             % repr(name)
+msg = "Special attribute %s could not be found" % repr(name)
+raise cherrypy.HTTPError(500, msg
-
-def getSpecialAttributePath(name):
@@ -102 +102 @@
-            if hasattr(objectList[i], name):
-                return "/" + "/".join(pathList[:i] + [name])
-raise cherrypy.InternalError("Special attribute %s could not be found"
-                             % repr(name)
+msg = "Special attribute %s could not be found" % repr(name)
+raise cherrypy.HTTPError(500, msg
-
-