From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 25 Nov 2010 15:36:31 +0000 (-0500)
Subject: - adjust importlater to import the full path, break out of "import" problems with... 
X-Git-Tag: rel_0_6_6~31^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5247c244ca6595f2685f1c0c271618eda7cb5e62;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- adjust importlater to import the full path, break out of "import" problems with ImportError,
[ticket:1983]
---

diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index 8665cd0d4a..dafba82502 100644
--- a/lib/sqlalchemy/util.py
+++ b/lib/sqlalchemy/util.py
@@ -1578,14 +1578,17 @@ class importlater(object):
     
     @memoized_property
     def _il_module(self):
-        m = __import__(self._il_path)
+        if self._il_addtl:
+            m = __import__(self._il_path + "." + self._il_addtl)
+        else:
+            m = __import__(self._il_path)
         for token in self._il_path.split(".")[1:]:
             m = getattr(m, token)
         if self._il_addtl:
             try:
                 return getattr(m, self._il_addtl)
             except AttributeError:
-                raise AttributeError(
+                raise ImportError(
                         "Module %s has no attribute '%s'" % 
                         (self._il_path, self._il_addtl)
                     )