# HG changeset patch # User Augie Fackler # Date 2014-12-22 22:27:31 # Node ID 2205d00b6d2b0d8abefd5034337f7eb58a970710 # Parent 70afc58c32d3619ca2161eb3fc9d6d30a57e53f7 demandimport: blacklist distutils.msvc9compiler (issue4475) This module depends on _winreg, which is windows-only. Recent versions of setuptools load distutils.msvc9compiler and expect it to ImportError immediately when on non-Windows platforms, so we need to let them do that. This breaks in an especially mystifying way, because setuptools uses vars() on the imported module. We then throw an exception, which vars doesn't pick up on well. For example: In [3]: class wat(object): ...: @property ...: def __dict__(self): ...: assert False ...: In [4]: vars(wat()) --------------------------------------------------------------------------- TypeError Traceback (most recent call last) in () ----> 1 vars(wat()) TypeError: vars() argument must have __dict__ attribute Which is similar to the problem we run into. diff --git a/mercurial/demandimport.py b/mercurial/demandimport.py --- a/mercurial/demandimport.py +++ b/mercurial/demandimport.py @@ -164,6 +164,8 @@ ignore = [ '_ssl', # conditional imports in the stdlib, issue1964 'rfc822', 'mimetools', + # setuptools 8 expects this module to explode early when not on windows + 'distutils.msvc9compiler' ] def isenabled(): diff --git a/tests/test-demandimport.py b/tests/test-demandimport.py --- a/tests/test-demandimport.py +++ b/tests/test-demandimport.py @@ -1,6 +1,16 @@ from mercurial import demandimport demandimport.enable() +import os +if os.name != 'nt': + try: + import distutils.msvc9compiler + print ('distutils.msvc9compiler needs to be an immediate ' + 'importerror on non-windows platforms') + distutils.msvc9compiler + except ImportError: + pass + import re rsub = re.sub