From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 12 Jan 2011 19:29:51 +0000 (+0000)
Subject: Merged revisions 87895 via svnmerge from
X-Git-Tag: v3.2.1b1~347^2~72
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ecb6e81d9e8ed0769a68c8715e81c1b67b583ba4;p=thirdparty%2FPython%2Fcpython.git

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 94bbc008dd01..9320e61c4ea2 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):