summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-10-04 14:18:15 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-10-04 14:18:15 (GMT)
commitb7591d4780c76e17db4e143a097d128b124c2e66 (patch)
treec233eecebb294d03a7e5ad706167fbc68dc56bb4 /Lib
parent382e8b515c373667468cd1075af5dda3d8ec221f (diff)
downloadcpython-b7591d4780c76e17db4e143a097d128b124c2e66.zip
cpython-b7591d4780c76e17db4e143a097d128b124c2e66.tar.gz
cpython-b7591d4780c76e17db4e143a097d128b124c2e66.tar.bz2
Also fix pickletester
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/pickletester.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
index 061bce9..828225d 100644
--- a/Lib/test/pickletester.py
+++ b/Lib/test/pickletester.py
@@ -19,7 +19,7 @@ from pickle import bytes_types
# kind of outer loop.
protocols = range(pickle.HIGHEST_PROTOCOL + 1)
-character_size = 4 if sys.maxunicode > 0xFFFF else 2
+ascii_char_size = 1
# Return True if opcode code appears in the pickle, else False.
@@ -1235,7 +1235,7 @@ class BigmemPickleTests(unittest.TestCase):
# All protocols use 1-byte per printable ASCII character; we add another
# byte because the encoded form has to be copied into the internal buffer.
- @bigmemtest(size=_2G, memuse=2 + character_size, dry_run=False)
+ @bigmemtest(size=_2G, memuse=2 + ascii_char_size, dry_run=False)
def test_huge_str_32b(self, size):
data = "abcd" * (size // 4)
try:
@@ -1252,7 +1252,7 @@ class BigmemPickleTests(unittest.TestCase):
# BINUNICODE (protocols 1, 2 and 3) cannot carry more than
# 2**32 - 1 bytes of utf-8 encoded unicode.
- @bigmemtest(size=_4G, memuse=1 + character_size, dry_run=False)
+ @bigmemtest(size=_4G, memuse=1 + ascii_char_size, dry_run=False)
def test_huge_str_64b(self, size):
data = "a" * size
try: