[Pytest-commit] commit/tox: hpk42: Merged in schlamar/tox (pull request #90)

[commits-noreply at bitbucket.org]

1 new commit in tox:

https://bitbucket.org/hpk42/tox/commits/1756abc84032/
Changeset:   1756abc84032
User:        hpk42
Date:        2014-05-10 12:17:07
Summary:     Merged in schlamar/tox (pull request #90)

Limit PYTHONHASHSEED to 1024 on Windows to prevent possible MemoryErrors.
Affected #:  1 file

diff -r ed0dd0ea9de62a58b05b0e7a8b272125d63593e4 -r 1756abc84032639371a9503a59bda4747055985a tox/_config.py
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -120,7 +120,8 @@
     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 @@
         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):

Repository URL: https://bitbucket.org/hpk42/tox/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.