treewide: drop Python2 imports and version checks

Author: behrmann

varlink/__init__.py

@@ -19,19 +19,19 @@
     __all__ = ['Client', 'ClientInterfaceHandler', 'SimpleClientInterfaceHandler',
                'Service', 'RequestHandler', 'Server', 'ThreadingServer', 'ForkingServer',
                'InterfaceNotFound', 'MethodNotFound', 'MethodNotImplemented', 'InvalidParameter',
-               'ConnectionError', 'VarlinkEncoder', 'VarlinkError',
+               'VarlinkEncoder', 'VarlinkError',
                'Interface', 'Scanner', 'get_listen_fd']
     from .server import ForkingServer
 else:
     __all__ = ['Client', 'ClientInterfaceHandler', 'SimpleClientInterfaceHandler',
                'Service', 'RequestHandler', 'Server', 'ThreadingServer',
                'InterfaceNotFound', 'MethodNotFound', 'MethodNotImplemented', 'InvalidParameter',
-               'ConnectionError', 'VarlinkEncoder', 'VarlinkError',
+               'VarlinkEncoder', 'VarlinkError',
                'Interface', 'Scanner', 'get_listen_fd']
 
 from .client import (Client, ClientInterfaceHandler, SimpleClientInterfaceHandler)
 from .error import (VarlinkEncoder, VarlinkError, InvalidParameter, InterfaceNotFound, MethodNotImplemented,
-                    MethodNotFound, ConnectionError, BrokenPipeError)
+                    MethodNotFound)
 from .scanner import (Scanner, Interface)
 from .server import (Service, get_listen_fd, Server, ThreadingServer, RequestHandler)
 
@@ -51,8 +51,6 @@ def load_tests(loader, tests, pattern):
     test_dir = os.path.dirname(__file__) + "/tests"
     for fn in os.listdir(test_dir):
         if fnmatch(fn, pattern):
-            if sys.version_info[0] == 2 and fn == "test_mocks.py":
-                continue
             modname = "varlink.tests." + fn[:-3]
             __import__(modname)
             module = sys.modules[modname]

varlink/cli.py

@@ -6,9 +6,6 @@
 
 """
 
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import argparse
 import json
 import shlex
@@ -60,7 +57,7 @@ def new_client(address):
                         got = True
         except varlink.VarlinkError as e:
             print(e, file=sys.stderr)
-        except varlink.BrokenPipeError:
+        except BrokenPipeError:
             if not got or args.more:
                 print("Connection closed")
                 sys.exit(1)

varlink/client.py

@@ -1,8 +1,5 @@
 # coding=utf-8
 
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import json
 import os
 import shutil
@@ -13,28 +10,9 @@
 import subprocess
 import threading
 
-try:
-    from builtins import next
-    from builtins import object
-    from builtins import open
-    from builtins import str
-except ImportError:
-    pass
-
-from .error import (VarlinkError, InterfaceNotFound, VarlinkEncoder, BrokenPipeError)
+from .error import (VarlinkError, InterfaceNotFound, VarlinkEncoder)
 from .scanner import (Interface, _Method)
 
-PY2 = sys.version_info[0] == 2
-PY3 = (sys.version_info[0] >= 3)
-
-if PY2:
-    FileNotFoundError = IOError
-    ChildProcessError = OSError
-
-
-class ConnectionError(OSError):
-    pass
-
 
 class ClientInterfaceHandler(object):
     """Base class for varlink client, which wraps varlink methods of an interface to the class"""
@@ -88,10 +66,7 @@ def _wrapped(*args, **kwargs):
             else:
                 return self._call(method.name, *args, **kwargs)
 
-        if sys.version_info.major >= 3:
-            _wrapped.__name__ = method.name
-        else:
-            _wrapped.__name__ = method.name.encode("latin-1")
+        _wrapped.__name__ = method.name
 
         # FIXME: add comments
         if method.signature:

varlink/error.py

@@ -1,23 +1,7 @@
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import json
 
-try:
-    from types import SimpleNamespace
-
-    ConnectionError = ConnectionError
-    BrokenPipeError = BrokenPipeError
-except:  # Python 2
-    from argparse import Namespace as SimpleNamespace
-
-
-    class ConnectionError(OSError):
-        pass
-
 
-    class BrokenPipeError(ConnectionError):
-        pass
+from types import SimpleNamespace
 
 
 class VarlinkEncoder(json.JSONEncoder):

varlink/mock.py

@@ -10,10 +10,6 @@
 import varlink
 
 
-if sys.version_info[0] == 2:
-    raise ImportError("The mock module isn't compatible with python 2")
-
-
 def cast_type(typeof):
     cast = {'str': 'string'}
     typeof = str(typeof).replace("<class '", "").replace("'>", "")

varlink/scanner.py

@@ -1,31 +1,9 @@
 #!-*-coding:utf8-*-
-from __future__ import print_function
-from __future__ import unicode_literals
-
-try:
-    from builtins import str
-    from builtins import int
-    from builtins import object
-    from builtins import unicode
-except ImportError:
-    pass
 
 import re
 
-try:
-    basestring
-except NameError:
-    basestring = str
-
-try:
-    from types import SimpleNamespace
-except:  # Python 2
-    from argparse import Namespace as SimpleNamespace
-
-try:
-    from collections.abc import (Set, Mapping)
-except:  # Python 2
-    from collections import (Set, Mapping)
+from types import SimpleNamespace
+from collections.abc import (Set, Mapping)
 
 from collections import OrderedDict
 
@@ -341,7 +319,7 @@ def filter_params(self, parent_name, varlink_type, _namespaced, args, kwargs):
         if isinstance(varlink_type, _Object):
             return args
 
-        if isinstance(varlink_type, _Enum) and ( isinstance(args, str) or isinstance(args, unicode) ):
+        if isinstance(varlink_type, _Enum) and isinstance(args, str):
             # print("Returned str:", args)
             return args
 
@@ -356,7 +334,7 @@ def filter_params(self, parent_name, varlink_type, _namespaced, args, kwargs):
             # print("Returned set:", set(args))
             return set(args)
 
-        if isinstance(varlink_type, basestring) and isinstance(args, basestring):
+        if isinstance(varlink_type, str) and isinstance(args, str):
             return args
 
         if isinstance(varlink_type, float) and (isinstance(args, float) or isinstance(args, int)):

varlink/server.py

@@ -1,37 +1,20 @@
 # coding=utf-8
 
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import inspect
 import json
 import os
 import socket
 import stat
 import string
 
-try:
-    from builtins import int
-    from builtins import object
-    from builtins import open
-    from builtins import range
-except ImportError:
-    pass
-
-from .error import (InterfaceNotFound, InvalidParameter, MethodNotImplemented, VarlinkEncoder, VarlinkError,
-                    ConnectionError)
+from .error import (InterfaceNotFound, InvalidParameter, MethodNotImplemented, VarlinkEncoder, VarlinkError)
 from .scanner import Interface
 
-try:
-    from socketserver import (StreamRequestHandler, BaseServer, ThreadingMixIn)
-except ImportError:  # Python2
-    from SocketServer import (StreamRequestHandler, BaseServer, ThreadingMixIn)
+
+from socketserver import (StreamRequestHandler, BaseServer, ThreadingMixIn)
 
 if hasattr(os, "fork"):
-    try:
-        from socketserver import ForkingMixIn
-    except ImportError:  # Python2
-        from SocketServer import ForkingMixIn
+    from socketserver import ForkingMixIn
 
 from types import GeneratorType
 

varlink/tests/__init__.py

@@ -8,9 +8,6 @@
 def suite():
     suite = unittest.TestSuite()
     for fn in os.listdir(here):
-        if fn.startswith("test_mocks") and sys.version_info.major < 3:
-            continue
-
         if fn.startswith("test") and fn.endswith(".py"):
             modname = "varlink.tests." + fn[:-3]
             __import__(modname)

varlink/tests/test_basic_network.py

@@ -1,16 +1,9 @@
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import os
 import socket
 import threading
 import unittest
 from sys import platform
 
-try:
-    from builting import str
-except ImportError:
-    pass
 
 import varlink
 
@@ -70,5 +63,5 @@ def test_unix(self):
                         )
 
     def test_wrong_url(self):
-        self.assertRaises(varlink.ConnectionError, self.do_run,
+        self.assertRaises(ConnectionError, self.do_run,
                           "uenix:org.varlink.service_wrong_url_test_%d" % os.getpid())

varlink/tests/test_certification.py

@@ -1,8 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import codecs
 import getopt
 import json
@@ -16,13 +13,6 @@
 import unittest
 from sys import platform
 
-try:
-    from builtins import object
-    from builtins import range
-    from builtins import str
-except ImportError:
-    pass
-
 import varlink