branch | stable |
changeset 10612 | 30553ac3e355 |
parent 10598 | 1037bd445768 |
child 11942 | 50a4e55aa278 |
--- a/mercurial/demandimport.py Wed Jan 20 20:23:36 2010 -0500 +++ b/mercurial/demandimport.py Tue Mar 09 16:03:57 2010 +0100 @@ -133,6 +133,7 @@ # setuptools' pkg_resources.py expects "from __main__ import x" to # raise ImportError if x not defined '__main__', + '_ssl', # conditional imports in the stdlib, issue1964 ] def enable():