-

cool-RR · cool-RR · commit c82d9a488f8c · 2011-07-28T21:56:21.000+02:00
diff --git a/garlicsim/garlicsim/general_misc/exceptions.py b/garlicsim/garlicsim/general_misc/exceptions.py
@@ -14,7 +14,8 @@ def __init__(self, message=None):
         # to force an empty message.
         
         if message is None:
-            if self.__doc__ and (type(self) is not CuteException):
+            if self.__doc__ and \
+                        (type(self) not in (CuteBaseException, CuteException)):
                 message = self.__doc__.strip().split('\n')[0] 
                 # Getting the first line of the documentation
             else:
@@ -32,7 +33,7 @@ def __init__(self, message=None):
         '''
         
 
-class CuteException(Exception, CuteBaseException):
+class CuteException(CuteBaseException, Exception):
     '''Exception that uses its first docstring line in lieu of a message.'''
     
 
diff --git a/garlicsim/test_garlicsim/test_general_misc/test_exceptions/__init__.py b/garlicsim/test_garlicsim/test_general_misc/test_exceptions/__init__.py
@@ -0,0 +1,4 @@
+# Copyright 2009-2011 Ram Rachum.
+# This program is distributed under the LGPL2.1 license.
+
+'''Testing package for `garlicsim.general_misc.exceptions`.'''
diff --git a/garlicsim/test_garlicsim/test_general_misc/test_exceptions/test_cute_base_exception.py b/garlicsim/test_garlicsim/test_general_misc/test_exceptions/test_cute_base_exception.py
@@ -0,0 +1,44 @@
+# Copyright 2009-2011 Ram Rachum.
+# This program is distributed under the LGPL2.1 license.
+
+'''Testing package for `exceptions.CuteBaseException`.'''
+
+from garlicsim.general_misc import cute_testing
+
+from garlicsim.general_misc.exceptions import CuteBaseException, CuteException
+
+
+def test():
+        
+    try:
+        raise CuteBaseException
+    except BaseException, base_exception:
+        assert base_exception.message == ''
+    else:
+        raise cute_testing.Failure
+        
+    try:
+        raise CuteBaseException()
+    except BaseException, base_exception:
+        assert base_exception.message == ''
+    else:
+        raise cute_testing.Failure
+        
+        
+    class MyBaseException(CuteBaseException):
+        '''My hovercraft is full of eels.'''
+        
+        
+    try:
+        raise MyBaseException()
+    except BaseException, base_exception:
+        assert base_exception.message == '''My hovercraft is full of eels.'''
+    else:
+        raise cute_testing.Failure
+        
+    try:
+        raise MyBaseException
+    except BaseException, base_exception:
+        assert base_exception.message == '''My hovercraft is full of eels.'''
+    else:
+        raise cute_testing.Failure
diff --git a/garlicsim/test_garlicsim/test_general_misc/test_exceptions/test_cute_exception.py b/garlicsim/test_garlicsim/test_general_misc/test_exceptions/test_cute_exception.py
@@ -0,0 +1,44 @@
+# Copyright 2009-2011 Ram Rachum.
+# This program is distributed under the LGPL2.1 license.
+
+'''Testing package for `exceptions.CuteException`.'''
+
+from garlicsim.general_misc import cute_testing
+
+from garlicsim.general_misc.exceptions import CuteBaseException, CuteException
+
+
+def test():
+        
+    try:
+        raise CuteException
+    except Exception, exception:
+        assert exception.message == ''
+    else:
+        raise cute_testing.Failure
+        
+    try:
+        raise CuteException()
+    except Exception, exception:
+        assert exception.message == ''
+    else:
+        raise cute_testing.Failure
+        
+        
+    class MyException(CuteException):
+        '''My hovercraft is full of eels.'''
+        
+        
+    try:
+        raise MyException()
+    except Exception, exception:
+        assert exception.message == '''My hovercraft is full of eels.'''
+    else:
+        raise cute_testing.Failure
+        
+    try:
+        raise MyException
+    except Exception, exception:
+        assert exception.message == '''My hovercraft is full of eels.'''
+    else:
+        raise cute_testing.Failure
