gryf/ebook-converter
1
0
Fork 0
mirror of https://github.com/gryf/ebook-converter.git synced 2026-04-03 11:03:32 +02:00
Code Issues Projects Releases Wiki Activity

Move specific sanitize_file_name out of init module.

Browse Source 
sanitize_file_name function has been moved to utility module filenames,
where it logically belongs.
This commit is contained in:
gryf
2020-10-13 19:29:25 +02:00
parent 847e133878
commit 250d0eeea7
4 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ebook_converter/utils/zipfile.py
View File

@@ -7,7 +7,7 @@ import binascii
from contextlib import closing
from tempfile import SpooledTemporaryFile
from ebook_converter import sanitize_file_name
from ebook_converter.utils import filenames as fms
from ebook_converter.constants_old import filesystem_encoding
from ebook_converter.ebooks.chardet import detect
from ebook_converter.polyglot.builtins import as_bytes
@@ -1135,7 +1135,7 @@ class ZipFile:
os.makedirs(upperdirs)
except: # Added by Kovid
targetpath = os.path.join(base_target,
sanitize_file_name(fname))
fms.sanitize_file_name(fname))
upperdirs = os.path.dirname(targetpath)
if upperdirs and not os.path.exists(upperdirs):
os.makedirs(upperdirs)
@@ -1156,7 +1156,7 @@ class ZipFile:
except:
# Try sanitizing the file name to remove invalid characters
components = list(os.path.split(targetpath))
components[-1] = sanitize_file_name(components[-1])
components[-1] = fms.sanitize_file_name(components[-1])
targetpath = os.sep.join(components)
with open(targetpath, 'wb') as target:
shutil.copyfileobj(source, target)