~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/__init__.py

  • Committer: Ian Clatworthy
  • Date: 2008-06-20 00:44:46 UTC
  • mfrom: (3498.2.1 user-with-at)
  • mto: This revision was merged to the branch mainline in revision 3506.
  • Revision ID: ian.clatworthy@canonical.com-20080620004446-azoacvjesht32u7k
Accept user names with @s in URLs (Neil Martinsen-Burrell)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1311
1311
         query, fragment) = urlparse.urlparse(url, allow_fragments=False)
1312
1312
        user = password = host = port = None
1313
1313
        if '@' in netloc:
1314
 
            user, host = netloc.split('@', 1)
 
1314
            user, host = netloc.rsplit('@', 1)
1315
1315
            if ':' in user:
1316
1316
                user, password = user.split(':', 1)
1317
1317
                password = urllib.unquote(password)