Skip to content

Commit 6b552aa

Browse files
committed
code cleanup
1 parent fdde64d commit 6b552aa

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

pathvalidate/__init__.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
"False", "True", "None", "NotImplemented", "Ellipsis", "__debug__",
2626
]
2727

28+
__RE_INVALID_FILENAME = re.compile(
29+
"[%s]" % (re.escape(__INVALID_FILENAME_CHARS)))
2830
__RE_INVALID_PATH = re.compile("[%s]" % (re.escape(__INVALID_PATH_CHARS)))
2931
__RE_INVALID_VAR_NAME = re.compile("[^a-zA-Z0-9_]")
3032
__RE_INVALID_VAR_NAME_HEAD = re.compile("^[^a-zA-Z]+")
@@ -41,8 +43,7 @@ def validate_filename(filename):
4143
if dataproperty.is_empty_string(filename):
4244
raise ValueError("null name")
4345

44-
match = re.search("[%s]" % (
45-
re.escape(__INVALID_FILENAME_CHARS)), filename)
46+
match = __RE_INVALID_FILENAME.search(filename)
4647
if match is not None:
4748
raise ValueError(
4849
"invalid char found in the filename: '%s'" % (
@@ -111,10 +112,7 @@ def sanitize_filename(filename, replacement_text=""):
111112
:rtype: str
112113
"""
113114

114-
filename = filename.strip()
115-
re_replace = re.compile("[%s]" % re.escape(__INVALID_FILENAME_CHARS))
116-
117-
return re_replace.sub(replacement_text, filename)
115+
return __RE_INVALID_FILENAME.sub(replacement_text, filename.strip())
118116

119117

120118
def sanitize_file_path(file_path, replacement_text=""):

0 commit comments

Comments
 (0)