Ver código fonte

Avoid use of urllib2.splituser (removed in python 3.8).

Jelmer Vernooij 6 anos atrás
pai
commit
f242e36ba6
1 arquivos alterados com 1 adições e 4 exclusões
  1. 1 4
      dulwich/client.py

+ 1 - 4
dulwich/client.py

@@ -54,10 +54,8 @@ except ImportError:
     from urllib.parse import unquote as urlunquote
     from urllib.parse import unquote as urlunquote
 
 
 try:
 try:
-    import urllib2
     import urlparse
     import urlparse
 except ImportError:
 except ImportError:
-    import urllib.request as urllib2
     import urllib.parse as urlparse
     import urllib.parse as urlparse
 
 
 import dulwich
 import dulwich
@@ -1353,7 +1351,6 @@ class HttpGitClient(GitClient):
 
 
     @classmethod
     @classmethod
     def from_parsedurl(cls, parsedurl, **kwargs):
     def from_parsedurl(cls, parsedurl, **kwargs):
-        auth, host = urllib2.splituser(parsedurl.netloc)
         password = parsedurl.password
         password = parsedurl.password
         if password is not None:
         if password is not None:
             password = urlunquote(password)
             password = urlunquote(password)
@@ -1361,7 +1358,7 @@ class HttpGitClient(GitClient):
         if username is not None:
         if username is not None:
             username = urlunquote(username)
             username = urlunquote(username)
         # TODO(jelmer): This also strips the username
         # TODO(jelmer): This also strips the username
-        parsedurl = parsedurl._replace(netloc=host)
+        parsedurl = parsedurl._replace(netloc=parsedurl.hostname)
         return cls(urlparse.urlunparse(parsedurl),
         return cls(urlparse.urlunparse(parsedurl),
                    password=password, username=username, **kwargs)
                    password=password, username=username, **kwargs)