# HG changeset patch # User Greg Ward # Date 2010-01-21 01:23:36 # Node ID 1037bd445768def3471bcc4a035542ac57a4c600 # Parent 153d688cdd0691682373933984fbe9c57c23de3d demandimport: add __main__ to the blacklist (because of setuptools) diff --git a/mercurial/demandimport.py b/mercurial/demandimport.py --- a/mercurial/demandimport.py +++ b/mercurial/demandimport.py @@ -130,6 +130,9 @@ ignore = [ '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():