Changeset 1612 for trunk

Timestamp:

Nov 11, 2008, 3:50:12 AM (16 years ago)

Author:

broder

Message:

Move CodeError? and InvalidInput? into invirt.common

Location:

trunk/packages

Files:

• invirt-base/debian/changelog (modified) (1 diff)
• invirt-base/python/invirt/common.py (modified) (1 diff)
• invirt-web/code/controls.py (modified) (1 diff)
• invirt-web/code/main.py (modified) (2 diffs)
• invirt-web/code/validation.py (modified) (1 diff)
• invirt-web/code/webcommon.py (modified) (1 diff)

trunk/packages/invirt-base/debian/changelog

@@ +1 @@
+invirt-base (0.0.9) unstable; urgency=low
+
+  * Move useful Python exceptions into invirt.common
+
+ -- Evan Broder <broder@mit.edu>  Tue, 11 Nov 2008 00:32:19 -0500
+
 invirt-base (0.0.8) unstable; urgency=low
 

trunk/packages/invirt-base/python/invirt/common.py

@@ -38 +38 @@
 
 #
+# Exceptions.
+#
+
+class InvalidInput(Exception):
+    """Exception for user-provided input is invalid but maybe in good faith.
+
+    This would include setting memory to negative (which might be a
+    typo) but not setting an invalid boot CD (which requires bypassing
+    the select box).
+    """
+    def __init__(self, err_field, err_value, expl=None):
+        MyException.__init__(self, expl)
+        self.err_field = err_field
+        self.err_value = err_value
+
+class CodeError(Exception):
+    """Exception for internal errors or bad faith input."""
+    pass
+
+#
 # Tests.
 #

trunk/packages/invirt-web/code/controls.py

@@ -4 +4 @@
 
 import validation
-from webcommon import CodeError, InvalidInput
+from invirt.common import CodeError, InvalidInput
 import random
 import subprocess

trunk/packages/invirt-web/code/main.py

@@ -37 +37 @@
 import validation
 import cache_acls
-from webcommon import InvalidInput, CodeError, State
+from webcommon import State
 import controls
 from getafsgroups import getAfsGroupMembers
@@ -43 +43 @@
 from invirt.database import Machine, CDROM, session, connect, MachineAccess, Type, Autoinstall
 from invirt.config import structs as config
+from invirt.common import InvalidInput, CodeError
 
 def pathSplit(path):

trunk/packages/invirt-web/code/validation.py

@@ -8 +8 @@
 from invirt.database import Machine, NIC, Type, Disk, CDROM, Autoinstall
 from invirt.config import structs as config
-from webcommon import InvalidInput
+from invirt.common import InvalidInput
 
 MAX_MEMORY_TOTAL = 512

trunk/packages/invirt-web/code/webcommon.py

@@ -4 +4 @@
 from invirt import database
 from invirt.database import Machine, MachineAccess
-
-class MyException(Exception):
-    """Base class for my exceptions"""
-    pass
-
-class InvalidInput(MyException):
-    """Exception for user-provided input is invalid but maybe in good faith.
-
-    This would include setting memory to negative (which might be a
-    typo) but not setting an invalid boot CD (which requires bypassing
-    the select box).
-    """
-    def __init__(self, err_field, err_value, expl=None):
-        MyException.__init__(self, expl)
-        self.err_field = err_field
-        self.err_value = err_value
-
-class CodeError(MyException):
-    """Exception for internal errors or bad faith input."""
-    pass
 
 import controls