diff options
Diffstat (limited to 'contrib/setup3k.py')
| -rw-r--r-- | contrib/setup3k.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/contrib/setup3k.py b/contrib/setup3k.py index 55cf36f..6957908 100644 --- a/contrib/setup3k.py +++ b/contrib/setup3k.py @@ -8,7 +8,7 @@ from distutils.command.build_py import build_py_2to3 from lib2to3.refactor import get_fixers_from_package as getfixers import sys -if getattr(sys, 'version_info', (0, 0, 0)) < (2, 4, 0, 'final'): +if not hasattr(sys, 'version_info') or sys.version_info < (2, 4, 0, 'final'): raise SystemExit("Mercurial requires Python 2.4 or later.") if sys.version_info[0] >= 3: @@ -26,22 +26,22 @@ else: try: import hashlib sha = hashlib.sha1() -except ImportError: +except: try: import sha - except ImportError: + except: raise SystemExit( "Couldn't import standard hashlib (incomplete Python install).") try: import zlib -except ImportError: +except: raise SystemExit( "Couldn't import standard zlib (incomplete Python install).") try: import bz2 -except ImportError: +except: raise SystemExit( "Couldn't import standard bz2 (incomplete Python install).") @@ -84,7 +84,7 @@ def hasfunction(cc, funcname): os.dup2(devnull.fileno(), sys.stderr.fileno()) objects = cc.compile([fname], output_dir=tmpdir) cc.link_executable(objects, os.path.join(tmpdir, "a.out")) - except Exception: + except: return False return True finally: @@ -236,7 +236,7 @@ class hgbuildext(build_ext): try: build_ext.build_extension(self, ext) except CCompilerError: - if getattr(ext, 'optional', False): + if not hasattr(ext, 'optional') or not ext.optional: raise log.warn("Failed to build optional extension '%s' (skipping)", ext.name) |