kallithea Changeset - ea20850dda85

Changeset - ea20850dda85

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 6 years ago 2020-03-30 16:23:37
mads@kiilerich.com

windows: fix import of posix-only pwd module in d83f41634d06 (Issue #367)

1 file changed with 7 insertions and 2 deletions:

kallithea/lib/utils2.py

0 comments (0 inline, 0 general)

kallithea/lib/utils2.py

➞

Show inline comments

@@ @@ -28,13 +28,12 @@ Original author and date, and relevant c @@
 """
 import binascii
 import datetime
 import json
 import os
 import pwd
 import re
 import time
 import urllib.parse
 import urlobject
 from tg.i18n import ugettext as _
@@ @@ -42,12 +41,18 @@ from tg.i18n import ungettext @@
 from webhelpers2.text import collapse, remove_formatting, strip_tags
 from kallithea.lib.vcs.utils import ascii_bytes, ascii_str, safe_bytes, safe_str  # re-export
 from kallithea.lib.vcs.utils.lazy import LazyProperty
 try:
     import pwd
 except ImportError:
     pass
 # mute pyflakes "imported but unused"
 assert ascii_bytes
 assert ascii_str
 assert safe_bytes
 assert safe_str
 assert LazyProperty
@@ @@ -328,13 +333,13 @@ def credentials_filter(uri): @@
 def get_clone_url(clone_uri_tmpl, prefix_url, repo_name, repo_id, username=None):
     parsed_url = urlobject.URLObject(prefix_url)
     prefix = urllib.parse.unquote(parsed_url.path.rstrip('/'))
     try:
         system_user = pwd.getpwuid(os.getuid()).pw_name
-    except Exception: # TODO: support all systems - especially Windows
+    except NameError: # TODO: support all systems - especially Windows
         system_user = 'kallithea' # hardcoded default value ...
     args = {
         'scheme': parsed_url.scheme,
         'user': urllib.parse.quote(username or ''),
         'netloc': parsed_url.netloc + prefix,  # like "hostname:port/prefix" (with optional ":port" and "/prefix")
         'prefix': prefix, # undocumented, empty or starting with /

0 comments (0 inline, 0 general)