Skip to content

Commit

Permalink
Revert Python2-only tests in the pickletester forked from Py3k .
Browse files Browse the repository at this point in the history
  • Loading branch information
tseaver committed Apr 26, 2013
1 parent 7b9fb83 commit 4da0f4e
Showing 1 changed file with 0 additions and 23 deletions.
23 changes: 0 additions & 23 deletions src/zodbpickle/tests/pickletester.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ def wrapper(*args, **kwargs):
return wrapper

_PY33 = sys.version_info[:2] >= (3, 3)
_PY2 = sys.version_info[0] < 3

from zodbpickle.pickle import bytes_types

Expand Down Expand Up @@ -818,28 +817,6 @@ def test_long4(self):
self.assertEqual(x, y)
self.assertEqual(opcode_in_pickle(pickle.LONG4, s), proto >= 2)

@unittest.skipUnless(_PY2, "only for Python 2")
def test_shortbinbytes_custom_binary(self):
from zodbpickle import binary
x = binary(b'\x00ABC\x80')
for proto in protocols:
s = self.dumps(x, proto)
y = self.loads(s)
self.assertEqual(x, y)
self.assertEqual(opcode_in_pickle(pickle.SHORT_BINBYTES, s),
proto >= 3, str(self.__class__))

@unittest.skipUnless(_PY2, "only for Python 2")
def test_binbytes_custom_binary(self):
from zodbpickle import binary
x = binary(b'\x00ABC\x80' * 100)
for proto in protocols:
s = self.dumps(x, proto)
y = self.loads(s)
self.assertEqual(x, y)
self.assertEqual(opcode_in_pickle(pickle.BINBYTES, s),
proto >= 3, str(self.__class__))

def test_short_tuples(self):
# Map (proto, len(tuple)) to expected opcode.
expected_opcode = {(0, 0): pickle.TUPLE,
Expand Down

0 comments on commit 4da0f4e

Please sign in to comment.