[pypy-commit] pypy win64-stage1: forgot this patch for sys.maxint, which has bad consequences.

ctismer noreply at buildbot.pypy.org
Tue Nov 22 03:46:15 CET 2011


Author: Christian Tismer <tismer at stackless.com>
Branch: win64-stage1
Changeset: r49652:77ee30370cd7
Date: 2011-11-22 03:44 +0100
http://bitbucket.org/pypy/pypy/changeset/77ee30370cd7/

Log:	forgot this patch for sys.maxint, which has bad consequences. Note
	that this patch must stay until the end of stage 1.

diff --git a/pytest.py b/pytest.py
--- a/pytest.py
+++ b/pytest.py
@@ -4,6 +4,14 @@
 """
 __all__ = ['main']
 
+# XXX hack for win64:
+# This patch must stay here until the ENDS OF STAGE 1
+# When all tests work, this branch will be merged
+# and the branch stage 2 is started, where we remove this patch.
+import sys
+if hasattr(sys, "maxsize"):
+    sys.maxint = max(sys.maxint, sys.maxsize)
+
 from _pytest.core import main, UsageError, _preloadplugins
 from _pytest import core as cmdline
 from _pytest import __version__


More information about the pypy-commit mailing list