From 255b9e9e5ec21ef36961e1c0c05757a4d8c5eae4 Mon Sep 17 00:00:00 2001
From: surbhi <surbhi@bitmessage.at>
Date: Thu, 6 Feb 2025 16:04:55 +0530
Subject: [PATCH 1/2] Use six in essential files

---
 packages/collectd/pybitmessagestatus.py | 5 +++--
 setup.py                                | 8 ++++----
 src/api.py                              | 1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/collectd/pybitmessagestatus.py b/packages/collectd/pybitmessagestatus.py
index d15c3a48..f82656f7 100644
--- a/packages/collectd/pybitmessagestatus.py
+++ b/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 = ""
diff --git a/setup.py b/setup.py
index 30436bec..0a591d35 100644
--- a/setup.py
+++ b/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',
diff --git a/src/api.py b/src/api.py
index 9f61f40b..d8c6609d 100644
--- a/src/api.py
+++ b/src/api.py
@@ -70,6 +70,7 @@ 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
-- 
2.47.2


From efe05e4443b0c3b9df4ac978d79867ae7a33ded2 Mon Sep 17 00:00:00 2001
From: surbhi <surbhi@bitmessage.at>
Date: Thu, 6 Feb 2025 14:39:26 +0000
Subject: [PATCH 2/2] organize imports

---
 src/api.py | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/api.py b/src/api.py
index d8c6609d..89d4948a 100644
--- a/src/api.py
+++ b/src/api.py
@@ -74,26 +74,20 @@ 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:
@@ -101,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
@@ -225,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')
-- 
2.47.2