diff options
Diffstat (limited to 'gallery_dl/formatter.py')
| -rw-r--r-- | gallery_dl/formatter.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gallery_dl/formatter.py b/gallery_dl/formatter.py index 500eaa1..6098fc6 100644 --- a/gallery_dl/formatter.py +++ b/gallery_dl/formatter.py @@ -182,9 +182,10 @@ class StringFormatter(): if obj: break except Exception: - pass + obj = None else: - obj = self.default + if obj is None: + obj = self.default return fmt(obj) return wrap @@ -211,7 +212,7 @@ class ModuleFormatter(): """Generate text by calling an external function""" def __init__(self, function_spec, default=NONE, fmt=None): - module_name, _, function_name = function_spec.partition(":") + module_name, _, function_name = function_spec.rpartition(":") module = util.import_file(module_name) self.format_map = getattr(module, function_name) @@ -235,10 +236,10 @@ class TemplateFormatter(StringFormatter): class TemplateFStringFormatter(FStringFormatter): """Read f-string from file""" - def __init__(self, path, default=NONE, fmt=format): + def __init__(self, path, default=NONE, fmt=None): with open(util.expand_path(path)) as fp: - format_string = fp.read() - FStringFormatter.__init__(self, format_string, default, fmt) + fstring = fp.read() + FStringFormatter.__init__(self, fstring, default, fmt) def parse_field_name(field_name): |