X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=bin%2FHEAD.py;h=6c0e5f7eb0d3bd30dddf2ad7d64dd8b2608fb5ff;hb=HEAD;hp=c5d06a646e669ee657021565c438296852947560;hpb=3fdf2f7baaa3a67880de95948d6ee76bc698fbc9;p=dotfiles.git

diff --git a/bin/HEAD.py b/bin/HEAD.py
index c5d06a6..6c0e5f7 100755
--- a/bin/HEAD.py
+++ b/bin/HEAD.py
@@ -1,45 +1,19 @@
 #! /usr/bin/env python3
 
-try:
-    PY2 = False
-    from http.client import HTTPConnection
-    from urllib.parse import parse_qsl, urlencode, \
-        quote, quote_plus, unquote, unquote_plus, \
-        splittype, splithost, splituser, splitpasswd, \
-        splitport, splittag, splitquery
-    import urllib.request
-except ImportError:
-    PY2 = True
-    from cgi import parse_qsl
-    from urllib import urlencode, quote, quote_plus, unquote, unquote_plus, \
-        splittype, splithost, splituser, splitpasswd, \
-        splitport, splittag, splitquery
-    from httplib import HTTPConnection
-
+from http.client import HTTPConnection, HTTPSConnection
+from urllib.parse import urlsplit, parse_qsl, urlencode, quote, quote_plus
 import sys
-import urllib
-from m_lib.defenc import default_encoding
+import urllib.request
 
 url = sys.argv[1]
 
-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)
-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):
-        qlist.append((name, value))
+split_results = urlsplit(url)
+protocol, netloc, path, query, tag = split_results
+user = split_results.username
+password = split_results.password
+host = split_results.hostname
+port = split_results.port
+qlist = parse_qsl(query)
 
 url = protocol + "://"
 if user:
@@ -48,11 +22,7 @@ if user:
         url += ':' + quote(password)
     url += '@'
 if host:
-    if PY2:
-        host = host.decode(default_encoding)
-    host = host.encode('idna')
-    if not PY2:
-        host = host.decode('ascii')
+    host = host.encode('idna').decode('ascii')
     url += host
     if port:
         url += ':%d' % port
@@ -66,23 +36,18 @@ if query:
 if tag:
     url += '#' + quote_plus(tag)
 
-server = HTTPConnection(host, port)
+if protocol == "https":
+    server = HTTPSConnection(host, port)
+else:
+    server = HTTPConnection(host, port)
 server.set_debuglevel(1)
-
 server.putrequest("HEAD", path)
-if port:
-    server.putheader("Host", '%s:%d' % (host, port))
-else:
-    server.putheader("Host", host)
 
 # I remember seeing some sites that return broken HTML or even HTTP response
 # without "compatible" user agent; I don't know if such sites are still around,
 # but this header doesn't cause any harm so I'd better continue to use it.
 # UPDATE: I saw a number of sites that forbid "Mozilla compatible"
-if PY2:
-    urllib_version = urllib.__version__
-else:
-    urllib_version = urllib.request.__version__
+urllib_version = urllib.request.__version__
 client_version = "Python-urllib/%s" % urllib_version
 server.putheader('User-agent', client_version)