Avoid import loop in Python 3.3. Fixes #304.

--HG--
branch : distribute
extra : rebase_source : 8ce699d489f708a68338b2417771854174a734e8

distribute.egg-info/entry_points.txt

+[distutils.commands]
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+setopt = setuptools.command.setopt:setopt
+egg_info = setuptools.command.egg_info:egg_info
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+register = setuptools.command.register:register
+build_py = setuptools.command.build_py:build_py
+sdist = setuptools.command.sdist:sdist
+upload_docs = setuptools.command.upload_docs:upload_docs
+rotate = setuptools.command.rotate:rotate
+alias = setuptools.command.alias:alias
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install_lib = setuptools.command.install_lib:install_lib
+install_scripts = setuptools.command.install_scripts:install_scripts
+install = setuptools.command.install:install
+develop = setuptools.command.develop:develop
+build_ext = setuptools.command.build_ext:build_ext
+easy_install = setuptools.command.easy_install:easy_install
+test = setuptools.command.test:test
+saveopts = setuptools.command.saveopts:saveopts
+
+[console_scripts]
+easy_install-3.3 = setuptools.command.easy_install:main
+easy_install = setuptools.command.easy_install:main
+
 [egg_info.writers]
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
 depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 entry_points.txt = setuptools.command.egg_info:write_entries
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
 top_level.txt = setuptools.command.egg_info:write_toplevel_names
 requires.txt = setuptools.command.egg_info:write_requirements
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
 
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
 [distutils.setup_keywords]
-include_package_data = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-use_2to3_fixers = setuptools.dist:assert_string_list
-install_requires = setuptools.dist:check_requirements
-extras_require = setuptools.dist:check_extras
-eager_resources = setuptools.dist:assert_string_list
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
 exclude_package_data = setuptools.dist:check_package_data
+zip_safe = setuptools.dist:assert_bool
+include_package_data = setuptools.dist:assert_bool
 entry_points = setuptools.dist:check_entry_points
-namespace_packages = setuptools.dist:check_nsp
-use_2to3 = setuptools.dist:assert_bool
+package_data = setuptools.dist:check_package_data
 tests_require = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+extras_require = setuptools.dist:check_extras
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 packages = setuptools.dist:check_packages
+dependency_links = setuptools.dist:assert_string_list
+namespace_packages = setuptools.dist:check_nsp
+use_2to3_fixers = setuptools.dist:assert_string_list
+test_loader = setuptools.dist:check_importable
+eager_resources = setuptools.dist:assert_string_list
 test_suite = setuptools.dist:check_test_suite
+install_requires = setuptools.dist:check_requirements
 convert_2to3_doctests = setuptools.dist:assert_string_list
-dependency_links = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
 
-[console_scripts]
-easy_install-3.3 = setuptools.command.easy_install:main
-easy_install = setuptools.command.easy_install:main
-
-[distutils.commands]
-upload_docs = setuptools.command.upload_docs:upload_docs
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-saveopts = setuptools.command.saveopts:saveopts
-install_lib = setuptools.command.install_lib:install_lib
-register = setuptools.command.register:register
-develop = setuptools.command.develop:develop
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-build_py = setuptools.command.build_py:build_py
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-build_ext = setuptools.command.build_ext:build_ext
-test = setuptools.command.test:test
-egg_info = setuptools.command.egg_info:egg_info
-setopt = setuptools.command.setopt:setopt
-install = setuptools.command.install:install
-install_scripts = setuptools.command.install_scripts:install_scripts
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-sdist = setuptools.command.sdist:sdist
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl

site.py

 def __boot():
-    import sys, imp, os, os.path   
+    import sys, os, os.path
     PYTHONPATH = os.environ.get('PYTHONPATH')
     if PYTHONPATH is None or (sys.platform=='win32' and not PYTHONPATH):
         PYTHONPATH = []
@@ -23,6 +23,7 @@ def __boot():
                 break
         else:
             try:
+                import imp # Avoid import loop in Python >= 3.3
                 stream, path, descr = imp.find_module('site',[item])
             except ImportError:
                 continue