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.
........

diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index 94bbc008dd0180bae409879b68b86398d5cc3718..9320e61c4ea211de20478c91266e2289523b7e85 100644 (file)
--- 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):