summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-01-12 19:29:51 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-01-12 19:29:51 (GMT)
commitecb6e81d9e8ed0769a68c8715e81c1b67b583ba4 (patch)
treebc8a850527cfdec7a361a91ccf4ae98083c512e0
parenta53d2acb3d14ff497d8f28efcec2c5567a8426c4 (diff)
downloadcpython-ecb6e81d9e8ed0769a68c8715e81c1b67b583ba4.zip
cpython-ecb6e81d9e8ed0769a68c8715e81c1b67b583ba4.tar.gz
cpython-ecb6e81d9e8ed0769a68c8715e81c1b67b583ba4.tar.bz2
Merged revisions 87895 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r87895 | lukasz.langa | 2011-01-09 12:18:53 -0600 (Sun, 09 Jan 2011) | 5 lines #10874: test_urllib2 shouldn't use `is` operator for comparing strings Patch by Adreas Stührk. ........
-rw-r--r--Lib/test/test_urllib2.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index 94bbc00..9320e61 100644
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -758,7 +758,7 @@ class HandlerTests(unittest.TestCase):
else:
self.assertIs(o.req, req)
self.assertEqual(req.type, "ftp")
- self.assertEqual(req.type is "ftp", ftp)
+ self.assertEqual(req.type == "ftp", ftp)
def test_http(self):