Use import paths compatible with both Python2 and Python3

src/bitmessageqt/__init__.py

@@ -22,38 +22,38 @@
 import state
 from debug import logger
 from tr import _translate
-from account import (
+from .account import (
     accountClass, getSortedSubscriptions,
     BMAccount, GatewayAccount, MailchuckAccount, AccountColor)
 from addresses import decodeAddress, addBMIfNotPresent
-from bitmessageui import Ui_MainWindow
+from bitmessageqt.bitmessageui import Ui_MainWindow
 from bmconfigparser import config
 import namecoin
-from messageview import MessageView
-from migrationwizard import Ui_MigrationWizard
-from foldertree import (
+from .messageview import MessageView
+from .migrationwizard import Ui_MigrationWizard
+from .foldertree import (
     AccountMixin, Ui_FolderWidget, Ui_AddressWidget, Ui_SubscriptionWidget,
     MessageList_AddressWidget, MessageList_SubjectWidget,
     Ui_AddressBookWidgetItemLabel, Ui_AddressBookWidgetItemAddress,
     MessageList_TimeWidget)
-import settingsmixin
-import support
+from bitmessageqt import settingsmixin
+from bitmessageqt import support
 from helper_sql import sqlQuery, sqlExecute, sqlExecuteChunked, sqlStoredProcedure
 import helper_addressbook
 import helper_search
 import l10n
-from utils import str_broadcast_subscribers, avatarize
-import dialogs
+from .utils import str_broadcast_subscribers, avatarize
+from bitmessageqt import dialogs
 from network.stats import pendingDownload, pendingUpload
-from uisignaler import UISignaler
+from .uisignaler import UISignaler
 import paths
 from proofofwork import getPowType
 import queues
 import shutdown
-from statusbar import BMStatusBar
-import sound
+from .statusbar import BMStatusBar
+from bitmessageqt import sound
 # This is needed for tray icon
-import bitmessage_icons_rc  # noqa:F401 pylint: disable=unused-import
+from bitmessageqt import bitmessage_icons_rc  # noqa:F401 pylint: disable=unused-import
 import helper_sent
 
 try:

src/bitmessageqt/address_dialogs.py

@@ -8,9 +8,9 @@
 from PyQt4 import QtCore, QtGui
 
 import queues
-import widgets
+from bitmessageqt import widgets
 import state
-from account import AccountMixin, GatewayAccount, MailchuckAccount, accountClass
+from .account import AccountMixin, GatewayAccount, MailchuckAccount, accountClass
 from addresses import addBMIfNotPresent, decodeAddress, encodeVarint
 from bmconfigparser import config as global_config
 from tr import _translate

src/bitmessageqt/addressvalidator.py

@@ -11,7 +11,7 @@
 from bmconfigparser import config
 from queues import apiAddressGeneratorReturnQueue, addressGeneratorQueue
 from tr import _translate
-from utils import str_chan
+from .utils import str_chan
 
 
 class AddressPassPhraseValidatorMixin(object):

src/bitmessageqt/bitmessageui.py

@@ -9,12 +9,12 @@
 
 from PyQt4 import QtCore, QtGui
 from bmconfigparser import config
-from foldertree import AddressBookCompleter
-from messageview import MessageView
-from messagecompose import MessageCompose
-import settingsmixin
-from networkstatus import NetworkStatus
-from blacklist import Blacklist
+from .foldertree import AddressBookCompleter
+from .messageview import MessageView
+from .messagecompose import MessageCompose
+from bitmessageqt import settingsmixin
+from .networkstatus import NetworkStatus
+from .blacklist import Blacklist
 
 try:
     _fromUtf8 = QtCore.QString.fromUtf8

src/bitmessageqt/blacklist.py

@@ -3,13 +3,13 @@
 import widgets
 from addresses import addBMIfNotPresent
 from bmconfigparser import config
-from dialogs import AddAddressDialog
+from .dialogs import AddAddressDialog
 from helper_sql import sqlExecute, sqlQuery
 from queues import UISignalQueue
-from retranslateui import RetranslateMixin
+from .retranslateui import RetranslateMixin
 from tr import _translate
-from uisignaler import UISignaler
-from utils import avatarize
+from .uisignaler import UISignaler
+from .utils import avatarize
 
 
 class Blacklist(QtGui.QWidget, RetranslateMixin):

src/bitmessageqt/dialogs.py

@@ -5,14 +5,14 @@
 from PyQt4 import QtGui
 
 import paths
-import widgets
-from address_dialogs import (
+from bitmessageqt import widgets
+from .address_dialogs import (
     AddAddressDialog, EmailGatewayDialog, NewAddressDialog,
     NewSubscriptionDialog, RegenerateAddressesDialog,
     SpecialAddressBehaviorDialog
 )
-from newchandialog import NewChanDialog
-from settings import SettingsDialog
+from .newchandialog import NewChanDialog
+from .settings import SettingsDialog
 from tr import _translate
 from version import softwareVersion
 

src/bitmessageqt/foldertree.py

@@ -10,9 +10,9 @@
 
 from bmconfigparser import config
 from helper_sql import sqlExecute, sqlQuery
-from settingsmixin import SettingsMixin
+from .settingsmixin import SettingsMixin
 from tr import _translate
-from utils import avatarize
+from .utils import avatarize
 
 # for pylupdate
 _translate("MainWindow", "inbox")

src/bitmessageqt/messageview.py

@@ -7,7 +7,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from safehtmlparser import SafeHTMLParser
+from .safehtmlparser import SafeHTMLParser
 from tr import _translate
 
 

src/bitmessageqt/networkstatus.py

@@ -9,11 +9,11 @@
 import l10n
 import network.stats
 import state
-import widgets
+from bitmessageqt import widgets
 from network import connectionpool, knownnodes
-from retranslateui import RetranslateMixin
+from .retranslateui import RetranslateMixin
 from tr import _translate
-from uisignaler import UISignaler
+from .uisignaler import UISignaler
 
 
 class NetworkStatus(QtGui.QWidget, RetranslateMixin):

src/bitmessageqt/newchandialog.py

@@ -6,13 +6,13 @@
 
 from PyQt4 import QtCore, QtGui
 
-import widgets
+from bitmessageqt import widgets
 from addresses import addBMIfNotPresent
-from addressvalidator import AddressValidator, PassPhraseValidator
+from .addressvalidator import AddressValidator, PassPhraseValidator
 from queues import (
     addressGeneratorQueue, apiAddressGeneratorReturnQueue, UISignalQueue)
 from tr import _translate
-from utils import str_chan
+from .utils import str_chan
 
 
 class NewChanDialog(QtGui.QDialog):

src/bitmessageqt/retranslateui.py

@@ -1,7 +1,7 @@
 from os import path
 from PyQt4 import QtGui
 from debug import logger
-import widgets
+from bitmessageqt import widgets
 
 class RetranslateMixin(object):
     def retranslateUi(self):

src/bitmessageqt/settings.py

@@ -16,7 +16,7 @@
 import paths
 import queues
 import state
-import widgets
+from bitmessageqt import widgets
 from bmconfigparser import config as config_obj
 from helper_sql import sqlExecute, sqlStoredProcedure
 from helper_startup import start_proxyconfig

src/bitmessageqt/support.py

@@ -8,20 +8,20 @@
 
 from PyQt4 import QtCore
 
-import account
+from bitmessageqt import account
 import defaults
 import network.stats
 import paths
 import proofofwork
 import queues
 import state
 from bmconfigparser import config
-from foldertree import AccountMixin
+from .foldertree import AccountMixin
 from helper_sql import sqlExecute, sqlQuery
 from l10n import getTranslationLanguage
 from openclpow import openclEnabled
 from pyelliptic.openssl import OpenSSL
-from settings import getSOCKSProxyType
+from .settings import getSOCKSProxyType
 from version import softwareVersion
 from tr import _translate
 

src/bitmessageqt/tests/__init__.py

@@ -1,9 +1,9 @@
 """bitmessageqt tests"""
 
-from addressbook import TestAddressbook
-from main import TestMain, TestUISignaler
-from settings import TestSettings
-from support import TestSupport
+from .addressbook import TestAddressbook
+from .main import TestMain, TestUISignaler
+from .settings import TestSettings
+from .support import TestSupport
 
 __all__ = [
     "TestAddressbook", "TestMain", "TestSettings", "TestSupport",

src/bitmessageqt/tests/addressbook.py

@@ -1,7 +1,7 @@
 import helper_addressbook
 from bitmessageqt.support import createAddressIfNeeded
 
-from main import TestBase
+from .main import TestBase
 
 
 class TestAddressbook(TestBase):

src/bitmessageqt/tests/settings.py

@@ -1,7 +1,7 @@
 import threading
 import time
 
-from main import TestBase
+from .main import TestBase
 from bmconfigparser import config
 from bitmessageqt import settings
 

src/bitmessageqt/tests/support.py

@@ -4,7 +4,7 @@
 
 from shared import isAddressInMyAddressBook
 
-from main import TestBase
+from .main import TestBase
 
 
 class TestSupport(TestBase):

src/network/__init__.py

@@ -12,7 +12,7 @@ def start(config, state):
     """Start network threads"""
     import state
     from .announcethread import AnnounceThread
-    import connectionpool  # pylint: disable=relative-import
+    from network import connectionpool
     from .addrthread import AddrThread
     from .dandelion import Dandelion
     from .downloadthread import DownloadThread

src/network/addrthread.py

@@ -4,12 +4,12 @@
 from six.moves import queue
 
 # magic imports!
-import connectionpool
+from network import connectionpool
 from helper_random import randomshuffle
 from protocol import assembleAddrMessage
 from queues import addrQueue  # FIXME: init with queue
 
-from threads import StoppableThread
+from .threads import StoppableThread
 
 
 class AddrThread(StoppableThread):

src/network/advanceddispatcher.py

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

src/network/announcethread.py

@@ -4,12 +4,12 @@
 import time
 
 # magic imports!
-import connectionpool
+from network import connectionpool
 from bmconfigparser import config
 from protocol import assembleAddrMessage
 
-from node import Peer
-from threads import StoppableThread
+from .node import Peer
+from .threads import StoppableThread
 
 
 class AnnounceThread(StoppableThread):

src/network/bmobject.py

@@ -6,7 +6,7 @@
 
 import protocol
 import state
-import connectionpool
+import network.connectionpool  # use long name to address recursive import
 from highlevelcrypto import calculateInventoryHash
 
 logger = logging.getLogger('default')
@@ -99,7 +99,7 @@ def checkStream(self):
             logger.warning(
                 'The object has invalid stream: %s', self.streamNumber)
             raise BMObjectInvalidError()
-        if self.streamNumber not in connectionpool.pool.streams:
+        if self.streamNumber not in network.connectionpool.pool.streams:
             logger.debug(
                 'The streamNumber %i isn\'t one we are interested in.',
                 self.streamNumber)