kallithea Changeset - dbf3c33a516c

Changeset - dbf3c33a516c

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 6 years ago 2019-07-16 12:25:10
mads@kiilerich.com

clone_url: simplify stripping of 'username@' from URLs when username is empty

1 file changed with 3 insertions and 2 deletions:

kallithea/lib/utils2.py

0 comments (0 inline, 0 general)

kallithea/lib/utils2.py

➞

Show inline comments

@@ @@ -417,27 +417,28 @@ def get_clone_url(clone_uri_tmpl, prefix @@
     args = {
         'scheme': parsed_url.scheme,
         'user': safe_unicode(urllib.quote(safe_str(username or ''))),
         'netloc': parsed_url.netloc + prefix,  # like "hostname:port/prefix" (with optional ":port" and "/prefix")
         'prefix': prefix, # undocumented, empty or starting with /
         'repo': repo_name,
         'repoid': str(repo_id),
+    }
     url = re.sub('{([^{}]+)}', lambda m: args.get(m.group(1), m.group(0)), clone_uri_tmpl)
     # remove leading @ sign if it's present. Case of empty user
     url_obj = urlobject.URLObject(url)
     url = url_obj.with_netloc(url_obj.netloc.lstrip('@'))
     if not url_obj.username:
         url_obj = url_obj.with_username(None)
-    return safe_unicode(url)
+    return safe_unicode(url_obj)
 def get_changeset_safe(repo, rev):
     """
     Safe version of get_changeset if this changeset doesn't exists for a
     repo it returns a Dummy one instead
     :param repo:
     :param rev:
     """
     from kallithea.lib.vcs.backends.base import BaseRepository
     from kallithea.lib.vcs.exceptions import RepositoryError

0 comments (0 inline, 0 general)