Mercurial > hg-stable
changeset 10598:1037bd445768 stable
demandimport: add __main__ to the blacklist (because of setuptools)
| author | Greg Ward <greg-hg@gerg.ca> |
|---|---|
| date | Wed, 20 Jan 2010 20:23:36 -0500 |
| parents | 153d688cdd06 |
| children | 5ee3faa7c563 30553ac3e355 |
| files | mercurial/demandimport.py |
| diffstat | 1 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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():