Rev 5581: Merge fix again in file:///home/vila/src/bzr/bugs/693880-ssl-readline/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/693880-ssl-readline/

------------------------------------------------------------
revno: 5581 [merge]
revision-id: v.ladeuil+lp at free.fr-20101224165839-dnq9hkn0lk2ez25p
parent: v.ladeuil+lp at free.fr-20101224163036-6sx53r92rkrjv0d4
parent: v.ladeuil+lp at free.fr-20101224165811-mnzg4zfa6iw4hio9
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 693880-ssl-readline
timestamp: Fri 2010-12-24 17:58:39 +0100
message:
  Merge fix again
modified:
  bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
-------------- next part --------------
=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
--- a/bzrlib/transport/http/_urllib2_wrappers.py	2010-12-24 16:30:36 +0000
+++ b/bzrlib/transport/http/_urllib2_wrappers.py	2010-12-24 16:58:39 +0000
@@ -110,7 +110,7 @@
         self.report_activity(len(s), 'read')
         return s
 
-    if sys.version < (2, 6):
+    if sys.version_info < (2, 6):
         def readline(self):
             s = self.filesock.readline()
             self.report_activity(len(s), 'read')