Changeset 595 in tailor

Timestamp:

08/16/05 22:32:52 (8 years ago)

Author:

lele@…

Hash name:

20050816203252-97f81-8d6dc8020b5591b3b1c352adbfd0beb8e7a619ab

Message:

Collect the possible exceptions in the vcpx module

Files:

• tailor (modified) (2 diffs)
• vcpx/__init__.py (modified) (1 diff)
• vcpx/config.py (modified) (1 diff)
• vcpx/project.py (modified) (2 diffs)

tailor

@@ -24 +24 @@
         main(module='vcpx.tests', argv=sys.argv)
     else:
-        from vcpx.tailor import main, ExistingProjectError, ProjectNotTailored
-        from vcpx.target import TargetInitializationFailure
-        from vcpx.source import InvocationError, GetUpstreamChangesetsFailure,\
-             ChangesetApplicationFailure
-        from vcpx.cvsps import EmptyRepositoriesFoolsMe
-        from vcpx.config import ConfigurationError
+        from vcpx import *
 
         if len(sys.argv) == 1:
@@ -36 +31 @@
         try:
             main()
-        except (ExistingProjectError, ProjectNotTailored,
-                TargetInitializationFailure, EmptyRepositoriesFoolsMe,
-                InvocationError, GetUpstreamChangesetsFailure,
-                ChangesetApplicationFailure, ConfigurationError), exc:
+        except TailorExceptions, exc:
             print "%s: %s" % (exc.__doc__, exc)
         except UnicodeEncodeError, exc:

vcpx/__init__.py

@@ -16 +16 @@
 
 __docformat__ = 'reStructuredText'
+
+from vcpx.tailor import main, ExistingProjectError, ProjectNotTailored
+from vcpx.target import TargetInitializationFailure
+from vcpx.source import InvocationError, GetUpstreamChangesetsFailure,\
+     ChangesetApplicationFailure
+from vcpx.cvsps import EmptyRepositoriesFoolsMe
+from vcpx.config import ConfigurationError
+from vcpx.project import UnknownProjectError
+
+TailorExceptions = (ExistingProjectError, ProjectNotTailored,
+                    TargetInitializationFailure, EmptyRepositoriesFoolsMe,
+                    InvocationError, GetUpstreamChangesetsFailure,
+                    ChangesetApplicationFailure, ConfigurationError,
+                    UnknownProjectError)

vcpx/config.py

@@ -16 +16 @@
 class ConfigurationError(Exception):
     """Configuration error"""
-
-class UnknownProjectError(Exception):
-    "Project does not exist"
 
 class Config(SafeConfigParser):

vcpx/project.py

@@ -53 +53 @@
 
 
+class UnknownProjectError(Exception):
+    "Project does not exist"
+
+
 class Project(object):
     """
@@ -60 +64 @@
 
     def __init__(self, name, config):
+        if not config.has_section(name):
+            raise UnknownProjectError("'%s' is not a known project" % name)
+
         self.config = config
         self.name = name