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

use SafeConfigParser or ConfigParser, which is available

Browse Source
This commit is contained in:
Kashiko Koibumi 2024-06-25 07:48:03 +09:00
parent cdcffa4b3e
commit e7b5f2957e
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,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()