Skip to content

Commit e11fe17

Browse files
committed
fix: base str traversal
1 parent e89d81f commit e11fe17

7 files changed

Lines changed: 18 additions & 9 deletions

dataprofiler/tests/labelers/test_character_level_cnn_model.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
)
1717

1818
_file_dir = os.path.dirname(os.path.abspath(__file__))
19-
_resource_labeler_dir = Path(importlib.resources.files("resources")) / "labelers"
19+
with importlib.resources.as_file(importlib.resources.files("resources")) as base:
20+
_resource_labeler_dir = Path(base) / "labelers"
2021

2122

2223
mock_model_parameters = {

dataprofiler/tests/labelers/test_column_name_model.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
from dataprofiler.labelers.column_name_model import ColumnNameModel
1414

1515
_file_dir = os.path.dirname(os.path.abspath(__file__))
16-
_resource_labeler_dir = Path(importlib.resources.files("resources")) / "labelers"
16+
with importlib.resources.as_file(importlib.resources.files("resources")) as base:
17+
_resource_labeler_dir = Path(base) / "labelers"
1718

1819

1920
mock_model_parameters = {

dataprofiler/tests/labelers/test_data_labelers.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,10 @@ def test_load_from_disk(self, *mocks):
152152
import importlib
153153
from pathlib import Path
154154

155-
default_labeler_dir = (
156-
Path(importlib.resources.files("resources")) / "labelers/structured_model"
157-
)
155+
with importlib.resources.as_file(
156+
importlib.resources.files("resources")
157+
) as base:
158+
default_labeler_dir = Path(base) / "labelers/structured_model"
158159

159160
data_labeler = dp.DataLabeler.load_from_disk(default_labeler_dir)
160161
self.assertIsInstance(data_labeler, BaseDataLabeler)

dataprofiler/tests/labelers/test_data_processing.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,10 @@ def test_load_from_library(self, mocked_load, *mocks):
225225
BaseDataProcessor.load_from_library("default")
226226

227227
# assert called with proper load_processor dirpath
228-
default_labeler_dir = Path(importlib.resources.files("resources")) / "labelers"
228+
with importlib.resources.as_file(
229+
importlib.resources.files("resources")
230+
) as base:
231+
default_labeler_dir = Path(base) / "labelers"
229232

230233
mocked_load.assert_called_with(os.path.join(default_labeler_dir, "default"))
231234

dataprofiler/tests/labelers/test_integration_column_name_data_labeler.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
DirectPassPreprocessor,
1313
)
1414

15-
default_labeler_dir = Path(importlib.resources.files("resources")) / "labelers"
15+
with importlib.resources.as_file(importlib.resources.files("resources")) as base:
16+
default_labeler_dir = Path(base) / "labelers"
1617

1718

1819
class TestColumnNameDataLabeler(unittest.TestCase):

dataprofiler/tests/labelers/test_integration_regex_data_labeler.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
from dataprofiler.labelers.data_labelers import BaseDataLabeler
99

10-
default_labeler_dir = Path(importlib.resources.files("resources")) / "labelers"
10+
with importlib.resources.as_file(importlib.resources.files("resources")) as base:
11+
default_labeler_dir = Path(base) / "labelers"
1112

1213

1314
class TestRegexDataLabeler(unittest.TestCase):

dataprofiler/tests/labelers/test_regex_model.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
from dataprofiler.labelers.regex_model import RegexModel
1212

1313
_file_dir = os.path.dirname(os.path.abspath(__file__))
14-
_resource_labeler_dir = Path(importlib.resources.files("resources")) / "labelers"
14+
with importlib.resources.as_file(importlib.resources.files("resources")) as base:
15+
_resource_labeler_dir = Path(base) / "labelers"
1516

1617

1718
mock_model_parameters = {

0 commit comments

Comments
 (0)