← 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: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

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
166
168
            # the url?  perhaps a bit more secure against accidentally
167
169
            # revealing it.  std66 s3.2.1 discourages putting the
168
170
            # password in the url.
169
 
            hostinfo = '%s:%s@%s' % (urllib.quote(self.registrant_email),
170
 
                                     urllib.quote(self.registrant_password),
 
171
            hostinfo = '%s:%s@%s' % (urlutils.quote(self.registrant_email),
 
172
                                     urlutils.quote(self.registrant_password),
171
173
                                     hostinfo)
172
174
            url = urlunsplit((scheme, hostinfo, path, '', ''))
173
175
        else: