summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_pyclbr.py
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2003-05-02 09:06:28 (GMT)
committerRaymond Hettinger <python@rcn.com>2003-05-02 09:06:28 (GMT)
commit91bbd9a7b9735cba07b06400a7c467aab6facfde (patch)
tree14bbad407135d461d54f8e1c066a93c6b9ef363d /Lib/test/test_pyclbr.py
parent40006e9f7a38bbbcf564c541cb0f2022b952e409 (diff)
downloadcpython-91bbd9a7b9735cba07b06400a7c467aab6facfde.zip
cpython-91bbd9a7b9735cba07b06400a7c467aab6facfde.tar.gz
cpython-91bbd9a7b9735cba07b06400a7c467aab6facfde.tar.bz2
Used sets.Set() to compare unordered sequences.
Improves clarity and brevity.
Diffstat (limited to 'Lib/test/test_pyclbr.py')
-rw-r--r--Lib/test/test_pyclbr.py14
1 files changed, 4 insertions, 10 deletions
diff --git a/Lib/test/test_pyclbr.py b/Lib/test/test_pyclbr.py
index 7a59c2e..1229962 100644
--- a/Lib/test/test_pyclbr.py
+++ b/Lib/test/test_pyclbr.py
@@ -7,6 +7,7 @@ import unittest, sys
from types import ClassType, FunctionType, MethodType
import pyclbr
from unittest import TestCase
+from sets import Set
# This next line triggers an error on old versions of pyclbr.
@@ -23,17 +24,10 @@ class PyclbrTest(TestCase):
def assertListEq(self, l1, l2, ignore):
''' succeed iff {l1} - {ignore} == {l2} - {ignore} '''
- l1.sort()
- l2.sort()
- try:
- for p1, p2 in (l1, l2), (l2, l1):
- for item in p1:
- ok = (item in p2) or (item in ignore)
- if not ok:
- self.fail("%r missing" % item)
- except:
+ missing = (Set(l1) ^ Set(l2)) - Set(ignore)
+ if missing:
print >>sys.stderr, "l1=%r\nl2=%r\nignore=%r" % (l1, l2, ignore)
- raise
+ self.fail("%r missing" % missing.pop())
def assertHasattr(self, obj, attr, ignore):
''' succeed iff hasattr(obj,attr) or attr in ignore. '''