Changeset 1187 in tailor

Timestamp:

06/25/06 16:32:56 (7 years ago)

Author:

lele@…

Hash name:

20060625143256-97f81-d947ea871fb04712bd3b31d25fbca56cd4171e07

Message:

Fix repository instantiation
Don't use the logger, since we don't have one yet. The caller
will log something for us. Moved (and tested) the bzr specific
code into the pertaining unit.

Location:

vcpx

Files:

• repository/__init__.py (modified) (4 diffs)
• tests/tailor.py (modified) (2 diffs)
• repository/bzr.py (modified) (1 diff)

vcpx/repository/__init__.py

@@ -30 +30 @@
         """
 
-        from vcpx.source import InvocationError
+        from vcpx import TailorException
 
         kind = name[:name.index(':')]
@@ -40 +40 @@
             subclass = getattr(concrete, subclassname, klass)
         except SyntaxError, e:
-            self.log.exception("Cannot import %r from %r", kind, modname)
-            raise InvocationError("Cannot import %r: %s" % (kind, e))
-        except (AttributeError, ImportError), e:
-            self.log.critical("Cannot import %r from %r", kind, modname)
-            if kind == 'bzr':
-                from sys import version_info
-                if version_info < (2,4):
-                    self.log.warning("Bazaar-NG backend requires Python 2.4")
-            raise InvocationError("%r is not a known VCS kind: %s" %
-                                  (self.kind, e))
+            raise TailorException("Cannot import %r: %s" % (kind, e))
+        except (AttributeError, ImportError, AssertionError), e:
+            raise TailorException("%r is not a known VCS kind: %s" % (kind, e))
         instance = super(Repository, klass).__new__(subclass, name,
                                                     project, which)
@@ -168 +161 @@
         """
 
-        from vcpx.source import InvocationError
+        from vcpx import TailorException
 
         wdname = self.kind.capitalize() + 'WorkingDir'
@@ -177 +170 @@
         except SyntaxError, e:
             self.log.exception("Cannot import %r from %r", wdname, modname)
-            raise InvocationError("Cannot import %r: %s" % (wdname, e))
+            raise TailorException("Cannot import %r: %s" % (wdname, e))
         except (AttributeError, ImportError), e:
             self.log.critical("Cannot import %r from %r", wdname, modname)
-            if self.kind == 'bzr':
-                from sys import version_info
-                if version_info < (2,4):
-                    self.log.warning("Bazaar-NG backend requires Python 2.4")
-            raise InvocationError("%r is not a known VCS kind: %s" %
+            raise TailorException("%r is not a known VCS kind: %s" %
                                   (self.kind, e))
 

vcpx/tests/tailor.py

@@ -255 +255 @@
 from unittest import TestCase
 from cStringIO import StringIO
+from vcpx import TailorException
 from vcpx.config import Config
 from vcpx.tailor import Tailorizer
@@ -358 +359 @@
     "Test the BazaarNG source backend"
 
+    def testBazaarngAndPython23(self):
+        "Test we detect early when running under Python < 2.4"
+
+        from sys import version_info
+
+        if version_info < (2,4):
+            try:
+                self.tailorize('bazaarng2darcs')
+            except TailorException, e:
+                self.assert_("Bazaar-NG backend requires Python 2.4"
+                             in str(e))
+            else:
+                self.fail("Expected a specific TailorException")
+
     def testBazaarngToDarcs(self):
         "Test bazaar-ng to darcs"
 
-        self.tailorize('bazaarng2darcs')
+        try:
+            self.tailorize('bazaarng2darcs')
+        except TailorException, e:
+            from sys import version_info
+
+            if version_info < (2,4):
+                # Under python 2.3 we expect an exception here, but
+                # different from the above: since we are still in a
+                # single python session importing the bzr stuff does
+                # not raise the same error, because from the python
+                # runtime pov the module is already loaded and thus
+                # the second import does not fail. The repository
+                # class will then instantiate the raw Repository
+                # class, not the specific bzr one. Still, when asked
+                # for a working dir, it will fail again
+                self.assert_("object has no attribute 'BzrWorkingDir'"
+                             in str(e))
+            else:
+                raise
+
 
 

vcpx/repository/bzr.py

@@ -14 +14 @@
 
 __docformat__ = 'reStructuredText'
+
+
+from sys import version_info
+assert version_info >= (2,4), "Bazaar-NG backend requires Python 2.4"
+del version_info
 
 from bzrlib.osutils import normpath