- adjust importlater to import the full path, break out of "import" problems with...

[ticket:1983]

diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index 8665cd0d4ac699d8ec075ae9bcfa7427aec4c2c9..dafba8250242441dd8422cdae2bd812d64c93d97 100644 (file)
--- 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)
                     )