[Python-checkins] r69398 - in python/branches/py3k/Lib/importlib: _bootstrap.py test/builtin/test_loader.py

[brett.cannon]

Author: brett.cannon
Date: Sat Feb  7 02:40:19 2009
New Revision: 69398

Log:
Move importlib's built-in importer to use rpartition for __package__.


Modified:
   python/branches/py3k/Lib/importlib/_bootstrap.py
   python/branches/py3k/Lib/importlib/test/builtin/test_loader.py

Modified: python/branches/py3k/Lib/importlib/_bootstrap.py
==============================================================================
--- python/branches/py3k/Lib/importlib/_bootstrap.py	(original)
+++ python/branches/py3k/Lib/importlib/_bootstrap.py	Sat Feb  7 02:40:19 2009
@@ -115,7 +115,9 @@
         """Load a built-in module."""
         if fullname not in sys.builtin_module_names:
             raise ImportError("{0} is not a built-in module".format(fullname))
-        return imp.init_builtin(fullname)
+        module = imp.init_builtin(fullname)
+        module.__package__ = ''
+        return module
 
 
 class FrozenImporter:

Modified: python/branches/py3k/Lib/importlib/test/builtin/test_loader.py
==============================================================================
--- python/branches/py3k/Lib/importlib/test/builtin/test_loader.py	(original)
+++ python/branches/py3k/Lib/importlib/test/builtin/test_loader.py	Sat Feb  7 02:40:19 2009
@@ -15,7 +15,7 @@
     assert 'errno' in sys.builtin_module_names
     name = 'errno'
 
-    verification = {'__name__': 'errno', '__package__': None}
+    verification = {'__name__': 'errno', '__package__': ''}
 
     def verify(self, module):
         """Verify that the module matches against what it should have."""