Show More
@@ -74,7 +74,7 if sys.version_info[0] != 2: | |||||
74 | badpython = True |
|
74 | badpython = True | |
75 |
|
75 | |||
76 | # Allow Python 3 from source checkouts. |
|
76 | # Allow Python 3 from source checkouts. | |
77 | if os.path.isdir('.hg'): |
|
77 | if os.path.isdir('.hg') or 'HGPYTHON3' in os.environ: | |
78 | badpython = False |
|
78 | badpython = False | |
79 |
|
79 | |||
80 | if badpython: |
|
80 | if badpython: | |
@@ -369,7 +369,7 try: | |||||
369 | from mercurial import __version__ |
|
369 | from mercurial import __version__ | |
370 | version = __version__.version |
|
370 | version = __version__.version | |
371 | except ImportError: |
|
371 | except ImportError: | |
372 | version = 'unknown' |
|
372 | version = b'unknown' | |
373 | finally: |
|
373 | finally: | |
374 | if oldpolicy is None: |
|
374 | if oldpolicy is None: | |
375 | del os.environ['HGMODULEPOLICY'] |
|
375 | del os.environ['HGMODULEPOLICY'] |
General Comments 0
You need to be logged in to leave comments.
Login now