From d8b21a97bf0a2d222e8504dc74d5a859538043af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Fri, 11 Aug 2023 21:30:26 +0200 Subject: [PATCH] [formatter] use 'rpartition' for \fM format strings fixes using absolute module paths like C:\path\module.py on Windows --- gallery_dl/formatter.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gallery_dl/formatter.py b/gallery_dl/formatter.py index 500eaa19..98ea186f 100644 --- a/gallery_dl/formatter.py +++ b/gallery_dl/formatter.py @@ -211,7 +211,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 +235,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):