Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
demandimport: add __main__ to the blacklist (because of setuptools) stable
authorGreg Ward <greg-hg@gerg.ca>
Wed, 20 Jan 2010 20:23:36 -0500
branchstable
changeset 10598 1037bd445768
parent 10597 153d688cdd06
child 10609 5ee3faa7c563
child 10612 30553ac3e355
demandimport: add __main__ to the blacklist (because of setuptools)
mercurial/demandimport.py file | annotate | diff | comparison | revisions 
--- a/mercurial/demandimport.py	Thu Dec 17 15:53:28 2009 -0800
+++ b/mercurial/demandimport.py	Wed Jan 20 20:23:36 2010 -0500
@@ -130,6 +130,9 @@
     'resource',
     # this trips up many extension authors
     'gtk',
+    # setuptools' pkg_resources.py expects "from __main__ import x" to
+    # raise ImportError if x not defined
+    '__main__',
     ]
 
 def enable():
mercurial