diff options
| author | holger krekel <holger@merlinux.eu> | 2014-05-10 12:17:07 +0200 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2014-05-10 12:17:07 +0200 |
| commit | c7f89fd7ec012f87deb319884387f575b87f6013 (patch) | |
| tree | 3ccd81db5dbcde9bb4a6b3a23afc0c4df205b2c7 | |
| parent | e25df52e2b548e43a7d90c9cc15620dcbb3bf811 (diff) | |
| parent | ba555c4fd155dd9fc13d1cb988d9af56a56cae57 (diff) | |
| download | tox-c7f89fd7ec012f87deb319884387f575b87f6013.tar.gz | |
Merged in schlamar/tox (pull request #90)
Limit PYTHONHASHSEED to 1024 on Windows to prevent possible MemoryErrors.
| -rw-r--r-- | tox/_config.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tox/_config.py b/tox/_config.py index 12ccfa4..754d952 100644 --- a/tox/_config.py +++ b/tox/_config.py @@ -120,7 +120,8 @@ def prepare_parse(pkgname): parser.add_argument("--hashseed", action="store", metavar="SEED", default=None, help="set PYTHONHASHSEED to SEED before running commands. " - "Defaults to a random integer in the range 1 to 4294967295. " + "Defaults to a random integer in the range [1, 4294967295] " + "([1, 1024] on Windows). " "Passing 'noset' suppresses this behavior.") parser.add_argument("--force-dep", action="append", metavar="REQ", default=None, @@ -199,7 +200,10 @@ def get_homedir(): return None def make_hashseed(): - return str(random.randint(1, 4294967295)) + max_seed = 4294967295 + if sys.platform == 'win32' and sys.version_info < (3, 4): + max_seed = 1024 + return str(random.randint(1, max_seed)) class parseini: def __init__(self, config, inipath): |