← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/http/_urllib2_wrappers.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-10 19:29:25 UTC
  • mfrom: (3995.3.2 1.12)
  • mto: This revision was merged to the branch mainline in revision 3998.
  • Revision ID: john@arbash-meinel.com-20090210192925-6pexwm5u4w6k5vpv
Merge bzr.1.12rc1 back into bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/_urllib2_wrappers.py
79
79
        self._report_activity(len(s), 'read')
80
80
        return s
81
81
 
82
 
    def readline(self, size=-1):
83
 
        s = self.filesock.readline(size)
 
82
    def readline(self):
 
83
        # This should be readline(self, size=-1), but httplib in python 2.4 and
 
84
        #  2.5 defines a SSLFile wrapper whose readline method lacks the size
 
85
        #  parameter.  So until we drop support for 2.4 and 2.5 and since we
 
86
        #  don't *need* the size parameter we'll stay with readline(self)
 
87
        #  --  vila 20090209
 
88
        s = self.filesock.readline()
84
89
        self._report_activity(len(s), 'read')
85
90
        return s
86
91