← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/launchpad/lp_registration.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/lp_registration.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
 
18
20
import os
19
21
import socket
54
56
class XMLRPCTransport(xmlrpclib.Transport):
55
57
 
56
58
    def __init__(self, scheme):
57
 
        # In python2.4 xmlrpclib.Transport is a old-style class, and does not
58
 
        # define __init__, so we check first
59
 
        init = getattr(xmlrpclib.Transport, '__init__', None)
60
 
        if init is not None:
61
 
            init(self)
 
59
        xmlrpclib.Transport.__init__(self)
62
60
        self._scheme = scheme
63
61
        self._opener = _urllib2_wrappers.Opener()
64
62
        self.verbose = 0
166
164
            # the url?  perhaps a bit more secure against accidentally
167
165
            # revealing it.  std66 s3.2.1 discourages putting the
168
166
            # password in the url.
169
 
            hostinfo = '%s:%s@%s' % (urllib.quote(self.registrant_email),
170
 
                                     urllib.quote(self.registrant_password),
 
167
            hostinfo = '%s:%s@%s' % (urlutils.quote(self.registrant_email),
 
168
                                     urlutils.quote(self.registrant_password),
171
169
                                     hostinfo)
172
170
            url = urlunsplit((scheme, hostinfo, path, '', ''))
173
171
        else: