[PATCH resend] demandimport: add __main__ to the blacklist (because of setuptools)

[Greg Ward]

# HG changeset patch
# User Greg Ward <greg-hg at gerg.ca>
# Date 1264088996 18000
# Branch stable
# Node ID a97d691b517ad219115e820cf4cd31cd0b2ff056
# Parent  184cdb66263e3ea7558053089be2bff8392eb62a
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 @@
     '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():