# HG changeset patch # User Greg Ward # Date 1264037016 18000 # Node ID 1037bd445768def3471bcc4a035542ac57a4c600 # Parent 153d688cdd0691682373933984fbe9c57c23de3d demandimport: add __main__ to the blacklist (because of setuptools) diff -r 153d688cdd06 -r 1037bd445768 mercurial/demandimport.py --- 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():