diff options
| author | earthman1 <30826762+earthman1@users.noreply.github.com> | 2022-08-06 14:57:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-06 11:57:19 -0700 |
| commit | 36f508f98f74b44a1f7aed23f2beecb4189025ca (patch) | |
| tree | 152ab30645943630274fc6bedab508ffcc10e139 /coverage | |
| parent | 774c364b8eddfb53c3da5c8827f27ea279401316 (diff) | |
| download | python-coveragepy-git-36f508f98f74b44a1f7aed23f2beecb4189025ca.tar.gz | |
fix: filenames can contain special glob characters (#1405)
* Fix globbing of filenames that contain special glob characters
* glob the path as well as the filename
Diffstat (limited to 'coverage')
| -rw-r--r-- | coverage/data.py | 2 | ||||
| -rw-r--r-- | coverage/sqldata.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/coverage/data.py b/coverage/data.py index b209cf15..4bdfe301 100644 --- a/coverage/data.py +++ b/coverage/data.py @@ -70,7 +70,7 @@ def combinable_files(data_file, data_paths=None): if os.path.isfile(p): files_to_combine.append(os.path.abspath(p)) elif os.path.isdir(p): - pattern = os.path.join(os.path.abspath(p), f"{local}.*") + pattern = glob.escape(os.path.join(os.path.abspath(p), local)) +".*" files_to_combine.extend(glob.glob(pattern)) else: raise NoDataError(f"Couldn't combine from non-existent path '{p}'") diff --git a/coverage/sqldata.py b/coverage/sqldata.py index 8d2ed73a..564d4ec9 100644 --- a/coverage/sqldata.py +++ b/coverage/sqldata.py @@ -774,8 +774,8 @@ class CoverageData(SimpleReprMixin): file_be_gone(self._filename) if parallel: data_dir, local = os.path.split(self._filename) - localdot = local + ".*" - pattern = os.path.join(os.path.abspath(data_dir), localdot) + local_abs_path = os.path.join(os.path.abspath(data_dir), local) + pattern = glob.escape(local_abs_path) + ".*" for filename in glob.glob(pattern): if self._debug.should("dataio"): self._debug.write(f"Erasing parallel data file {filename!r}") |