From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 12 Jan 2011 19:27:17 +0000 (+0000)
Subject: Merged revisions 87895 via svnmerge from
X-Git-Tag: v2.7.2rc1~369
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9810427e4160fea1fda5a041e0bc11efe5f47033;p=python

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 b74320d2ac..789dcd3442 100644
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -748,7 +748,7 @@ class HandlerTests(unittest.TestCase):
             else:
                 self.assertTrue(o.req is req)
                 self.assertEqual(req.type, "ftp")
-            self.assertEqual(req.type is "ftp", ftp)
+            self.assertEqual(req.type == "ftp", ftp)
 
     def test_http(self):