← 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-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/_urllib2_wrappers.py
257
257
        # Preserve our preciousss
258
258
        sock = self.sock
259
259
        self.sock = None
260
 
        # Let httplib.HTTPConnection do its housekeeping 
 
260
        # Let httplib.HTTPConnection do its housekeeping
261
261
        self.close()
262
262
        # Restore our preciousss
263
263
        self.sock = sock
371
371
 
372
372
    def __init__(self, request):
373
373
        """Constructor
374
 
        
 
374
 
375
375
        :param request: the first request sent to the proxied host, already
376
376
            processed by the opener (i.e. proxied_host is already set).
377
377
        """
698
698
                        connect.proxied_host, self.host))
699
699
            # Housekeeping
700
700
            connection.cleanup_pipe()
701
 
            # Establish the connection encryption 
 
701
            # Establish the connection encryption
702
702
            connection.connect_to_origin()
703
703
            # Propagate the connection to the original request
704
704
            request.connection = connection
1069
1069
        (digest's nonce is an example, digest's nonce_count is a
1070
1070
        *counter-example*). Such parameters must be updated by
1071
1071
        using the update_auth() method.
1072
 
        
 
1072
 
1073
1073
        :param header: The authentication header sent by the server.
1074
1074
        :param auth: The auth parameters already known. They may be
1075
1075
             updated.