Use six in essential files

packages/collectd/pybitmessagestatus.py

@@ -1,8 +1,9 @@
 #!/usr/bin/env python2.7
 
-import collectd
 import json
-import xmlrpclib
+
+import collectd
+from six.moves import xmlrpc_client as xmlrpclib
 
 pybmurl = ""
 api = ""

setup.py

@@ -4,14 +4,14 @@ import os
 import platform
 import shutil
 import sys
-
 from importlib import import_module
-from setuptools import setup, Extension
+
+import six
+from setuptools import Extension, setup
 from setuptools.command.install import install
 
 from src.version import softwareVersion
 
-
 EXTRAS_REQUIRE = {
     'docs': ['sphinx'],
     'gir': ['pygobject'],
@@ -83,7 +83,7 @@ if __name__ == "__main__":
         'images/kivy/text_images*.png'
     ]}
 
-    if sys.version_info[0] == 3:
+    if six.PY3:
         packages.extend(
             [
                 'pybitmessage.bitmessagekivy',

src/api.py

@@ -70,29 +70,24 @@ from struct import pack, unpack
 
 import six
 from six.moves import configparser, http_client, xmlrpc_server
+from six.moves.reprlib import repr
 
 import helper_inbox
 import helper_sent
-import protocol
 import proofofwork
+import protocol
 import queues
 import shared
-
 import shutdown
 import state
-from addresses import (
-    addBMIfNotPresent,
-    decodeAddress,
-    decodeVarint,
-    varintDecodeError
-)
+from addresses import (addBMIfNotPresent, decodeAddress, decodeVarint,
+                       varintDecodeError)
 from bmconfigparser import config
 from debug import logger
-from defaults import (
-    networkDefaultProofOfWorkNonceTrialsPerByte,
-    networkDefaultPayloadLengthExtraBytes)
-from helper_sql import (
-    SqlBulkExecute, sqlExecute, sqlQuery, sqlStoredProcedure, sql_ready)
+from defaults import (networkDefaultPayloadLengthExtraBytes,
+                      networkDefaultProofOfWorkNonceTrialsPerByte)
+from helper_sql import (SqlBulkExecute, sql_ready, sqlExecute, sqlQuery,
+                        sqlStoredProcedure)
 from highlevelcrypto import calculateInventoryHash
 
 try:
@@ -100,7 +95,7 @@ try:
 except ImportError:
     connectionpool = None
 
-from network import stats, StoppableThread, invQueue
+from network import StoppableThread, invQueue, stats
 from version import softwareVersion
 
 try:  # TODO: write tests for XML vulnerabilities
@@ -224,8 +219,8 @@ class singleAPI(StoppableThread):
         if config.safeGet(
                 'bitmessagesettings', 'apivariant') == 'json':
             try:
-                from jsonrpclib.SimpleJSONRPCServer import (
-                    SimpleJSONRPCServer as RPCServerBase)
+                from jsonrpclib.SimpleJSONRPCServer import \
+                    SimpleJSONRPCServer as RPCServerBase
             except ImportError:
                 logger.warning(
                     'jsonrpclib not available, failing back to XML-RPC')