Changed the remaining src path to pybitmessage path

setup.py

@@ -7,7 +7,7 @@ import sys
 from setuptools import setup, Extension
 from setuptools.command.install import install
 
-from src.version import softwareVersion
+from pybitmessage.version import softwareVersion
 
 EXTRAS_REQUIRE = {
     'gir': ['pygobject'],
@@ -18,7 +18,7 @@ EXTRAS_REQUIRE = {
     'sound;platform_system=="Windows"': ['winsound'],
     'tor': ['stem'],
     'docs': ['sphinx', 'sphinxcontrib-apidoc', 'm2r'],
-    'qrcode':['qrcode']
+    # 'qrcode':['qrcode']
 }
 
 if sys.version_info[0] == 2:
@@ -113,7 +113,7 @@ if __name__ == "__main__":
         classifiers=[
             "License :: OSI Approved :: MIT License"
             "Operating System :: OS Independent",
-            "Programming Language :: Python :: 2.7 :: Only",
+            "Programming Language :: Python :: 3.7 :: Only",
             "Topic :: Internet",
             "Topic :: Security :: Cryptography",
             "Topic :: Software Development :: Libraries :: Python Modules",

src/addresses.py

@@ -8,7 +8,7 @@ from struct import pack, unpack
 try:
     from debug import logger
 except ModuleNotFoundError:
-    from .debug import logger
+    from pybitmessage.debug import logger
 
 ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
 

src/api.py

@@ -124,50 +124,59 @@ class singleAPI(StoppableThread):
             errno.WSAEADDRINUSE = errno.EADDRINUSE
         for attempt in range(50):
             try:
+                print('+++++++++++++++++++++++127+++++++++++++++')
                 if attempt > 0:
+                    print('+++++++++++++++++++++++128+++++++++++++++')
                     logger.warning(
                         'Failed to start API listener on port %s', port)
                     port = random.randint(32767, 65535)
-                print('pppppppppppppppppppppppppppppp')
-                print('port-{}'.format(port))
-                print('pppppppppppppppppppppppppppppp')
-                print('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
-                print('bbbbbbbbbbbbbbbbbbbbbbbbbbbbb')
-                print(BMConfigParser().get('bitmessagesettings', 'apiinterface'))
-                print('bbbbbbbbbbbbbbbbbbbbbbbbbbbbb')
+                    print('+++++++++++++++++++++++133+++++++++++++++')
+                print('+++++++++++++++++++++++133+++++++++++++++')
                 se = StoppableXMLRPCServer(
                     (BMConfigParser().get(
                         'bitmessagesettings', 'apiinterface'),
                      port),
                     MySimpleXMLRPCRequestHandler, True, True)
+                print('+++++++++++++++++++++++140+++++++++++++++')
             except socket.error as e:
+                print('+++++++++++++++++++++++142+++++++++++++++')
                 if e.errno in (errno.EADDRINUSE, errno.WSAEADDRINUSE):
+                    print('+++++++++++++++++++++++144+++++++++++++++')
                     continue
             else:
                 if attempt > 0:
+                    print('+++++++++++++++++++++++148+++++++++++++++')
                     logger.warning('Setting apiport to %s', port)
                     BMConfigParser().set(
                         'bitmessagesettings', 'apiport', str(port))
                     BMConfigParser().save()
+                    print('+++++++++++++++++++++++153+++++++++++++++')
                 break
         
+        print('+++++++++++++++++++++++156+++++++++++++++')
         se.register_introspection_functions()
-
+        print('+++++++++++++++++++++++158+++++++++++++++')
         apiNotifyPath = BMConfigParser().safeGet(
             'bitmessagesettings', 'apinotifypath')
-
+        print('------------161-------------------')
         if apiNotifyPath:
+            print('------------162-------------------')
             logger.info('Trying to call %s', apiNotifyPath)
+            print('------------165-------------------')
             try:
+                print('------------167-------------------')
                 subprocess.call([apiNotifyPath, "startingUp"])
             except OSError:
+                print('------------170-------------------')
                 logger.warning(
                     'Failed to call %s, removing apinotifypath setting',
                     apiNotifyPath)
                 BMConfigParser().remove_option(
                     'bitmessagesettings', 'apinotifypath')
-
+        print('------------176-------------------')
         se.serve_forever()
+        print('---------178------------------------')
+        
 
 
 class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):

src/bitmessagecli.py

@@ -26,7 +26,7 @@ import xmlrpc.client as xmlrpclib
 try:
     from bmconfigparser import BMConfigParser
 except:
-    from .bmconfigparser import BMConfigParser
+    from pybitmessage.bmconfigparser import BMConfigParser
 
 api = ''
 keysName = 'keys.dat'

src/bmconfigparser.py

@@ -11,8 +11,8 @@ try:
     import state
     from singleton import Singleton  
 except ModuleNotFoundError:
-    from . import  state
-    from .singleton import Singleton
+    from pybitmessage import  state
+    from pybitmessage.singleton import Singleton
   
 
 BMConfigDefaults = {

src/class_addressGenerator.py

@@ -18,18 +18,18 @@ try:
     from pyelliptic.openssl import OpenSSL
     from network.threads import StoppableThread
 except ModuleNotFoundError:
-    from . import defaults
-    from .import highlevelcrypto
-    from . import queues
-    from . import shared
-    from . import state
-    from . import tr
-    from .addresses import decodeAddress, encodeAddress, encodeVarint
-    from .bmconfigparser import BMConfigParser
-    from .fallback import RIPEMD160Hash
-    from .pyelliptic import arithmetic
-    from .pyelliptic.openssl import OpenSSL
-    from .network.threads import StoppableThread
+    from pybitmessage import defaults
+    from pybitmessage import highlevelcrypto
+    from pybitmessage import queues
+    from pybitmessage import shared
+    from pybitmessage import state
+    from pybitmessage import tr
+    from pybitmessage.addresses import decodeAddress, encodeAddress, encodeVarint
+    from pybitmessage.bmconfigparser import BMConfigParser
+    from pybitmessage.fallback import RIPEMD160Hash
+    from pybitmessage.pyelliptic import arithmetic
+    from pybitmessage.pyelliptic.openssl import OpenSSL
+    from pybitmessage.network.threads import StoppableThread
 
 class addressGenerator(StoppableThread):
     """A thread for creating addresses"""

src/class_objectProcessor.py

@@ -36,28 +36,28 @@ try:
     from network import bmproto
     from network.node import Peer
 except ModuleNotFoundError:
-    from . import helper_bitcoin
-    from . import helper_inbox
-    from . import helper_msgcoding
-    from . import helper_sent
-    from . import highlevelcrypto
-    from . import knownnodes
-    from . import l10n
-    from . import protocol
-    from . import queues
-    from . import shared
-    from . import state
-    from . import tr
-    from .addresses import (
+    from pybitmessage import helper_bitcoin
+    from pybitmessage import helper_inbox
+    from pybitmessage import helper_msgcoding
+    from pybitmessage import helper_sent
+    from pybitmessage import highlevelcrypto
+    from pybitmessage import knownnodes
+    from pybitmessage import l10n
+    from pybitmessage import protocol
+    from pybitmessage import queues
+    from pybitmessage import shared
+    from pybitmessage import state
+    from pybitmessage import tr
+    from pybitmessage.addresses import (
         calculateInventoryHash, decodeAddress, decodeVarint,
         encodeAddress, encodeVarint, varintDecodeError
     )
-    from .bmconfigparser import BMConfigParser
-    from .fallback import RIPEMD160Hash
-    from .helper_ackPayload import genAckPayload
-    from .helper_sql import SqlBulkExecute, sqlExecute, sqlQuery
-    from .network import bmproto
-    from .network.node import Peer
+    from pybitmessage.bmconfigparser import BMConfigParser
+    from pybitmessage.fallback import RIPEMD160Hash
+    from pybitmessage.helper_ackPayload import genAckPayload
+    from pybitmessage.helper_sql import SqlBulkExecute, sqlExecute, sqlQuery
+    from pybitmessage.network import bmproto
+    from pybitmessage.network.node import Peer
 # pylint: disable=too-many-locals, too-many-return-statements, too-many-branches, too-many-statements
 
 logger = logging.getLogger('default')

src/class_singleCleaner.py

@@ -37,16 +37,16 @@ try:
     from network.threads import StoppableThread
 
 except ModuleNotFoundError:
-    from . import shared
-    from . import knownnodes
-    from . import queues
-    from . import state
-    from . import tr
-    from .bmconfigparser import BMConfigParser
-    from .helper_sql import sqlExecute, sqlQuery
-    from .inventory import Inventory
-    from .network.connectionpool import BMConnectionPool
-    from .network.threads import StoppableThread
+    from pybitmessage import shared
+    from pybitmessage import knownnodes
+    from pybitmessage import queues
+    from pybitmessage import state
+    from pybitmessage import tr
+    from pybitmessage.bmconfigparser import BMConfigParser
+    from pybitmessage.helper_sql import sqlExecute, sqlQuery
+    from pybitmessage.inventory import Inventory
+    from pybitmessage.network.connectionpool import BMConnectionPool
+    from pybitmessage.network.threads import StoppableThread
 
 #: Equals 4 weeks. You could make this longer if you want
 #: but making it shorter would not be advisable because

src/class_singleWorker.py

@@ -35,26 +35,26 @@ try:
     from inventory import Inventory
     from network.threads import StoppableThread
 except ModuleNotFoundError:
-    from . import defaults
-    from . import helper_inbox
-    from . import helper_msgcoding
-    from . import helper_random
-    from . import highlevelcrypto
-    from . import l10n
-    from . import proofofwork
-    from . import protocol
-    from . import queues
-    from . import shared
-    from . import state
-    from . import tr
-    from .addresses import (
+    from pybitmessage import defaults
+    from pybitmessage import helper_inbox
+    from pybitmessage import helper_msgcoding
+    from pybitmessage import helper_random
+    from pybitmessage import highlevelcrypto
+    from pybitmessage import l10n
+    from pybitmessage import proofofwork
+    from pybitmessage import protocol
+    from pybitmessage import queues
+    from pybitmessage import shared
+    from pybitmessage import state
+    from pybitmessage import tr
+    from pybitmessage.addresses import (
         calculateInventoryHash, decodeAddress, decodeVarint, encodeVarint
     )
 
-    from .bmconfigparser import BMConfigParser
-    from .helper_sql import sqlExecute, sqlQuery
-    from .inventory import Inventory
-    from .network.threads import StoppableThread
+    from pybitmessage.bmconfigparser import BMConfigParser
+    from pybitmessage.helper_sql import sqlExecute, sqlQuery
+    from pybitmessage.inventory import Inventory
+    from pybitmessage.network.threads import StoppableThread
 # This thread, of which there is only one, does the heavy lifting:
 # calculating POWs.
 

src/class_smtpDeliver.py

@@ -14,10 +14,10 @@ try:
     from network.threads import StoppableThread
 
 except ModuleNotFoundError:
-    from . import queues
-    from . import state
-    from .bmconfigparser import BMConfigParser
-    from .network.threads import StoppableThread
+    from pybitmessage import queues
+    from pybitmessage import state
+    from pybitmessage.bmconfigparser import BMConfigParser
+    from pybitmessage.network.threads import StoppableThread
     
     
 SMTPDOMAIN = "bmaddr.lan"

src/class_smtpServer.py

@@ -21,13 +21,13 @@ try:
     from network.threads import StoppableThread
     from version import softwareVersion
 except ModuleNotFoundError:
-    from . import queues
-    from .addresses import decodeAddress
-    from .bmconfigparser import BMConfigParser
-    from .helper_ackPayload import genAckPayload
-    from .helper_sql import sqlExecute
-    from .network.threads import StoppableThread
-    from .version import softwareVersion
+    from pybitmessage import queues
+    from pybitmessage.addresses import decodeAddress
+    from pybitmessage.bmconfigparser import BMConfigParser
+    from pybitmessage.helper_ackPayload import genAckPayload
+    from pybitmessage.helper_sql import sqlExecute
+    from pybitmessage.network.threads import StoppableThread
+    from pybitmessage.version import softwareVersion
 
 SMTPDOMAIN = "bmaddr.lan"
 LISTENPORT = 8425

src/class_sqlThread.py

@@ -18,14 +18,14 @@ try:
     from bmconfigparser import BMConfigParser
     from debug import logger
 except ModuleNotFoundError:
-    from . import helper_sql
-    from . import helper_startup
-    from . import paths
-    from . import queues
-    from . import state
-    from . import tr
-    from .bmconfigparser import BMConfigParser
-    from .debug import logger
+    from pybitmessage import helper_sql
+    from pybitmessage import helper_startup
+    from pybitmessage import paths
+    from pybitmessage import queues
+    from pybitmessage import state
+    from pybitmessage import tr
+    from pybitmessage.bmconfigparser import BMConfigParser
+    from pybitmessage.debug import logger
 # pylint: disable=attribute-defined-outside-init,protected-access
 
 

src/debug.py

@@ -44,8 +44,8 @@ try:
     import helper_startup
     import state
 except ModuleNotFoundError:
-    from . import helper_startup, state
-    from . import state
+    from pybitmessage import helper_startup, state
+    from pybitmessage import state
 
 helper_startup.loadConfig()
 # Now can be overriden from a config file, which uses standard python

src/depends.py

@@ -9,7 +9,7 @@ from importlib import import_module
 try:
     import state
 except ModuleNotFoundError:
-    from . import  state
+    from pybitmessage import  state
     
 # 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
@@ -278,8 +278,10 @@ def check_openssl():
     openssl_cflags = None
 
     cflags_regex = re.compile(r'(?:OPENSSL_NO_)(AES|EC|ECDH|ECDSA)(?!\w)')
-
-    import pyelliptic.openssl
+    try:
+        from pyelliptic import openssl
+    except:
+        from pybitmessage.pyelliptic import openssl
 
     for path in paths:
         logger.info('Checking OpenSSL at %s', path)
@@ -290,7 +292,7 @@ def check_openssl():
         logger.info('OpenSSL Name: %s', library._name)
         try:
             openssl_version, openssl_hexversion, openssl_cflags = \
-                pyelliptic.openssl.get_version(library)
+                openssl.get_version(library)
         except AttributeError:  # sphinx chokes
             return True
         if not openssl_version:

src/helper_ackPayload.py

@@ -10,9 +10,9 @@ try:
     import highlevelcrypto
     from addresses import encodeVarint
 except ModuleNotFoundError:
-    from . import helper_random
-    from . import highlevelcrypto
-    from .addresses import encodeVarint
+    from pybitmessage import helper_random
+    from pybitmessage import highlevelcrypto
+    from pybitmessage.addresses import encodeVarint
 
 def genAckPayload(streamNumber=1, stealthLevel=0):
     """

src/helper_bitcoin.py

@@ -7,8 +7,8 @@ try:
     from debug import logger
     from pyelliptic import arithmetic
 except ModuleNotFoundError:
-    from .debug import logger
-    from .pyelliptic import arithmetic
+    from pybitmessage.debug import logger
+    from pybitmessage.pyelliptic import arithmetic
     
 
 def calculateBitcoinAddressFromPubkey(pubkey):

src/helper_generic.py

@@ -20,11 +20,11 @@ try:
     import shutdown
     from debug import logger
 except ModuleNotFoundError:
-    from . import shared
-    from . import state
-    from . import queues
-    from . import shutdown
-    from .debug import logger
+    from pybitmessage import shared
+    from pybitmessage import state
+    from pybitmessage import queues
+    from pybitmessage import shutdown
+    from pybitmessage.debug import logger
 
 def powQueueSize():
     curWorkerQueue = queues.workerQueue.qsize()

src/helper_inbox.py

@@ -4,8 +4,8 @@ try:
     import queues
     from helper_sql import sqlExecute, sqlQuery
 except ModuleNotFoundError:
-    from . import queues
-    from .helper_sql import sqlExecute, sqlQuery
+    from pybitmessage import queues
+    from pybitmessage.helper_sql import sqlExecute, sqlQuery
 
 def insert(t):
     """Perform an insert into the "inbox" table"""

src/helper_msgcoding.py

@@ -11,10 +11,10 @@ try:
     from tr import _translate
 
 except ModuleNotFoundError:
-    from . import messagetypes
-    from .bmconfigparser import BMConfigParser
-    from .debug import logger
-    from .tr import _translate
+    from pybitmessage import messagetypes
+    from pybitmessage.bmconfigparser import BMConfigParser
+    from pybitmessage.debug import logger
+    from pybitmessage.tr import _translate
 
 try:
     import msgpack

src/helper_random.py

@@ -8,7 +8,7 @@ import random
 try:
     from pyelliptic.openssl import OpenSSL
 except ModuleNotFoundError:
-    from .pyelliptic.openssl import OpenSSL
+    from pybitmessage.pyelliptic.openssl import OpenSSL
 
 NoneType = type(None)
 

src/helper_sent.py

@@ -4,7 +4,7 @@ Insert values into sent table
 try:
     from helper_sql import sqlExecute
 except ModuleNotFoundError:
-    from .helper_sql import sqlExecute
+    from pybitmessage.helper_sql import sqlExecute
 
 def insert(t):
     """Perform an insert into the `sent` table"""

src/helper_startup.py

@@ -16,11 +16,11 @@ try:
     import state
     from bmconfigparser import BMConfigParser
 except ModuleNotFoundError:
-    from . import defaults
-    from . import helper_random ,paths, state
-    from .bmconfigparser import BMConfigParser
+    from pybitmessage import defaults
+    from pybitmessage import helper_random ,paths, state
+    from pybitmessage.bmconfigparser import BMConfigParser
 try:
-    from .plugins.plugin import get_plugin
+    from pybitmessage.plugins.plugin import get_plugin
 except ImportError:
     get_plugin = None
 

src/highlevelcrypto.py

@@ -14,10 +14,10 @@ try:
     from pyelliptic import OpenSSL
     from pyelliptic import arithmetic as a
 except ModuleNotFoundError:
-    from . import pyelliptic
-    from .bmconfigparser import BMConfigParser
-    from .pyelliptic import OpenSSL
-    from .pyelliptic import arithmetic as a
+    from pybitmessage import pyelliptic
+    from pybitmessage.bmconfigparser import BMConfigParser
+    from pybitmessage.pyelliptic import OpenSSL
+    from pybitmessage.pyelliptic import arithmetic as a
     
 
 def makeCryptor(privkey):

src/l10n.py

@@ -8,7 +8,7 @@ import time
 try:
     from bmconfigparser import BMConfigParser
 except ModuleNotFoundError:
-    from .bmconfigparser import BMConfigParser
+    from pybitmessage.bmconfigparser import BMConfigParser
 
 logger = logging.getLogger('default')
 

src/main.py

@@ -3,8 +3,8 @@ try:
     import state
     from bitmessagemain import main
 except ModuleNotFoundError:
-    from . import  state
-    from .bitmessagemain import main
+    from pybitmessage import  state
+    from pybitmessage.bitmessagemain import main
 # import state
 
     
@@ -14,5 +14,5 @@ if __name__ == '__main__':
     try:
         from bitmessagemain import main
     except ModuleNotFoundError:
-        from .bitmessagemain import main
+        from pybitmessage.bitmessagemain import main
     main()

src/messagetypes/__init__.py

@@ -60,7 +60,7 @@ else:
             import_module(".{}".format(splitted[0]), "messagetypes")
         except ModuleNotFoundError:
             try:
-                from . import chatmsg
+                from pybitmessage.messagetypes import chatmsg
             except ImportError:
                 logger.error("Error importing %s", mod, exc_info=True)
         else:

src/multiqueue.py

@@ -9,7 +9,7 @@ from collections import deque
 try:
     import helper_random
 except ModuleNotFoundError:
-    from . import helper_random
+    from pybitmessage import helper_random
 
 class MultiQueue(Queue.Queue):
     """A base queue class"""

src/namecoin.py

@@ -17,11 +17,11 @@ try:
     from bmconfigparser import BMConfigParser
     from debug import logger
 except ModuleNotFoundError:
-    from . import defaults
-    from . import tr  # translate
-    from .addresses import decodeAddress
-    from .bmconfigparser import BMConfigParser
-    from .debug import logger
+    from pybitmessage import defaults
+    from pybitmessage import tr  # translate
+    from pybitmessage.addresses import decodeAddress
+    from pybitmessage.bmconfigparser import BMConfigParser
+    from pybitmessage.debug import logger
     
 
 configSection = "bitmessagesettings"

src/network/__init__.py

@@ -10,7 +10,7 @@ try:
     from network.threads import StoppableThread
     from network.uploadthread import UploadThread
 
-except ModuleNotFoundError:
+except (ModuleNotFoundError,ImportError):
     from pybitmessage.network.addrthread import AddrThread
     from pybitmessage.network.announcethread import AnnounceThread
     from pybitmessage.network.connectionpool import BMConnectionPool

src/network/bmproto.py

@@ -33,7 +33,7 @@ try:
     from network.node import Node, Peer
     from network.randomtrackingdict import RandomTrackingDict
     from queues import objectProcessorQueue, portCheckerQueue, invQueue
-except ModuleNotFoundError:
+except (ModuleNotFoundError,ImportError):
     from pybitmessage import addresses
     from pybitmessage.network import connectionpool
     from pybitmessage import knownnodes

src/network/connectionpool.py

@@ -21,7 +21,8 @@ try:
         TCPServer, Socks5BMConnection, Socks4aBMConnection, TCPConnection, bootstrap)
     from network.udp import UDPSocket
     from singleton import Singleton
-except ModuleNotFoundError:
+    from network.node import Peer
+except (ModuleNotFoundError,ImportError):
     from pybitmessage.network import asyncore_pollchoose as asyncore
     from pybitmessage import helper_random
     from pybitmessage import knownnodes
@@ -35,8 +36,7 @@ except ModuleNotFoundError:
         TCPServer, Socks5BMConnection, Socks4aBMConnection, TCPConnection, bootstrap)
     from pybitmessage.network.udp import UDPSocket
     from pybitmessage.singleton import Singleton
-    
-from .node import Peer
+    from pybitmessage.network.node import Peer
 
 logger = logging.getLogger('default')
 
@@ -187,6 +187,7 @@ class BMConnectionPool(object):
     @staticmethod
     def getListeningIP():
         """What IP are we supposed to be listening on?"""
+        #its need to this fix
         if BMConfigParser().safeGet(
                 "bitmessagesettings", "onionhostname").endswith(".onion"):
             host = BMConfigParser().safeGet(

src/network/http.py

@@ -8,11 +8,11 @@ try:
     from socks5 import Socks5Connection, Socks5Resolver
     from socks4a import Socks4aConnection, Socks4aResolver
 except ModuleNotFoundError:
-    from .advanceddispatcher import AdvancedDispatcher
-    from . import asyncore_pollchoose as asyncore
-    from .proxy import ProxyError
-    from .socks5 import Socks5Connection, Socks5Resolver
-    from .socks4a import Socks4aConnection, Socks4aResolver
+    from pybitmessage.network.advanceddispatcher import AdvancedDispatcher
+    import pybitmessage.network.asyncore_pollchoose as asyncore
+    from pybitmessage.network.proxy import ProxyError
+    from pybitmessage.network.socks5 import Socks5Connection, Socks5Resolver
+    from pybitmessage.network.socks4a import Socks4aConnection, Socks4aResolver
 
 class HttpError(ProxyError):
     pass

src/network/objectracker.py

@@ -7,7 +7,7 @@ try:
     from network.connectionpool import connectionpool
     from network.dandelion import Dandelion
     from network.randomtrackingdict import RandomTrackingDict
-except:
+except (ModuleNotFoundError,ImportError):
     from pybitmessage.network import connectionpool
     from pybitmessage.network.dandelion import Dandelion
     from pybitmessage.network.randomtrackingdict import RandomTrackingDict

src/network/stats.py

@@ -8,9 +8,9 @@ try:
     from network.connectionpool import BMConnectionPool
     from network.objectracker import missingObjects
 except ModuleNotFoundError:
-    from . import asyncore_pollchoose as asyncore
-    from .connectionpool import BMConnectionPool
-    from .objectracker import missingObjects
+    from pybitmessage.network import asyncore_pollchoose as asyncore
+    from pybitmessage.network.connectionpool import BMConnectionPool
+    from pybitmessage.network.objectracker import missingObjects
 
 lastReceivedTimestamp = time.time()
 lastReceivedBytes = 0

src/network/tcp.py

@@ -29,9 +29,9 @@ try:
     from network.socks4a import Socks4aConnection
     from network.socks5 import Socks5Connection
     from network.tls import TLSDispatcher
-    from .node import Peer
+    from network.node import Peer
     from queues import UISignalQueue, invQueue, receiveDataQueue
-except ModuleNotFoundError:
+except (ModuleNotFoundError,ImportError):
     from pybitmessage import addresses
     from pybitmessage import helper_random
     from pybitmessage import knownnodes

src/network/udp.py

@@ -13,7 +13,7 @@ try:
     import state
     from queues import receiveDataQueue
 
-except ModuleNotFoundError:
+except (ModuleNotFoundError,ImportError):
     from pybitmessage import protocol
     from pybitmessage import state
     from pybitmessage.network.bmproto import BMProto

src/openclpow.py

@@ -11,10 +11,10 @@ try:
     from debug import logger
     from state import shutdown
 except ModuleNotFoundError:
-    from . import paths
-    from .bmconfigparser import BMConfigParser
-    from .debug import logger
-    from .state import shutdown
+    from pybitmessage import paths
+    from pybitmessage.bmconfigparser import BMConfigParser
+    from pybitmessage.debug import logger
+    from pybitmessage.state import shutdown
 
 libAvailable = True
 ctx = False

src/proofofwork.py

@@ -22,13 +22,13 @@ try:
 
 except ModuleNotFoundError:
     try:
-        from . import openclpow
-        from . import paths
-        from . import queues
-        from . import state
-        from . import tr
-        from .bmconfigparser import BMConfigParser
-        from .debug import logger
+        from pybitmessage import openclpow
+        from pybitmessage import paths
+        from pybitmessage import queues
+        from pybitmessage import state
+        from pybitmessage import tr
+        from pybitmessage.bmconfigparser import BMConfigParser
+        from pybitmessage.debug import logger
     except ImportError:
         import openclpow
 try:        

src/protocol.py

@@ -25,16 +25,16 @@ try:
     from helper_sql import sqlExecute
     from version import softwareVersion
 except ModuleNotFoundError:
-    from . import defaults
-    from . import highlevelcrypto
-    from . import state
-    from .addresses import (
+    from pybitmessage import defaults
+    from pybitmessage import highlevelcrypto
+    from pybitmessage import state
+    from pybitmessage.addresses import (
         encodeVarint, decodeVarint, decodeAddress, varintDecodeError)
-    from .bmconfigparser import BMConfigParser
-    from .debug import logger
-    from .fallback import RIPEMD160Hash
-    from .helper_sql import sqlExecute
-    from .version import softwareVersion
+    from pybitmessage.bmconfigparser import BMConfigParser
+    from pybitmessage.debug import logger
+    from pybitmessage.fallback import RIPEMD160Hash
+    from pybitmessage.helper_sql import sqlExecute
+    from pybitmessage.version import softwareVersion
 
 # Service flags
 #: This is a normal network node

src/pyelliptic/__init__.py

@@ -8,13 +8,21 @@ For modern cryptography with ECC, AES, HMAC, Blowfish, ...
 
 This is an abandoned package maintained inside of the PyBitmessage.
 """
+try:
+    from pyelliptic.cipher import Cipher
+    from pyelliptic.ecc import ECC
+    from pyelliptic.eccblind import ECCBlind
+    from pyelliptic.eccblindchain import ECCBlindChain
+    from pyelliptic.hash import hmac_sha256, hmac_sha512, pbkdf2
+    from pyelliptic.openssl import OpenSSL
+except:
+    from pybitmessage.pyelliptic.cipher import Cipher
+    from pybitmessage.pyelliptic.ecc import ECC
+    from pybitmessage.pyelliptic.eccblind import ECCBlind
+    from pybitmessage.pyelliptic.eccblindchain import ECCBlindChain
+    from pybitmessage.pyelliptic.hash import hmac_sha256, hmac_sha512, pbkdf2
+    from pybitmessage.pyelliptic.openssl import OpenSSL
 
-from .cipher import Cipher
-from .ecc import ECC
-from .eccblind import ECCBlind
-from .eccblindchain import ECCBlindChain
-from .hash import hmac_sha256, hmac_sha512, pbkdf2
-from .openssl import OpenSSL
 
 __version__ = '1.3'
 

src/pyelliptic/cipher.py

@@ -5,9 +5,11 @@ Symmetric Encryption
 """
 #  Copyright (C) 2011 Yann GUIBET <yannguibet@gmail.com>
 #  See LICENSE for details.
-
-from .openssl import OpenSSL
-
+try:
+    from pyelliptic.openssl import OpenSSL
+except:
+    from pybitmessage.pyelliptic.openssl import OpenSSL
+    
 
 # pylint: disable=redefined-builtin
 class Cipher(object):

src/pyelliptic/eccblind.py

@@ -14,7 +14,10 @@ import time
 from hashlib import sha256
 from struct import pack, unpack
 
-from .openssl import OpenSSL
+try:
+    from pyelliptic.openssl import OpenSSL
+except:
+    from pybitmessage.pyelliptic.openssl import OpenSSL
 
 # first byte in serialisation can contain data
 Y_BIT = 0x01

src/pyelliptic/hash.py

@@ -4,7 +4,10 @@ Wrappers for hash functions from OpenSSL.
 #  Copyright (C) 2011 Yann GUIBET <yannguibet@gmail.com>
 #  See LICENSE for details.
 
-from .openssl import OpenSSL
+try:
+    from pyelliptic.openssl import OpenSSL
+except:
+    from pybitmessage.pyelliptic.openssl import OpenSSL
 
 
 # For python3

src/queues.py

@@ -7,7 +7,7 @@ import time
 try:
     from multiqueue import MultiQueue
 except ModuleNotFoundError:
-    from .multiqueue import MultiQueue
+    from pybitmessage.multiqueue import MultiQueue
 
 class ObjectProcessorQueue(Queue.Queue):
     """Special queue class using lock for `.threads.objectProcessor`"""

src/shared.py

@@ -31,14 +31,14 @@ try:
     from helper_sql import sqlQuery
 except ModuleNotFoundError:
     try:
-        from . import state
-        from .bmconfigparser import BMConfigParser
-        from .addresses import decodeAddress, encodeVarint
-        from .debug import logger
-        from . import highlevelcrypto
-        from .helper_sql import sqlQuery
+        from pybitmessage import state
+        from pybitmessage.bmconfigparser import BMConfigParser
+        from pybitmessage.addresses import decodeAddress, encodeVarint
+        from pybitmessage.debug import logger
+        from pybitmessage import highlevelcrypto
+        from pybitmessage.helper_sql import sqlQuery
         platform = ''
-        from .pyelliptic import arithmetic
+        from pybitmessage.pyelliptic import arithmetic
     except ImportError:
         import state
         from bmconfigparser import BMConfigParser

src/singleinstance.py

@@ -10,7 +10,7 @@ import sys
 try:
     import state
 except ModuleNotFoundError:
-    from . import state
+    from pybitmessage import state
 try:
     import fcntl  # @UnresolvedImport
 except ImportError:

src/tests/test_api.py

@@ -13,6 +13,10 @@ from .tests_compatibility import utils
 class TestAPIProto(TestProcessProto):
     """Test case logic for testing API"""
     _process_cmd = ['pybitmessage', '-t']
+    # _files = (
+    #     'keys.dat', 'messages.dat', 'knownnodes.dat',
+    #     '.api_started', 'unittest.lock'
+    # )
 
     @classmethod
     def setUpClass(cls):
@@ -21,16 +25,20 @@ class TestAPIProto(TestProcessProto):
         print('@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@')
         
         """Setup XMLRPC proxy for pybitmessage API"""
-        super(TestAPIProto, cls).setUpClass()
+        # super(TestAPIProto, cls).tearDownClass()
+        try:
+            super(TestAPIProto, cls).setUpClass()
+        except:
+            pass
+
         cls.addresses = []
         cls.api = xmlrpclib.ServerProxy(    
-             "http://username:password@127.0.0.1:8442/")
+            "http://username:password@127.0.0.1:8442/")
         for _ in range(5):
             if cls._get_readline('.api_started'):
                 return
             time.sleep(1)
 
-
 class TestAPIShutdown(TestAPIProto, TestProcessShutdown):
     """Separate test case for API command 'shutdown'"""
     def test_shutdown(self):
@@ -66,7 +74,7 @@ class TestAPI(TestAPIProto):
             ' authentication at all.'
         )
 
-    def test_connection(self):
+    def test_connection(self):  
         """API command 'helloWorld'"""
         print('---------67--------------------')
         print('---------68--------------------')

src/tests/test_process.py

@@ -30,13 +30,9 @@ class TestProcessProto(unittest.TestCase):
     """
     _process_cmd = ['pybitmessage', '-d']
     _threads_count = 15
-    '''
-    debug.log is removed because debug.log are pending to implement on the 
-    python3
-    '''
     _files = (
-        'keys.dat', 'messages.dat', 'knownnodes.dat',
-        '.api_started', 'unittest.lock'
+        'keys.dat', 'debug.log', 'messages.dat', 'knownnodes.dat',
+        '.api_started', 'unittest.lock','singleton.lock'
     )
  
     @classmethod
@@ -55,7 +51,7 @@ class TestProcessProto(unittest.TestCase):
         pfile = os.path.join(cls.home, pfile)
         try:
             return open(pfile, 'rb').readline().strip()
-        except (OSError, IOError):
+        except (OSError, IOError, FileNotFoundError):
             pass
 
     @classmethod
@@ -78,11 +74,14 @@ class TestProcessProto(unittest.TestCase):
     @classmethod
     def tearDownClass(cls):
         """Ensures that pybitmessage stopped and removes files"""
+        print('######################################')
+        print('is this are even called tearDownClass')
+        print('######################################')
         try:
             if not cls._stop_process():
                 print(open(os.path.join(cls.home, 'debug.log'), 'rb').read())
                 cls.process.kill()
-        except psutil.NoSuchProcess:
+        except (psutil.NoSuchProcess, FileNotFoundError, AttributeError) as e:
             pass
         finally:
             cls._cleanup_files()
@@ -128,7 +127,7 @@ class TestProcess(TestProcessProto):
     """A test case for pybitmessage process"""
     def test_process_name(self):
         """Check PyBitmessage process name"""
-        self.assertEqual(self.process.name(), 'PyBitmessage')
+        self.assertEqual(self.process.name(), 'pybitmessage')
 
     def test_files(self):
         """Check existence of PyBitmessage files"""

src/threads.py

@@ -23,11 +23,11 @@ try:
     from class_singleWorker import singleWorker
     from class_sqlThread import sqlThread
 except ModuleNotFoundError:
-    from .class_addressGenerator import addressGenerator
-    from .class_objectProcessor import objectProcessor
-    from .class_singleCleaner import singleCleaner
-    from .class_singleWorker import singleWorker
-    from .class_sqlThread import sqlThread
+    from pybitmessage.class_addressGenerator import addressGenerator
+    from pybitmessage.class_objectProcessor import objectProcessor
+    from pybitmessage.class_singleCleaner import singleCleaner
+    from pybitmessage.class_singleWorker import singleWorker
+    from pybitmessage.class_sqlThread import sqlThread
 try:
     import prctl
 except ImportError:

src/tr.py

@@ -5,7 +5,7 @@ import os
 try:
     import state
 except ModuleNotFoundError:
-    from . import state
+    from pybitmessage import state
 class translateClass(object):
     """
     This is used so that the translateText function can be used

src/upnp.py

@@ -23,15 +23,15 @@ try:
     from network.node import Peer
     from network.threads import StoppableThread
 except ModuleNotFoundError:
-    from . import knownnodes
-    from . import queues
-    from . import state
-    from . import tr
-    from .bmconfigparser import BMConfigParser
-    from .debug import logger
-    from .network.connectionpool import BMConnectionPool
-    from .network.node import Peer
-    from .network.threads import StoppableThread
+    from pybitmessage import knownnodes
+    from pybitmessage import queues
+    from pybitmessage import state
+    from pybitmessage import tr
+    from pybitmessage.bmconfigparser import BMConfigParser
+    from pybitmessage.debug import logger
+    from pybitmessage.network.connectionpool import BMConnectionPool
+    from pybitmessage.network.node import Peer
+    from pybitmessage.network.threads import StoppableThread
     
 
 def createRequestXML(service, action, arguments=None):