[Python-checkins] r58229 - in sandbox/trunk/import_in_py: Py3K/_importlib.py _importlib.py

[brett.cannon]

Author: brett.cannon
Date: Sat Sep 22 06:37:49 2007
New Revision: 58229

Modified:
   sandbox/trunk/import_in_py/Py3K/_importlib.py
   sandbox/trunk/import_in_py/_importlib.py
Log:
Fix the temporary __all__ setting to not overwrite __name__ and such in
importlib when it performs is ``import *``.


Modified: sandbox/trunk/import_in_py/Py3K/_importlib.py
==============================================================================
--- sandbox/trunk/import_in_py/Py3K/_importlib.py	(original)
+++ sandbox/trunk/import_in_py/Py3K/_importlib.py	Sat Sep 22 06:37:49 2007
@@ -973,4 +973,4 @@
 
 # XXX Eventually replace with a proper __all__ value (i.e., don't expose os
 # replacements but do expose _ExtensionFileLoader, etc. for testing).
-__all__ = list(globals().keys())
+__all__ = [obj for obj in globals().keys() if not obj.startswith('__')]

Modified: sandbox/trunk/import_in_py/_importlib.py
==============================================================================
--- sandbox/trunk/import_in_py/_importlib.py	(original)
+++ sandbox/trunk/import_in_py/_importlib.py	Sat Sep 22 06:37:49 2007
@@ -973,4 +973,4 @@
 
 # XXX Eventually replace with a proper __all__ value (i.e., don't expose os
 # replacements but do expose _ExtensionFileLoader, etc. for testing).
-__all__ = globals().keys()
+__all__ = [name for name in globals().keys() if name[:2] not in ('__', '_[')]