Python 2 -> 3 changes.

src/bitmessagemain.py

@@ -42,10 +42,15 @@
     adjustHalfOpenConnectionsLimit, start_proxyconfig)
 from inventory import Inventory
 # Network objects and threads
-from network import (
-    BMConnectionPool, Dandelion, AddrThread, AnnounceThread, BMNetworkThread,
-    InvThread, ReceiveQueueThread, DownloadThread, UploadThread
-)
+from network.addrthread import AddrThread
+from network.connectionpool import BMConnectionPool
+from network.dandelion import Dandelion
+from network.announcethread import AnnounceThread
+from network.networkthread import BMNetworkThread
+from network.invthread import InvThread
+from network.receivequeuethread import ReceiveQueueThread
+from network.downloadthread import DownloadThread
+from network.uploadthread import UploadThread
 from network.knownnodes import readKnownNodes
 from singleinstance import singleinstance
 # Synchronous threads

src/bmconfigparser.py

@@ -2,7 +2,7 @@
 BMConfigParser class definition and default configuration settings
 """
 
-import ConfigParser
+import configparser
 import os
 import shutil
 from datetime import datetime
@@ -43,9 +43,9 @@
 
 
 @Singleton
-class BMConfigParser(ConfigParser.SafeConfigParser):
+class BMConfigParser(configparser.ConfigParser):
     """
-    Singleton class inherited from :class:`ConfigParser.SafeConfigParser`
+    Singleton class inherited from :class:`configparser.ConfigParser`
     with additional methods specific to bitmessage config.
     """
     # pylint: disable=too-many-ancestors
@@ -54,28 +54,28 @@ class BMConfigParser(ConfigParser.SafeConfigParser):
 
     def set(self, section, option, value=None):
         if self._optcre is self.OPTCRE or value:
-            if not isinstance(value, basestring):
+            if not isinstance(value, str):
                 raise TypeError("option values must be strings")
         if not self.validate(section, option, value):
             raise ValueError("Invalid value %s" % value)
-        return ConfigParser.ConfigParser.set(self, section, option, value)
+        return configparser.ConfigParser.set(self, section, option, value)
 
-    def get(self, section, option, raw=False, variables=None):
+    def get(self, section, option, raw=False, vars=None, fallback=None):
         # pylint: disable=arguments-differ
         try:
             if section == "bitmessagesettings" and option == "timeformat":
-                return ConfigParser.ConfigParser.get(
-                    self, section, option, raw, variables)
+                return configparser.ConfigParser.get(
+                    self, section, option, raw = raw, vars = vars)
             try:
                 return self._temp[section][option]
             except KeyError:
                 pass
-            return ConfigParser.ConfigParser.get(
-                self, section, option, True, variables)
-        except ConfigParser.InterpolationError:
-            return ConfigParser.ConfigParser.get(
-                self, section, option, True, variables)
-        except (ConfigParser.NoSectionError, ConfigParser.NoOptionError) as e:
+            return configparser.ConfigParser.get(
+                self, section, option, raw = True, vars = vars)
+        except configparser.InterpolationError:
+            return configparser.ConfigParser.get(
+                self, section, option, raw = True, vars = vars)
+        except (configparser.NoSectionError, configparser.NoOptionError) as e:
             try:
                 return BMConfigDefaults[section][option]
             except (KeyError, ValueError, AttributeError):
@@ -92,7 +92,7 @@ def safeGetBoolean(self, section, field):
         """Return value as boolean, False on exceptions"""
         try:
             return self.getboolean(section, field)
-        except (ConfigParser.NoSectionError, ConfigParser.NoOptionError,
+        except (configparser.NoSectionError, configparser.NoOptionError,
                 ValueError, AttributeError):
             return False
 
@@ -101,23 +101,23 @@ def safeGetInt(self, section, field, default=0):
         0 if default missing"""
         try:
             return self.getint(section, field)
-        except (ConfigParser.NoSectionError, ConfigParser.NoOptionError,
+        except (configparser.NoSectionError, configparser.NoOptionError,
                 ValueError, AttributeError):
             return default
 
     def safeGet(self, section, option, default=None):
         """Return value as is, default on exceptions, None if default missing"""
         try:
             return self.get(section, option)
-        except (ConfigParser.NoSectionError, ConfigParser.NoOptionError,
+        except (configparser.NoSectionError, configparser.NoOptionError,
                 ValueError, AttributeError):
             return default
 
     def items(self, section, raw=False, variables=None):
         """Return section variables as parent,
         but override the "raw" argument to always True"""
         # pylint: disable=arguments-differ
-        return ConfigParser.ConfigParser.items(self, section, True, variables)
+        return configparser.ConfigParser.items(self, section, True, variables)
 
     @staticmethod
     def addresses():
@@ -135,21 +135,21 @@ def _reset(self):
     def read(self, filenames):
         """Read config and populate defaults"""
         self._reset()
-        ConfigParser.ConfigParser.read(self, filenames)
+        configparser.ConfigParser.read(self, filenames)
         for section in self.sections():
             for option in self.options(section):
                 try:
                     if not self.validate(
                         section, option,
-                        ConfigParser.ConfigParser.get(self, section, option)
+                        configparser.ConfigParser.get(self, section, option)
                     ):
                         try:
                             newVal = BMConfigDefaults[section][option]
                         except KeyError:
                             continue
-                        ConfigParser.ConfigParser.set(
+                        configparser.ConfigParser.set(
                             self, section, option, newVal)
-                except ConfigParser.InterpolationError:
+                except configparser.InterpolationError:
                     continue
 
     def save(self):
@@ -168,7 +168,7 @@ def save(self):
             # didn't exist before.
             fileNameExisted = False
         # write the file
-        with open(fileName, 'wb') as configfile:
+        with open(fileName, 'w') as configfile:
             self.write(configfile)
         # delete the backup
         if fileNameExisted:

src/class_addressGenerator.py

@@ -14,7 +14,7 @@
 from addresses import decodeAddress, encodeAddress, encodeVarint
 from bmconfigparser import BMConfigParser
 from fallback import RIPEMD160Hash
-from network import StoppableThread
+from network.threads import StoppableThread
 from pyelliptic import arithmetic
 from pyelliptic.openssl import OpenSSL
 

src/class_singleCleaner.py

@@ -29,7 +29,9 @@
 from bmconfigparser import BMConfigParser
 from helper_sql import sqlExecute, sqlQuery
 from inventory import Inventory
-from network import BMConnectionPool, knownnodes, StoppableThread
+import network.knownnodes
+from network.connectionpool import BMConnectionPool
+from network.threads import StoppableThread
 
 
 #: Equals 4 weeks. You could make this longer if you want

src/class_singleWorker.py

@@ -31,7 +31,8 @@
 from bmconfigparser import BMConfigParser
 from helper_sql import sqlExecute, sqlQuery
 from inventory import Inventory
-from network import knownnodes, StoppableThread
+import network.knownnodes
+from network.threads import StoppableThread
 
 
 def sizeof_fmt(num, suffix='h/s'):

src/debug.py

@@ -35,7 +35,7 @@
 just import and log.
 """
 
-import ConfigParser
+import configparser
 import logging
 import logging.config
 import os
@@ -74,7 +74,7 @@ def configureLogging():
             False,
             'Loaded logger configuration from %s' % logging_config
         )
-    except (OSError, ConfigParser.NoSectionError):
+    except (OSError, configparser.NoSectionError, KeyError):
         if os.path.isfile(logging_config):
             fail_msg = \
                 'Failed to load logger configuration from %s, using default' \

src/depends.py

@@ -7,10 +7,10 @@
 
 # Only really old versions of Python don't have sys.hexversion. We don't
 # support them. The logging module was introduced in Python 2.3
-if not hasattr(sys, 'hexversion') or sys.hexversion < 0x20300F0:
+if not hasattr(sys, 'hexversion'):
     sys.exit(
         'Python version: %s\n'
-        'PyBitmessage requires Python 2.7.4 or greater (but not Python 3)'
+        'PyBitmessage requires Python 2.7.4 or greater'
         % sys.version
     )
 
@@ -301,7 +301,7 @@ def check_openssl():
                 ' OpenSSL 0.9.8b or later with AES, Elliptic Curves (EC),'
                 ' ECDH, and ECDSA enabled.')
             return False
-        matches = cflags_regex.findall(openssl_cflags)
+        matches = cflags_regex.findall(openssl_cflags.decode())
         if matches:
             logger.error(
                 'This OpenSSL library is missing the following required'
@@ -410,19 +410,12 @@ def check_dependencies(verbose=False, optional=False):
 
     # Python 2.7.4 is the required minimum.
     # (https://bitmessage.org/forum/index.php?topic=4081.0)
-    # Python 3+ is not supported, but it is still useful to provide
-    # information about our other requirements.
     logger.info('Python version: %s', sys.version)
     if sys.hexversion < 0x20704F0:
         logger.error(
             'PyBitmessage requires Python 2.7.4 or greater'
             ' (but not Python 3+)')
         has_all_dependencies = False
-    if sys.hexversion >= 0x3000000:
-        logger.error(
-            'PyBitmessage does not support Python 3+. Python 2.7.4'
-            ' or greater is required. Python 2.7.18 is recommended.')
-        sys.exit()
 
     check_functions = [check_ripemd160, check_sqlite, check_openssl]
     if optional:

src/helper_sql.py

@@ -16,12 +16,12 @@
    or isn't thread-safe.
 """
 
-import Queue
+import queue
 import threading
 
-sqlSubmitQueue = Queue.Queue()
+sqlSubmitQueue = queue.Queue()
 """the queue for SQL"""
-sqlReturnQueue = Queue.Queue()
+sqlReturnQueue = queue.Queue()
 """the queue for results"""
 sql_lock = threading.Lock()
 """ lock to prevent queueing a new request until the previous response

src/l10n.py

@@ -64,16 +64,16 @@
 if time_format != DEFAULT_TIME_FORMAT:
     try:
         # Check day names
-        for i in xrange(7):
-            unicode(time.strftime(time_format, (0, 0, 0, 0, 0, 0, i, 0, 0)), encoding)
+        for i in range(7):
+            time.strftime(time_format, (0, 0, 0, 0, 0, 0, i, 0, 0))
         # Check month names
-        for i in xrange(1, 13):
-            unicode(time.strftime(time_format, (0, i, 0, 0, 0, 0, 0, 0, 0)), encoding)
+        for i in range(1, 13):
+            time.strftime(time_format, (0, i, 0, 0, 0, 0, 0, 0, 0))
         # Check AM/PM
-        unicode(time.strftime(time_format, (0, 0, 0, 11, 0, 0, 0, 0, 0)), encoding)
-        unicode(time.strftime(time_format, (0, 0, 0, 13, 0, 0, 0, 0, 0)), encoding)
+        time.strftime(time_format, (0, 0, 0, 11, 0, 0, 0, 0, 0))
+        time.strftime(time_format, (0, 0, 0, 13, 0, 0, 0, 0, 0))
         # Check DST
-        unicode(time.strftime(time_format, (0, 0, 0, 0, 0, 0, 0, 0, 1)), encoding)
+        time.strftime(time_format, (0, 0, 0, 0, 0, 0, 0, 0, 1))
     except:
         logger.exception('Could not decode locale formatted timestamp')
         time_format = DEFAULT_TIME_FORMAT
@@ -110,8 +110,6 @@ def formatTimestamp(timestamp=None, as_unicode=True):
         except ValueError:
             timestring = time.strftime(time_format)
 
-    if as_unicode:
-        return unicode(timestring, encoding)
     return timestring
 
 

src/messagetypes/__init__.py

@@ -1,7 +1,6 @@
 import logging
 from importlib import import_module
 from os import listdir, path
-from string import lower
 
 import messagetypes
 import paths
@@ -12,7 +11,7 @@
 class MsgBase(object):  # pylint: disable=too-few-public-methods
     """Base class for message types"""
     def __init__(self):
-        self.data = {"": lower(type(self).__name__)}
+        self.data = {"": type(self).__name__.lower()}
 
 
 def constructObject(data):

src/multiqueue.py

@@ -3,13 +3,13 @@
 Elements are added into a random subqueue, and retrieval rotates
 """
 
-import Queue
+import queue
 from collections import deque
 
 import helper_random
 
 
-class MultiQueue(Queue.Queue):
+class MultiQueue(queue.Queue):
     """A base queue class"""
     # pylint: disable=redefined-builtin,attribute-defined-outside-init
     defaultQueueCount = 10
@@ -19,7 +19,7 @@ def __init__(self, maxsize=0, count=0):
             self.queueCount = MultiQueue.defaultQueueCount
         else:
             self.queueCount = count
-        Queue.Queue.__init__(self, maxsize)
+        queue.Queue.__init__(self, maxsize)
 
     # Initialize the queue representation
     def _init(self, maxsize):

src/network/__init__.py

@@ -1,20 +0,0 @@
-"""
-Network subsystem packages
-"""
-from addrthread import AddrThread
-from announcethread import AnnounceThread
-from connectionpool import BMConnectionPool
-from dandelion import Dandelion
-from downloadthread import DownloadThread
-from invthread import InvThread
-from networkthread import BMNetworkThread
-from receivequeuethread import ReceiveQueueThread
-from threads import StoppableThread
-from uploadthread import UploadThread
-
-
-__all__ = [
-    "BMConnectionPool", "Dandelion",
-    "AddrThread", "AnnounceThread", "BMNetworkThread", "DownloadThread",
-    "InvThread", "ReceiveQueueThread", "UploadThread", "StoppableThread"
-]

src/network/addrthread.py

@@ -1,14 +1,14 @@
 """
 Announce addresses as they are received from other hosts
 """
-import Queue
+import queue
 
 import state
 from helper_random import randomshuffle
 from network.assemble import assemble_addr
 from network.connectionpool import BMConnectionPool
 from queues import addrQueue
-from threads import StoppableThread
+from network.threads import StoppableThread
 
 
 class AddrThread(StoppableThread):
@@ -22,7 +22,7 @@ def run(self):
                 try:
                     data = addrQueue.get(False)
                     chunk.append(data)
-                except Queue.Empty:
+                except queue.Empty:
                     break
 
             if chunk:

src/network/advanceddispatcher.py

@@ -8,7 +8,7 @@
 
 import network.asyncore_pollchoose as asyncore
 import state
-from threads import BusyError, nonBlocking
+from network.threads import BusyError, nonBlocking
 
 
 class ProcessingError(Exception):

src/network/announcethread.py

@@ -7,8 +7,8 @@
 from bmconfigparser import BMConfigParser
 from network.assemble import assemble_addr
 from network.connectionpool import BMConnectionPool
-from node import Peer
-from threads import StoppableThread
+from network.node import Peer
+from network.threads import StoppableThread
 
 
 class AnnounceThread(StoppableThread):