diff sat/tools/common/uri.py @ 3028:ab2696e34d29

Python 3 port: /!\ this is a huge commit /!\ starting from this commit, SàT is needs Python 3.6+ /!\ SàT maybe be instable or some feature may not work anymore, this will improve with time This patch port backend, bridge and frontends to Python 3. Roughly this has been done this way: - 2to3 tools has been applied (with python 3.7) - all references to python2 have been replaced with python3 (notably shebangs) - fixed files not handled by 2to3 (notably the shell script) - several manual fixes - fixed issues reported by Python 3 that where not handled in Python 2 - replaced "async" with "async_" when needed (it's a reserved word from Python 3.7) - replaced zope's "implements" with @implementer decorator - temporary hack to handle data pickled in database, as str or bytes may be returned, to be checked later - fixed hash comparison for password - removed some code which is not needed anymore with Python 3 - deactivated some code which needs to be checked (notably certificate validation) - tested with jp, fixed reported issues until some basic commands worked - ported Primitivus (after porting dependencies like urwid satext) - more manual fixes
author Goffi <goffi@goffi.org>
date Tue, 13 Aug 2019 19:08:41 +0200
parents 003b8b4b56a7
children 9d0df638c8b4
line wrap: on
line diff
--- a/sat/tools/common/uri.py	Wed Jul 31 11:31:22 2019 +0200
+++ b/sat/tools/common/uri.py	Tue Aug 13 19:08:41 2019 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # SAT: a jabber client
@@ -19,8 +19,8 @@
 
 """ XMPP uri parsing tools """
 
-import urlparse
-import urllib
+import urllib.parse
+import urllib.request, urllib.parse, urllib.error
 
 # FIXME: basic implementation, need to follow RFC 5122
 
@@ -40,64 +40,64 @@
         id: id of the element (item for pubsub)
     @raise ValueError: the scheme is not xmpp
     """
-    uri_split = urlparse.urlsplit(uri.encode("utf-8"))
+    uri_split = urllib.parse.urlsplit(uri)
     if uri_split.scheme != "xmpp":
-        raise ValueError(u"this is not a XMPP URI")
+        raise ValueError("this is not a XMPP URI")
 
     # XXX: we don't use jid.JID for path as it can be used both in backend and frontend
     # which may use different JID classes
-    data = {u"path": urllib.unquote(uri_split.path).decode("utf-8")}
+    data = {"path": urllib.parse.unquote(uri_split.path)}
 
     query_end = uri_split.query.find(";")
     query_type = uri_split.query[:query_end]
     if query_end == -1 or "=" in query_type:
         raise ValueError("no query type, invalid XMPP URI")
 
-    pairs = urlparse.parse_qs(uri_split.geturl())
-    for k, v in pairs.items():
+    pairs = urllib.parse.parse_qs(uri_split.geturl())
+    for k, v in list(pairs.items()):
         if len(v) != 1:
-            raise NotImplementedError(u"multiple values not managed")
+            raise NotImplementedError("multiple values not managed")
         if k in ("path", "type", "sub_type"):
-            raise NotImplementedError(u"reserved key used in URI, this is not supported")
-        data[k.decode("utf-8")] = urllib.unquote(v[0]).decode("utf-8")
+            raise NotImplementedError("reserved key used in URI, this is not supported")
+        data[k] = urllib.parse.unquote(v[0])
 
     if query_type:
-        data[u"type"] = query_type.decode("utf-8")
-    elif u"node" in data:
-        data[u"type"] = u"pubsub"
+        data["type"] = query_type
+    elif "node" in data:
+        data["type"] = "pubsub"
     else:
-        data[u"type"] = ""
+        data["type"] = ""
 
-    if u"node" in data:
-        if data[u"node"].startswith(u"urn:xmpp:microblog:"):
-            data[u"sub_type"] = "microblog"
+    if "node" in data:
+        if data["node"].startswith("urn:xmpp:microblog:"):
+            data["sub_type"] = "microblog"
 
     return data
 
 
 def addPairs(uri, pairs):
-    for k, v in pairs.iteritems():
+    for k, v in pairs.items():
         uri.append(
-            u";"
-            + urllib.quote_plus(k.encode("utf-8"))
-            + u"="
-            + urllib.quote_plus(v.encode("utf-8"))
+            ";"
+            + urllib.parse.quote_plus(k.encode("utf-8"))
+            + "="
+            + urllib.parse.quote_plus(v.encode("utf-8"))
         )
 
 
 def buildXMPPUri(type_, **kwargs):
-    uri = [u"xmpp:"]
+    uri = ["xmpp:"]
     subtype = kwargs.pop("subtype", None)
     path = kwargs.pop("path")
-    uri.append(urllib.quote_plus(path.encode("utf-8")).replace(u"%40", "@"))
+    uri.append(urllib.parse.quote_plus(path.encode("utf-8")).replace("%40", "@"))
 
-    if type_ == u"pubsub":
+    if type_ == "pubsub":
         if subtype == "microblog" and not kwargs.get("node"):
-            kwargs[u"node"] = "urn:xmpp:microblog:0"
+            kwargs["node"] = "urn:xmpp:microblog:0"
         if kwargs:
-            uri.append(u"?")
+            uri.append("?")
             addPairs(uri, kwargs)
     else:
-        raise NotImplementedError(u"{type_} URI are not handled yet".format(type_=type_))
+        raise NotImplementedError("{type_} URI are not handled yet".format(type_=type_))
 
-    return u"".join(uri)
+    return "".join(uri)