use 'format_map()'

pull/13/head
Mike Fährmann 8 years ago
parent d31ccb16f2
commit 14237142d8
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88

@ -39,7 +39,7 @@ class PathFormat():
def set_directory(self, keywords): def set_directory(self, keywords):
"""Build directory path and create it if necessary""" """Build directory path and create it if necessary"""
segments = [ segments = [
text.clean_path(segment.format(**keywords).strip()) text.clean_path(segment.format_map(keywords).strip())
for segment in self.directory_fmt for segment in self.directory_fmt
] ]
self.directory = os.path.join( self.directory = os.path.join(
@ -64,7 +64,7 @@ class PathFormat():
def build_path(self, sep=os.path.sep): def build_path(self, sep=os.path.sep):
"""Use filename-keywords and directory to build a full path""" """Use filename-keywords and directory to build a full path"""
filename = text.clean_path(self.filename_fmt.format(**self.keywords)) filename = text.clean_path(self.filename_fmt.format_map(self.keywords))
self.path = self.directory + sep + filename self.path = self.directory + sep + filename
self.realpath = self.realdirectory + sep + filename self.realpath = self.realdirectory + sep + filename

Loading…
Cancel
Save