[Python-checkins] r45896 - python/branches/release24-maint/Lib/imputil.py

[georg.brandl]

Author: georg.brandl
Date: Thu May  4 07:08:19 2006
New Revision: 45896

Modified:
   python/branches/release24-maint/Lib/imputil.py
Log:
Bug #1481530: allow "from os.path import ..." with imputil
 (backport from rev. 45895)

Modified: python/branches/release24-maint/Lib/imputil.py
==============================================================================
--- python/branches/release24-maint/Lib/imputil.py	(original)
+++ python/branches/release24-maint/Lib/imputil.py	Thu May  4 07:08:19 2006
@@ -131,9 +131,12 @@
         if importer:
             return importer._finish_import(top_module, parts[1:], fromlist)
 
-        # Grrr, some people "import os.path"
+        # Grrr, some people "import os.path" or do "from os.path import ..."
         if len(parts) == 2 and hasattr(top_module, parts[1]):
-            return top_module
+            if fromlist:
+                return getattr(top_module, parts[1])
+            else:
+                return top_module
 
         # If the importer does not exist, then we have to bail. A missing
         # importer means that something else imported the module, and we have