diff --git a/calibre-plugin/fff_util.py b/calibre-plugin/fff_util.py index 8635c84b..d6214773 100644 --- a/calibre-plugin/fff_util.py +++ b/calibre-plugin/fff_util.py @@ -33,8 +33,8 @@ def get_fff_config(url,fileform="epub",personalini=None): except Exception as e: logger.debug("Failed trying to get ini config for url(%s): %s, using section %s instead"%(url,e,sections)) configuration = Configuration(sections,fileform) - configuration.readfp(StringIO(ensure_text(get_resources("plugin-defaults.ini")))) - configuration.readfp(StringIO(ensure_text(personalini))) + configuration.read_file(StringIO(ensure_text(get_resources("plugin-defaults.ini")))) + configuration.read_file(StringIO(ensure_text(personalini))) return configuration diff --git a/calibre-plugin/jobs.py b/calibre-plugin/jobs.py index d59d6384..f03706e8 100644 --- a/calibre-plugin/jobs.py +++ b/calibre-plugin/jobs.py @@ -466,5 +466,5 @@ def inject_cal_cols(book,story,configuration): extra_valid.append(k) if extra_valid: # if empty, there's nothing to add. injectini.append("add_to_extra_valid_entries:,"+','.join(extra_valid)) - configuration.readfp(StringIO('\n'.join(injectini))) + configuration.read_file(StringIO('\n'.join(injectini))) #print("added:\n%s\n"%('\n'.join(injectini))) diff --git a/fanficfare/cli.py b/fanficfare/cli.py index 26aff88b..9533c5a2 100644 --- a/fanficfare/cli.py +++ b/fanficfare/cli.py @@ -580,7 +580,7 @@ def get_configuration(url, if passed_defaultsini: # new StringIO each time rather than pass StringIO and rewind # for case of list download. Just makes more sense to me. - configuration.readfp(StringIO(unicode(passed_defaultsini))) + configuration.read_file(StringIO(unicode(passed_defaultsini))) else: # don't need to check existance for our selves. conflist.append(join(dirname(__file__), 'defaults.ini')) @@ -592,7 +592,7 @@ def get_configuration(url, if passed_personalini: # new StringIO each time rather than pass StringIO and rewind # for case of list download. Just makes more sense to me. - configuration.readfp(StringIO(unicode(passed_personalini))) + configuration.read_file(StringIO(unicode(passed_personalini))) conflist.append(join(homepath, 'personal.ini')) conflist.append(join(homepath2, 'personal.ini')) diff --git a/fanficfare/configurable.py b/fanficfare/configurable.py index de87d470..1a1db71a 100644 --- a/fanficfare/configurable.py +++ b/fanficfare/configurable.py @@ -29,6 +29,10 @@ if six.PY2: else: # PY3 ConfigParser = configparser.ConfigParser +if not hasattr(ConfigParser, 'read_file'): + # read_file added in py3.2, readfp removed in py3.12 + ConfigParser.read_file = ConfigParser.readfp + from .six import string_types as basestring import logging