1
0
mirror of https://github.com/gryf/ebook-converter.git synced 2026-03-10 03:25:46 +01:00

Cut off cross importing things.

There was (and perhaps it exists in other modules, need to check) a bad
habit of importing objects out of module A into B just to be able of
import those object from module B. In this case there was import from
module config_base into module config. This commit fix this.
This commit is contained in:
2020-09-06 18:23:05 +02:00
parent de22960d26
commit 6fdcc029bb
8 changed files with 14 additions and 23 deletions

View File

@@ -12,6 +12,7 @@ from ebook_converter.customize import profiles
from ebook_converter.customize import builtins
from ebook_converter.ebooks import metadata
from ebook_converter.utils import config as cfg
from ebook_converter.utils import config_base
builtin_names = frozenset(p.name for p in builtins.plugins)
@@ -23,7 +24,7 @@ class NameConflict(ValueError):
def _config():
c = cfg.Config('customize')
c = config_base.Config('customize')
c.add_opt('plugins', default={}, help='Installed plugins')
c.add_opt('filetype_mapping', default={},
help='Mapping for filetype plugins')
@@ -32,7 +33,7 @@ def _config():
c.add_opt('disabled_plugins', default=set(), help='Disabled plugins')
c.add_opt('enabled_plugins', default=set(), help='Enabled plugins')
return cfg.ConfigProxy(c)
return config_base.ConfigProxy(c)
config = _config()