github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[formatter] use 'rpartition' for \fM format strings

Browse Source 
fixes using absolute module paths like C:\path\module.py on Windows
This commit is contained in:
Mike Fährmann
2023-08-11 21:30:26 +02:00
parent 84089c7368
commit d8b21a97bf
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gallery_dl/formatter.py
View File

@@ -211,7 +211,7 @@ class ModuleFormatter():
"""Generate text by calling an external function""" """Generate text by calling an external function"""
def __init__(self, function_spec, default=NONE, fmt=None): 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) module = util.import_file(module_name)
self.format_map = getattr(module, function_name) self.format_map = getattr(module, function_name)
@@ -235,10 +235,10 @@ class TemplateFormatter(StringFormatter):
class TemplateFStringFormatter(FStringFormatter): class TemplateFStringFormatter(FStringFormatter):
"""Read f-string from file""" """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: with open(util.expand_path(path)) as fp:
format_string = fp.read() fstring = fp.read()
FStringFormatter.__init__(self, format_string, default, fmt) FStringFormatter.__init__(self, fstring, default, fmt)
def parse_field_name(field_name): def parse_field_name(field_name):