Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
d9c956fb
Commit
d9c956fb
authored
Jan 11, 2017
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #20804: The unittest.mock.sentinel attributes now preserve their
identity when they are copied or pickled.
parent
d4f5001b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
0 deletions
+33
-0
Doc/library/unittest.mock.rst
Doc/library/unittest.mock.rst
+4
-0
Doc/whatsnew/3.7.rst
Doc/whatsnew/3.7.rst
+7
-0
Lib/unittest/mock.py
Lib/unittest/mock.py
+6
-0
Lib/unittest/test/testmock/testsentinel.py
Lib/unittest/test/testmock/testsentinel.py
+13
-0
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Doc/library/unittest.mock.rst
View file @
d9c956fb
...
...
@@ -1831,6 +1831,10 @@ sentinel
the same attribute will always return the same object. The objects
returned have a sensible repr so that test failure messages are readable.
.. versionchanged:: 3.7
The ``sentinel`` attributes now preserve their identity when they are
:mod:`copied <copy>` or :mod:`pickled <pickle>`.
Sometimes when testing you need to test that a specific object is passed as an
argument to another method, or returned. It can be common to create named
sentinel objects to test this. :data:`sentinel` provides a convenient way of
...
...
Doc/whatsnew/3.7.rst
View file @
d9c956fb
...
...
@@ -93,6 +93,13 @@ New Modules
Improved Modules
================
unittest.mock
-------------
The :const:`~unittest.mock.sentinel` attributes now preserve their identity
when they are :mod:`copied <copy>` or :mod:`pickled <pickle>`.
(Contributed by Serhiy Storchaka in :issue:`20804`.)
Optimizations
=============
...
...
Lib/unittest/mock.py
View file @
d9c956fb
...
...
@@ -238,6 +238,9 @@ class _SentinelObject(object):
def
__repr__
(
self
):
return
'sentinel.%s'
%
self
.
name
def
__reduce__
(
self
):
return
'sentinel.%s'
%
self
.
name
class
_Sentinel
(
object
):
"""Access attributes to return a named object, usable as a sentinel."""
...
...
@@ -250,6 +253,9 @@ class _Sentinel(object):
raise
AttributeError
return
self
.
_sentinels
.
setdefault
(
name
,
_SentinelObject
(
name
))
def
__reduce__
(
self
):
return
'sentinel'
sentinel
=
_Sentinel
()
...
...
Lib/unittest/test/testmock/testsentinel.py
View file @
d9c956fb
import
unittest
import
copy
import
pickle
from
unittest.mock
import
sentinel
,
DEFAULT
...
...
@@ -23,6 +25,17 @@ class SentinelTest(unittest.TestCase):
# If this doesn't raise an AttributeError then help(mock) is broken
self
.
assertRaises
(
AttributeError
,
lambda
:
sentinel
.
__bases__
)
def
testPickle
(
self
):
for
proto
in
range
(
pickle
.
HIGHEST_PROTOCOL
+
1
):
with
self
.
subTest
(
protocol
=
proto
):
pickled
=
pickle
.
dumps
(
sentinel
.
whatever
,
proto
)
unpickled
=
pickle
.
loads
(
pickled
)
self
.
assertIs
(
unpickled
,
sentinel
.
whatever
)
def
testCopy
(
self
):
self
.
assertIs
(
copy
.
copy
(
sentinel
.
whatever
),
sentinel
.
whatever
)
self
.
assertIs
(
copy
.
deepcopy
(
sentinel
.
whatever
),
sentinel
.
whatever
)
if
__name__
==
'__main__'
:
unittest
.
main
()
Misc/NEWS
View file @
d9c956fb
...
...
@@ -212,6 +212,9 @@ Core and Builtins
Library
-------
-
Issue
#
20804
:
The
unittest
.
mock
.
sentinel
attributes
now
preserve
their
identity
when
they
are
copied
or
pickled
.
-
Issue
#
29142
:
In
urllib
.
request
,
suffixes
in
no_proxy
environment
variable
with
leading
dots
could
match
related
hostnames
again
(
e
.
g
.
.
b
.
c
matches
a
.
b
.
c
).
Patch
by
Milan
Oberkirch
.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment