X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=bin%2Fwebbrowser-encode-url;h=8c88c9a6fadadfa435544edeabc5d5d43cf70d8c;hb=3fdf2f7baaa3a67880de95948d6ee76bc698fbc9;hp=e82c48c1234763722b266b5447a396996d36fe05;hpb=ca6727b0c6d3bc59ddc14b4b90d2eaa205cd92f6;p=dotfiles.git

diff --git a/bin/webbrowser-encode-url b/bin/webbrowser-encode-url
index e82c48c..8c88c9a 100755
--- a/bin/webbrowser-encode-url
+++ b/bin/webbrowser-encode-url
@@ -1,13 +1,13 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 try:
     from urllib.parse import parse_qsl, urlencode, \
-        quote, unquote, unquote_plus, \
+        quote, quote_plus, unquote, unquote_plus, \
         splittype, splithost, splituser, splitpasswd, \
         splitport, splittag, splitquery
 except ImportError:
     from cgi import parse_qsl
-    from urllib import urlencode, quote, unquote, unquote_plus, \
+    from urllib import urlencode, quote, quote_plus, unquote, unquote_plus, \
         splittype, splithost, splituser, splitpasswd, \
         splitport, splittag, splitquery
 from getopt import getopt, GetoptError
@@ -51,41 +51,54 @@ protocol, request = splittype(url)
 user, password, port = None, None, None
 host, path = splithost(request)
 if host:
-   user, host = splituser(host)
-   if user:
-      user, password = splitpasswd(user)
-   host, port = splitport(host)
-   if port: port = int(port)
+    user, host = splituser(host)
+    if user:
+        user, password = splitpasswd(user)
+    host, port = splitport(host)
+    if port: port = int(port)
 path, tag = splittag(path)
 path, query = splitquery(path)
 path = unquote(path)
 if tag: tag = unquote_plus(tag)
 
 if query:
-   qlist = []
-   for name, value in parse_qsl(query):
-      name = unicode(name, default_encoding).encode(encoding)
-      value = unicode(value, default_encoding).encode(encoding)
-      qlist.append((name, value))
+    qlist = []
+    for name, value in parse_qsl(query):
+        if isinstance(name, bytes):
+            name = name.decode(default_encoding)
+            value = value.decode(default_encoding)
+        name = name.encode(encoding)
+        value = value.encode(encoding)
+        qlist.append((name, value))
 
 url = protocol + "://"
 if user:
-   url += quote(unicode(user, default_encoding).encode(encoding))
-   if password:
-      url += ':' + quote(unicode(password, default_encoding).encode(encoding))
-   url += '@'
+    if isinstance(user, bytes):
+        user = user.decode(default_encoding)
+    url += quote(user.encode(encoding))
+    if password:
+        if isinstance(password, bytes):
+            password = password.decode(default_encoding)
+        url += ':' + quote(password.encode(encoding))
+    url += '@'
 if host:
-   url += host.decode(encoding).encode('idna')
-   if port:
-      url += ':%d' % port
+    if isinstance(host, bytes):
+        host = host.decode(encoding)
+    url += host.encode('idna').decode('ascii')
+    if port:
+        url += ':%d' % port
 if path:
-   if protocol == "file":
-      url += quote(path)
-   else:
-      url += quote(unicode(path, default_encoding).encode(encoding))
+    if protocol == "file":
+        url += quote(path)
+    else:
+        if isinstance(path, bytes):
+            path = path.decode(default_encoding)
+        url += quote(path.encode(encoding))
 if query:
-   url += '?' + urlencode(qlist)
+    url += '?' + urlencode(qlist)
 if tag:
-   url += '#' + quote_plus(unicode(tag, default_encoding).encode(encoding))
+    if isinstance(tag, bytes):
+        tag = tag.decode(default_encoding)
+    url += '#' + quote_plus(tag.encode(encoding))
 
 webbrowser.open(url, new)