Removes Python 2 compatibility code for spacecmd

spacecmd/src/spacecmd/activationkey.py

@@ -33,10 +33,9 @@
 import re
 import shlex
 import gettext
-try:
-    from xmlrpc import client as xmlrpclib
-except ImportError:
-    import xmlrpclib
+
+from xmlrpc import client as xmlrpclib
+
 from spacecmd.i18n import _N
 from spacecmd.utils import *
 

spacecmd/src/spacecmd/api.py

@@ -27,10 +27,9 @@
 import logging
 import sys
 import gettext
-try:
-    from xmlrpc import client as xmlrpclib
-except ImportError:
-    import xmlrpclib
+
+from xmlrpc import client as xmlrpclib
+
 from spacecmd.i18n import _N
 from spacecmd.utils import *
 

spacecmd/src/spacecmd/configchannel.py

@@ -34,10 +34,9 @@
 import base64
 import codecs
 import gettext
-try:
-    from xmlrpc import client as xmlrpclib
-except ImportError:
-    import xmlrpclib
+
+from xmlrpc import client as xmlrpclib
+
 from spacecmd.i18n import _N
 from spacecmd.utils import *
 

spacecmd/src/spacecmd/cryptokey.py

@@ -27,10 +27,9 @@
 # pylint: disable=W0613
 
 import gettext
-try:
-    from xmlrpc import client as xmlrpclib
-except ImportError:
-    import xmlrpclib
+
+from xmlrpc import client as xmlrpclib
+
 from spacecmd.i18n import _N
 from spacecmd.utils import *
 

spacecmd/src/spacecmd/errata.py

@@ -31,10 +31,9 @@
 # pylint: disable=C0103
 
 import gettext
-try:
-    from xmlrpc import client as xmlrpclib
-except ImportError:
-    import xmlrpclib
+
+from xmlrpc import client as xmlrpclib
+
 
 from spacecmd.i18n import _N
 from spacecmd.utils import *

spacecmd/src/spacecmd/group.py

@@ -33,10 +33,9 @@
 import os
 import re
 import shlex
-try:
-    from xmlrpc import client as xmlrpclib
-except ImportError:
-    import xmlrpclib
+
+from xmlrpc import client as xmlrpclib
+
 
 from spacecmd.i18n import _N
 from spacecmd.utils import *

spacecmd/src/spacecmd/kickstart.py

@@ -34,16 +34,12 @@
 import os
 from getpass import getpass
 from operator import itemgetter
-try:
-    from urllib2 import urlopen, HTTPError
-except ImportError:
-    from urllib.request import urlopen
-    from urllib.error import HTTPError
+
+from urllib.request import urlopen
+from urllib.error import HTTPError
 import re
-try:
-    from xmlrpc import client as xmlrpclib
-except ImportError:
-    import xmlrpclib
+
+from xmlrpc import client as xmlrpclib
 
 from spacecmd.i18n import _N
 from spacecmd.utils import *

spacecmd/src/spacecmd/package.py

@@ -30,10 +30,9 @@
 # pylint: disable=C0103
 
 import gettext
-try:
-    from xmlrpc import client as xmlrpclib
-except ImportError:
-    import xmlrpclib
+
+from xmlrpc import client as xmlrpclib
+
 from spacecmd.i18n import _N
 from spacecmd.utils import *
 

spacecmd/src/spacecmd/repo.py

@@ -31,10 +31,9 @@
 
 import gettext
 import shlex
-try:
-    from xmlrpc import client as xmlrpclib
-except ImportError:
-    import xmlrpclib
+
+from xmlrpc import client as xmlrpclib
+
 from spacecmd.i18n import _N
 from spacecmd.utils import *
 

spacecmd/src/spacecmd/schedule.py

@@ -32,10 +32,9 @@
 import base64
 import gettext
 from operator import itemgetter
-try:
-    from xmlrpc import client as xmlrpclib
-except ImportError:
-    import xmlrpclib
+
+from xmlrpc import client as xmlrpclib
+
 from spacecmd.i18n import _N
 from spacecmd.utils import *
 

spacecmd/src/spacecmd/shell.py

@@ -52,7 +52,7 @@
 class UnknownCallException(Exception):
 
     def __init__(self):
-        Exception.__init__(self)
+        super().__init__(self)
 
 
 class SpacewalkShell(Cmd):

spacecmd/src/spacecmd/softwarechannel.py

@@ -31,18 +31,12 @@
 # pylint: disable=C0103
 
 import gettext
-try:
-    from urllib import ContentTooShortError
-except ImportError:
-    from urllib.error import ContentTooShortError
-try:
-    from urllib import urlretrieve
-except ImportError:
-    from urllib.request import urlretrieve
-try:
-    from xmlrpc import client as xmlrpclib
-except ImportError:
-    import xmlrpclib
+
+from urllib.error import ContentTooShortError
+from urllib.request import urlretrieve
+
+from xmlrpc import client as xmlrpclib
+
 from spacecmd.i18n import _N
 from spacecmd.utils import *
 

spacecmd/src/spacecmd/system.py

@@ -33,10 +33,8 @@
 import gettext
 import shlex
 from datetime import datetime
-try:
-    from xmlrpc import client as xmlrpclib
-except ImportError:
-    import xmlrpclib
+from xmlrpc import client as xmlrpclib
+
 from getpass import getpass
 from operator import itemgetter
 from xml.parsers.expat import ExpatError

spacecmd/src/spacecmd/user.py

@@ -33,10 +33,9 @@
 import gettext
 import shlex
 from getpass import getpass
-try:
-    from xmlrpc import client as xmlrpclib
-except ImportError:
-    import xmlrpclib
+
+from xmlrpc import client as xmlrpclib
+
 from spacecmd.i18n import _N
 from spacecmd.utils import *
 

spacecmd/src/spacecmd/utils.py

@@ -40,11 +40,8 @@
 import sys
 import time
 import argparse
+from xmlrpc import client as xmlrpclib
 
-try:
-    from xmlrpc import client as xmlrpclib
-except ImportError:
-    import xmlrpclib
 from collections import deque
 from datetime import datetime, timedelta
 from difflib import unified_diff
@@ -53,10 +50,7 @@
 from subprocess import Popen, PIPE
 from dateutil.parser import isoparse
 
-try:
-    import json
-except ImportError:
-    import simplejson as json  # python < 2.6
+import json
 
 import rpm