Commits

Jason R. Coombs committed a54bfca

Fix for #151 - attribute error when gen_py doesn't have __init__ module

Comments (0)

Files changed (2)

distribute.egg-info/entry_points.txt

 
 [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

setuptools/sandbox.py

 _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):
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.