Runnable with both Python3 and Python2, with PyQt4 #2249

Open
kashikoibumi wants to merge 60 commits from kashikoibumi/py3 into v0.6
2 changed files with 10 additions and 2 deletions
Showing only changes of commit e7b5f2957e - Show all commits

View File

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

View File

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