Merge pull request #17 from AspenWeb/exceptions-cleanup

Clean up exceptions

aspen/configuration/__init__.py

@@ -5,21 +5,10 @@
 
 import os
 
+from ..exceptions import ConfigurationError
 from ..utils import ascii_dammit
 
 
-class ConfigurationError(StandardError):
-    """This is an error in any part of our configuration.
-    """
-
-    def __init__(self, msg):
-        StandardError.__init__(self)
-        self.msg = msg
-
-    def __str__(self):
-        return self.msg
-
-
 def configure(knobs, d, env_prefix, kwargs):
     for name, (default, func) in sorted(knobs.items()):
 

aspen/exceptions.py

@@ -4,6 +4,18 @@
 from __future__ import unicode_literals
 
 
+class ConfigurationError(Exception):
+    """This is an error in any part of our configuration.
+    """
+
+    def __init__(self, msg):
+        Exception.__init__(self)
+        self.msg = msg
+
+    def __str__(self):
+        return self.msg
+
+
 class LoadError(Exception):
     """Represent a problem loading a resource.
     """
@@ -19,3 +31,10 @@ def __init__(self, accept, available_types):
 
     def __str__(self):
         return self.message
+
+
+class TypecastError(Exception):
+
+    def __init__(self, extension):
+        self.msg = "Failure to typecast extension '{0}'".format(extension)
+        Exception.__init__(self)

aspen/request_processor/typecasting.py

@@ -6,11 +6,8 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
+from ..exceptions import TypecastError
 
-class TypecastError(Exception):
-    def __init__(self, extension):
-        self.msg = "Failure to typecast extension '{0}'".format(extension)
-        Exception.__init__(self)
 
 """
    A typecast dict (like 'defaults' below) is a map of

aspen/resources.py

@@ -15,17 +15,13 @@
 import sys
 import traceback
 
+from .exceptions import LoadError
 from .http.resource import Dynamic, Static
 
 
 __cache__ = dict()  # cache, keyed to filesystem path
 
 
-class LoadError(Exception):
-    """Represent a problem loading a resource.
-    """
-
-
 class Entry:
     """An entry in the global resource cache.
     """

tests/test_dispatcher.py

@@ -7,7 +7,8 @@
 import os
 from pytest import raises
 
-from aspen.request_processor import dispatcher, typecasting
+from aspen.exceptions import TypecastError
+from aspen.request_processor import dispatcher
 
 
 # Helpers
@@ -205,7 +206,7 @@ def test_virtual_path_typecasts_to_int(harness):
 
 def test_virtual_path_raises_on_bad_typecast(harness):
     harness.fs.www.mk(('%year.int/foo.html', "Greetings, program!"),)
-    raises(typecasting.TypecastError, assert_fs, harness, '/I am not a year./foo.html', '')
+    raises(TypecastError, assert_fs, harness, '/I am not a year./foo.html', '')
 
 def test_virtual_path_raises_on_direct_access(harness):
     assert_raises_NotFound(harness, '/%name/foo.html', '')