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
91c9da34
Commit
91c9da34
authored
Mar 20, 2010
by
Michael Foord
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue 7832. Deprecating assertSameElements in Py3k.
parent
8442a606
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
23 deletions
+7
-23
Lib/test/test_unittest.py
Lib/test/test_unittest.py
+2
-19
Lib/unittest/case.py
Lib/unittest/case.py
+5
-4
No files found.
Lib/test/test_unittest.py
View file @
91c9da34
...
...
@@ -2758,24 +2758,6 @@ class Test_TestCase(TestCase, TestEquality, TestHashing):
self
.
assertRaises
(
self
.
failureException
,
self
.
assertDictEqual
,
[],
d
)
self
.
assertRaises
(
self
.
failureException
,
self
.
assertDictEqual
,
1
,
1
)
self
.
assertSameElements
([
1
,
2
,
3
],
[
3
,
2
,
1
])
self
.
assertSameElements
([
1
,
2
]
+
[
3
]
*
100
,
[
1
]
*
100
+
[
2
,
3
])
self
.
assertSameElements
([
'foo'
,
'bar'
,
'baz'
],
[
'bar'
,
'baz'
,
'foo'
])
self
.
assertRaises
(
self
.
failureException
,
self
.
assertSameElements
,
[
10
],
[
10
,
11
])
self
.
assertRaises
(
self
.
failureException
,
self
.
assertSameElements
,
[
10
,
11
],
[
10
])
# Test that sequences of unhashable objects can be tested for sameness:
self
.
assertSameElements
([[
1
,
2
],
[
3
,
4
]],
[[
3
,
4
],
[
1
,
2
]])
self
.
assertSameElements
([{
'a'
:
1
},
{
'b'
:
2
}],
[{
'b'
:
2
},
{
'a'
:
1
}])
self
.
assertRaises
(
self
.
failureException
,
self
.
assertSameElements
,
[[
1
]],
[[
2
]])
self
.
assertRaises
(
self
.
failureException
,
self
.
assertSameElements
,
[{
'a'
:
1
},
{
'b'
:
2
}],
[{
'b'
:
2
},
{
'a'
:
2
}])
def
testAssertItemsEqual
(
self
):
a
=
object
()
self
.
assertItemsEqual
([
1
,
2
,
3
],
[
3
,
2
,
1
])
...
...
@@ -3032,7 +3014,8 @@ test case
(
self
.
failIfAlmostEqual
,
(
3.0
,
5.0
)),
(
self
.
failUnless
,
(
True
,)),
(
self
.
failUnlessRaises
,
(
TypeError
,
lambda
_
:
3.14
+
'spam'
)),
(
self
.
failIf
,
(
False
,))
(
self
.
failIf
,
(
False
,)),
(
self
.
assertSameElements
,
([
1
,
1
,
2
,
3
],
[
1
,
2
,
3
]))
)
for
meth
,
args
in
old
:
with
warnings
.
catch_warnings
(
record
=
True
)
as
w
:
...
...
Lib/unittest/case.py
View file @
91c9da34
...
...
@@ -700,10 +700,9 @@ class TestCase(object):
msg: Optional message to use on failure instead of a list of
differences.
For more general containership equality, assertSameElements will work
with things other than sets. This uses ducktyping to support
different types of sets, and is optimized for sets specifically
(parameters must support a difference method).
assertSetEqual uses ducktyping to support different types of sets, and
is optimized for sets specifically (parameters must support a
difference method).
"""
try
:
difference1
=
set1
.
difference
(
set2
)
...
...
@@ -809,6 +808,8 @@ class TestCase(object):
set(actual))`` but it works with sequences of unhashable objects as
well.
"""
warnings
.
warn
(
'assertSameElements is deprecated'
,
DeprecationWarning
)
try
:
expected
=
set
(
expected_seq
)
actual
=
set
(
actual_seq
)
...
...
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