summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Lib/test/test_str.py3
-rw-r--r--Lib/test/test_unicode.py4
2 files changed, 4 insertions, 3 deletions
diff --git a/Lib/test/test_str.py b/Lib/test/test_str.py
index 1853517345..3acb6d10db 100644
--- a/Lib/test/test_str.py
+++ b/Lib/test/test_str.py
@@ -1,5 +1,6 @@
import unittest
+import struct
import sys
from test import test_support, string_tests
@@ -88,7 +89,7 @@ class StrTest(
# This test only affects 32-bit platforms because expandtabs can only take
# an int as the max value, not a 64-bit C long. If expandtabs is changed
# to take a 64-bit long, this test should apply to all platforms.
- if sys.maxint > (1 << 32):
+ if sys.maxint > (1 << 32) or struct.calcsize('P') != 4:
return
self.assertRaises(OverflowError, 't\tt\t'.expandtabs, sys.maxint)
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 3ee5ee2245..b022300810 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -6,7 +6,7 @@ Written by Marc-Andre Lemburg (mal@lemburg.com).
(c) Copyright CNRI, All Rights Reserved. NO WARRANTY.
"""#"
-import unittest, sys, string, codecs, new
+import unittest, sys, struct, codecs, new
from test import test_support, string_tests
# Error handling (bad decoder return)
@@ -821,7 +821,7 @@ class UnicodeTest(
# This test only affects 32-bit platforms because expandtabs can only take
# an int as the max value, not a 64-bit C long. If expandtabs is changed
# to take a 64-bit long, this test should apply to all platforms.
- if sys.maxint > (1 << 32):
+ if sys.maxint > (1 << 32) or struct.calcsize('P') != 4:
return
self.assertRaises(OverflowError, u't\tt\t'.expandtabs, sys.maxint)