remove py2 compatibility code

dyndnsc/common/six.py

@@ -2,38 +2,19 @@
 
 """Module for providing python compatibility across interpreter versions."""
 
-import sys
 import inspect
+import ipaddress as _ipaddress
 
-# collect most py23 madness here
-PY3 = sys.version_info[0] == 3
-if PY3:
-    getargspec = inspect.getfullargspec  # pylint: disable=invalid-name
-    string_types = (str,)  # pylint: disable=invalid-name
-    from io import StringIO  # noqa: @UnresolvedImport @UnusedImport pylint: disable=unused-import,import-error
-else:
-    getargspec = inspect.getargspec  # pylint: disable=invalid-name
-    string_types = (basestring,)  # noqa: @UndefinedName pylint: disable=undefined-variable,invalid-name
-    from cStringIO import StringIO  # noqa: @UnresolvedImport @UnusedImport pylint: disable=unused-import,import-error
+getargspec = inspect.getfullargspec  # pylint: disable=invalid-name
+string_types = (str,)  # pylint: disable=invalid-name
+from io import StringIO  # noqa: @UnresolvedImport @UnusedImport pylint: disable=unused-import,import-error
 
 
-if PY3:
-    import ipaddress as _ipaddress
+def ipaddress(addr):
+    """Return an ipaddress.ip_address object from the given string IP."""
+    return _ipaddress.ip_address(addr)
 
-    def ipaddress(addr):
-        """Return an ipaddress.ip_address object from the given string IP."""
-        return _ipaddress.ip_address(addr)
 
-    def ipnetwork(addr):
-        """Return an ipaddress.ip_network object from the given string IP."""
-        return _ipaddress.ip_network(addr)
-else:
-    import IPy as _IPy  # @UnresolvedImport pylint: disable=import-error
-
-    def ipaddress(addr):
-        """Return an IPy.IP object from the given string IP."""
-        return _IPy.IP(addr)
-
-    def ipnetwork(addr):
-        """Return an IPy.IP object from the given string IP."""
-        return _IPy.IP(addr)
+def ipnetwork(addr):
+    """Return an ipaddress.ip_network object from the given string IP."""
+    return _ipaddress.ip_network(addr)

dyndnsc/conf.py

@@ -4,10 +4,7 @@
 
 import logging
 import os
-try:
-    import configparser
-except ImportError:
-    import ConfigParser as configparser
+import configparser
 
 
 from .resources import get_filename, PRESETS_INI

dyndnsc/detector/command.py

@@ -3,7 +3,6 @@
 """Module containing logic for command based detectors."""
 
 from .base import IPDetector
-from ..common.six import PY3
 
 
 class IPDetector_Command(IPDetector):
@@ -34,10 +33,7 @@ def setHostname(self, hostname):
 
     def detect(self):
         """Detect and return the IP address."""
-        if PY3:  # py23
-            import subprocess  # noqa: S404 @UnresolvedImport pylint: disable=import-error
-        else:
-            import commands as subprocess  # @UnresolvedImport pylint: disable=import-error
+        import subprocess  # noqa: S404 @UnresolvedImport pylint: disable=import-error
         try:
             theip = subprocess.getoutput(self.opts_command)  # noqa: S605
         except Exception:

dyndnsc/tests/test_cli.py

@@ -5,13 +5,8 @@
 import unittest
 import argparse
 import os
-# py23
-try:
-    import configparser
-except ImportError:
-    import ConfigParser as configparser
+import configparser
 
-from dyndnsc.common.six import PY3
 from dyndnsc.common.six import StringIO
 from dyndnsc import cli
 
@@ -36,10 +31,7 @@ def test_list_presets(self):
 detector-url = http://ip.example.com/
 detector-parser = plain"""
         parser = configparser.ConfigParser()
-        if PY3:
-            parser.read_file(StringIO(sample_config))
-        else:
-            parser.readfp(StringIO(sample_config))  # pylint: disable=deprecated-method
+        parser.read_file(StringIO(sample_config))
         output = StringIO()
         cli.list_presets(parser, out=output)
         buf = output.getvalue()

dyndnsc/tests/test_conf.py

@@ -3,13 +3,8 @@
 """Tests for the conf module."""
 
 import unittest
-# py23
-try:
-    import configparser
-except ImportError:
-    import ConfigParser as configparser
+import configparser
 
-from dyndnsc.common.six import PY3
 from dyndnsc.common.six import StringIO
 
 from dyndnsc.conf import get_configuration, collect_config
@@ -56,10 +51,7 @@ def test_collect_configuration(self):
 detector-parser = plain
         """
         parser = configparser.ConfigParser()
-        if PY3:
-            parser.read_file(StringIO(sample_config))
-        else:
-            parser.readfp(StringIO(sample_config))  # pylint: disable=deprecated-method
+        parser.read_file(StringIO(sample_config))
         config = collect_config(parser)
         self.assertEqual(dict, type(config))
         self.assertTrue("testconfig" in config)