Bitmessage/PyBitmessage-2024-08-21
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Runnable with both Python3 and Python2, with both PyQt5 and PyQt4 by using Qt.py #2250

Open
kashikoibumi wants to merge 125 commits from kashikoibumi/py3qt into v0.6
pull from: kashikoibumi/py3qt
merge into: Bitmessage:v0.6
Conversation 2 Commits 125 Files Changed 179 +10 -2
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 909b9f2c8e - Show all commits

7
src/bitmessageqt/settings.py
View File

@ -27,10 +27,15 @@ from network.asyncore_pollchoose import set_rates
from tr import _translate from tr import _translate
try:
SafeConfigParser = configparser.SafeConfigParser
except AttributeError:
SafeConfigParser = configparser.ConfigParser
def getSOCKSProxyType(config): def getSOCKSProxyType(config):
"""Get user socksproxytype setting from *config*""" """Get user socksproxytype setting from *config*"""
try: try:
result = configparser.SafeConfigParser.get( result = SafeConfigParser.get(
config, 'bitmessagesettings', 'socksproxytype') config, 'bitmessagesettings', 'socksproxytype')
except (configparser.NoSectionError, configparser.NoOptionError): except (configparser.NoSectionError, configparser.NoOptionError):
return None return None

5
src/bmconfigparser.py
View File

@ -16,7 +16,10 @@ try:
except ImportError: except ImportError:
from pybitmessage import state from pybitmessage import state
SafeConfigParser = configparser.SafeConfigParser try:
SafeConfigParser = configparser.SafeConfigParser
except AttributeError:
SafeConfigParser = configparser.ConfigParser
config_ready = Event() config_ready = Event()