Bitmessage/PyBitmessage-2024-12-05
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 PyQt4 #2249

Open
kashikoibumi wants to merge 60 commits from kashikoibumi/py3 into v0.6
pull from: kashikoibumi/py3
merge into: Bitmessage:v0.6
Conversation 0 Commits 60 Files Changed 159 +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 e7b5f2957e - 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

3
src/bmconfigparser.py
View File

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