citizenaspirant
/
PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

No need to import namecoin early because it's really used only in Qt UI

This commit is contained in:
Dmitri Bogomolov 2018-06-28 00:54:49 +03:00
parent 795b855c65
commit c7d3784b80
Signed by untrusted user: g1itch
GPG Key ID: 720A756F18DEED13
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bitmessageqt/__init__.py
View File

@ -23,7 +23,7 @@ import shared
from bitmessageui import Ui_MainWindow from bitmessageui import Ui_MainWindow
from bmconfigparser import BMConfigParser from bmconfigparser import BMConfigParser
import defaults import defaults
from namecoin import namecoinConnection import namecoin
from messageview import MessageView from messageview import MessageView
from migrationwizard import Ui_MigrationWizard from migrationwizard import Ui_MigrationWizard
from foldertree import ( from foldertree import (
@ -797,7 +797,8 @@ class MyForm(settingsmixin.SMainWindow):
self.initSettings() self.initSettings()
self.namecoin = namecoinConnection() namecoin.ensureNamecoinOptions()
self.namecoin = namecoin.namecoinConnection()
# Check to see whether we can connect to namecoin. # Check to see whether we can connect to namecoin.
# Hide the 'Fetch Namecoin ID' button if we can't. # Hide the 'Fetch Namecoin ID' button if we can't.

4
src/helper_startup.py
View File

@ -8,7 +8,6 @@ import os
import platform import platform
from distutils.version import StrictVersion from distutils.version import StrictVersion
from namecoin import ensureNamecoinOptions
import paths import paths
import state import state
import helper_random import helper_random
@ -129,8 +128,6 @@ def loadConfig():
# existing users. To do that, search the class_sqlThread.py file for the # existing users. To do that, search the class_sqlThread.py file for the
# text: "right above this line!" # text: "right above this line!"
ensureNamecoinOptions()
if StoreConfigFilesInSameDirectoryAsProgramByDefault: if StoreConfigFilesInSameDirectoryAsProgramByDefault:
# Just use the same directory as the program and forget about # Just use the same directory as the program and forget about
# the appdata folder # the appdata folder
@ -146,6 +143,7 @@ def loadConfig():
_loadTrustedPeer() _loadTrustedPeer()
def isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections(): def isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections():
try: try:
if sys.platform[0:3] == "win": if sys.platform[0:3] == "win":