From d0a1d647207a2904e8c7cc6619efe078b4f9074a Mon Sep 17 00:00:00 2001 From: Olivier Mangin Date: Thu, 7 May 2015 10:58:29 +0200 Subject: [PATCH] Fix warning about deprecated SafeConfigParser. --- pubs/configs.py | 4 ++-- pubs/p3.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pubs/configs.py b/pubs/configs.py index 7e09b88..6a6cdb3 100644 --- a/pubs/configs.py +++ b/pubs/configs.py @@ -1,7 +1,7 @@ import os import collections -from .p3 import configparser, _read_config +from .p3 import configparser, ConfigParser, _read_config from .content import check_file, _open @@ -49,7 +49,7 @@ class Config(object): def __init__(self, **kwargs): object.__setattr__(self, '_section', MAIN_SECTION) # active section - object.__setattr__(self, '_cfg', configparser.SafeConfigParser()) + object.__setattr__(self, '_cfg', ConfigParser()) self._cfg.add_section(self._section) for name, value in DFT_CONFIG.items(): diff --git a/pubs/p3.py b/pubs/p3.py index cd4d48c..6339774 100644 --- a/pubs/p3.py +++ b/pubs/p3.py @@ -3,7 +3,8 @@ import sys if sys.version_info[0] == 2: import ConfigParser as configparser - _read_config = configparser.SafeConfigParser.readfp + ConfigParser = configparser.SafeConfigParser + _read_config = ConfigParser.readfp def input(): return raw_input().decode(sys.stdin.encoding or 'utf8', 'ignore') @@ -28,7 +29,8 @@ if sys.version_info[0] == 2: else: import configparser - _read_config = configparser.SafeConfigParser.read_file + ConfigParser = configparser.ConfigParser + _read_config = ConfigParser.read_file ustr = str uchr = chr from urllib.parse import urlparse