Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions 8 Lib/concurrent/interpreters/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,8 @@ def __del__(self):
self._decref()

# for pickling:
def __getnewargs__(self):
return (self._id,)

# for pickling:
def __getstate__(self):
return None
def __reduce__(self):
return (type(self), (self._id,))

def _decref(self):
if not self._ownsref:
Expand Down
8 changes: 2 additions & 6 deletions 8 Lib/concurrent/interpreters/_queues.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,8 @@ def __hash__(self):
return hash(self._id)

# for pickling:
def __getnewargs__(self):
return (self._id,)

# for pickling:
def __getstate__(self):
return None
def __reduce__(self):
return (type(self), (self._id,))

def _set_unbound(self, op, items=None):
assert not hasattr(self, '_unbound')
Expand Down
8 changes: 2 additions & 6 deletions 8 Lib/test/support/channels.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,8 @@ def __eq__(self, other):
return other._id == self._id

# for pickling:
def __getnewargs__(self):
return (int(self._id),)

# for pickling:
def __getstate__(self):
return None
def __reduce__(self):
return (type(self), (int(self._id),))

@property
def id(self):
Expand Down
8 changes: 5 additions & 3 deletions 8 Lib/test/test_interpreters/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -412,9 +412,11 @@ def test_equality(self):

def test_pickle(self):
interp = interpreters.create()
data = pickle.dumps(interp)
unpickled = pickle.loads(data)
self.assertEqual(unpickled, interp)
for protocol in range(pickle.HIGHEST_PROTOCOL + 1):
with self.subTest(protocol=protocol):
data = pickle.dumps(interp, protocol)
unpickled = pickle.loads(data)
self.assertEqual(unpickled, interp)


class TestInterpreterIsRunning(TestBase):
Expand Down
16 changes: 10 additions & 6 deletions 16 Lib/test/test_interpreters/test_channels.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,11 @@ def test_equality(self):

def test_pickle(self):
ch, _ = channels.create()
data = pickle.dumps(ch)
unpickled = pickle.loads(data)
self.assertEqual(unpickled, ch)
for protocol in range(pickle.HIGHEST_PROTOCOL + 1):
with self.subTest(protocol=protocol):
data = pickle.dumps(ch, protocol)
unpickled = pickle.loads(data)
self.assertEqual(unpickled, ch)


class TestSendChannelAttrs(TestBase):
Expand Down Expand Up @@ -152,9 +154,11 @@ def test_equality(self):

def test_pickle(self):
_, ch = channels.create()
data = pickle.dumps(ch)
unpickled = pickle.loads(data)
self.assertEqual(unpickled, ch)
for protocol in range(pickle.HIGHEST_PROTOCOL + 1):
with self.subTest(protocol=protocol):
data = pickle.dumps(ch, protocol)
unpickled = pickle.loads(data)
self.assertEqual(unpickled, ch)


class TestSendRecv(TestBase):
Expand Down
8 changes: 5 additions & 3 deletions 8 Lib/test/test_interpreters/test_queues.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,11 @@ def test_equality(self):

def test_pickle(self):
queue = queues.create()
data = pickle.dumps(queue)
unpickled = pickle.loads(data)
self.assertEqual(unpickled, queue)
for protocol in range(pickle.HIGHEST_PROTOCOL + 1):
with self.subTest(protocol=protocol):
data = pickle.dumps(queue, protocol)
unpickled = pickle.loads(data)
self.assertEqual(unpickled, queue)


class TestQueueOps(TestBase):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix pickling failures for protocols 0 and 1 for many objects realted to
subinterpreters.
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.