[Pytest-commit] commit/tox: 3 new changesets

[commits-noreply at bitbucket.org]

3 new commits in tox:

https://bitbucket.org/hpk42/tox/commits/4ab00764b338/
Changeset:   4ab00764b338
User:        schlamar
Date:        2014-03-25 08:44:38
Summary:     Limit PYTHONHASHSEED to 1024 on Windows to prevent possible MemoryErrors.

See http://bugs.python.org/issue20954.
Affected #:  1 file

diff -r e8d513cba7d9b36dba0b5995829a23c8a1c1bdb3 -r 4ab00764b33896b5b3e7da6f282242f3378fc0a7 tox/_config.py
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -123,7 +123,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,
@@ -200,7 +201,10 @@
         return None
 
 def make_hashseed():
-    return str(random.randint(1, 4294967295))
+    max_seed = 4294967295
+    if sys.platform == 'win32':
+        max_seed = 1024
+    return str(random.randint(1, max_seed))
 
 class parseini:
     def __init__(self, config, inipath):


https://bitbucket.org/hpk42/tox/commits/b0afb9641c00/
Changeset:   b0afb9641c00
User:        schlamar
Date:        2014-03-25 08:51:10
Summary:     Restrict PYTHONHASHSEED limitation on Windows to Python < 3.4.
Affected #:  1 file

diff -r 4ab00764b33896b5b3e7da6f282242f3378fc0a7 -r b0afb9641c00aaed4bc83c34bc033017dec1f1c5 tox/_config.py
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -202,7 +202,7 @@
 
 def make_hashseed():
     max_seed = 4294967295
-    if sys.platform == 'win32':
+    if sys.platform == 'win32' and sys.version_info < (3, 4):
         max_seed = 1024
     return str(random.randint(1, max_seed))
 


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.