[Python-checkins] r87964 - in python/branches/release27-maint: Lib/test/test_urllib2.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Wed Jan 12 20:27:17 2011
New Revision: 87964

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


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/test/test_urllib2.py

Modified: python/branches/release27-maint/Lib/test/test_urllib2.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_urllib2.py	(original)
+++ python/branches/release27-maint/Lib/test/test_urllib2.py	Wed Jan 12 20:27:17 2011
@@ -748,7 +748,7 @@
             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):