diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2010-05-15 07:24:02 -1000 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2010-05-15 07:24:02 -1000 |
| commit | 4353f3f6eaabc04859bcbd592c58df985bd2ad3b (patch) | |
| tree | 9a256beecd042c11f988a0de8839c68e2ad837f0 | |
| parent | 2cb36ad98366b3cad72f2be6b7a55fb51b43677c (diff) | |
| download | python-setuptools-git-4353f3f6eaabc04859bcbd592c58df985bd2ad3b.tar.gz | |
Fix for #151 - attribute error when gen_py doesn't have __init__ module
--HG--
branch : distribute
extra : rebase_source : 6d42ed6e7f4d1ab4500aa8a695ee64af6a3f63f8
| -rw-r--r-- | distribute.egg-info/entry_points.txt | 2 | ||||
| -rwxr-xr-x | setuptools/sandbox.py | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt index 1c9f123d..9fd41758 100644 --- a/distribute.egg-info/entry_points.txt +++ b/distribute.egg-info/entry_points.txt @@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete [console_scripts] easy_install = setuptools.command.easy_install:main -easy_install-2.6 = setuptools.command.easy_install:main +easy_install-2.7 = setuptools.command.easy_install:main [setuptools.file_finders] svn_cvs = setuptools.command.sdist:_default_revctrl diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py index 630d5792..b2ae991f 100755 --- a/setuptools/sandbox.py +++ b/setuptools/sandbox.py @@ -155,9 +155,14 @@ class AbstractSandbox: _EXCEPTIONS = [os.devnull,] try: - gen_py = os.path.dirname(__import__('win32com.gen_py', fromlist=['__name__']).__file__) - _EXCEPTIONS.append(gen_py) + win32com_pkg = os.path.dirname(__import__('win32com').__file__) + gen_py_pkg = os.path.join(win32com_pkg, 'gen_py') + _EXCEPTIONS.append(gen_py_pkg) except ImportError: + # it appears pywin32 is not installed, so no need to exclude. + pass +except AttributeError: + # unexpected error getting __file__ from win32com pass class DirectorySandbox(AbstractSandbox): |