Skip to content

Commit 9493f01

Browse files
committed
Using ModelField.get_default() instead of accessing ._default or .default
1 parent 302a337 commit 9493f01

4 files changed

Lines changed: 11 additions & 10 deletions

File tree

‎src/osw/core.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ def sort_list_of_entities_by_class(
163163
model_type = None
164164
else:
165165
# Get class type if available
166-
model_type = entity.__class__.__fields__["type"].default[0]
166+
model_type = entity.__class__.__fields__["type"].get_default()[0]
167167
# Add entity to by_name
168168
if name not in by_name:
169169
by_name[name] = []
@@ -1016,12 +1016,12 @@ def __init__(self, **data):
10161016
True # Set to True after implementation of asynchronous upload
10171017
)
10181018
if self.overwrite is None:
1019-
self.overwrite = self.__fields__["overwrite"].default
1019+
self.overwrite = self.__fields__["overwrite"].get_default()
10201020
self._overwrite_per_class = {"by name": {}, "by type": {}}
10211021
if self.overwrite_per_class is not None:
10221022
for param in self.overwrite_per_class:
10231023
model_name = param.model.__name__
1024-
model_type = param.model.__fields__["type"].default[0]
1024+
model_type = param.model.__fields__["type"].get_default()[0]
10251025
if (
10261026
model_name in self._overwrite_per_class["by name"].keys()
10271027
or model_type in self._overwrite_per_class["by type"].keys()

‎src/osw/data/import_utility.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def transform_attributes_and_merge(
174174
sorted_ = ent_as_dict["sorted"]
175175
else:
176176
sorted_ = False
177-
cls_type_str = str(sel_cls.__fields__["type"].default)
177+
cls_type_str = str(sel_cls.__fields__["type"].get_default())
178178

179179
# Merge entries with the same name / uuid
180180
entities_copy = copy.deepcopy(ent) # Copy to loop over
@@ -295,7 +295,7 @@ def isclass(obj, cls):
295295
obj_type = obj.get("type")
296296
else:
297297
obj_type = getattr(obj, "type", None)
298-
cls_type = cls.__fields__["type"].default
298+
cls_type = cls.__fields__["type"].get_default()
299299
if isinstance(obj_type, list):
300300
obj_type.sort()
301301
if isinstance(cls_type, list):
@@ -405,7 +405,7 @@ def jsonpath_search_and_return_list(
405405
if sorted_ and class_to_match:
406406
# See definition in loop_and_call_method with argument 'sorted'
407407
try:
408-
cls_type = class_to_match.__fields__["type"].default
408+
cls_type = class_to_match.__fields__["type"].get_default()
409409
# Search in a dramatically reduced number of entries
410410
result = jp_parse.find(search_tar[str(cls_type)])
411411
except Exception as e:

‎src/osw/express.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -514,9 +514,10 @@ def process_init_data(self, data: Dict[str, Any]) -> Dict[str, Any]:
514514
data[key] = value
515515
# Do replacements
516516
if (
517-
data.get("label") == InMemoryController.__fields__["label"].default
518-
or data.get("label") == LocalFileController.__fields__["label"].default
519-
or data.get("label") == WikiFileController.__fields__["label"].default
517+
data.get("label") == InMemoryController.__fields__["label"].get_default()
518+
or data.get("label")
519+
== LocalFileController.__fields__["label"].get_default()
520+
or data.get("label") == WikiFileController.__fields__["label"].get_default()
520521
):
521522
# Make sure that the label is not set to the default value, it will be
522523
# set by the source file controller

‎tests/integration/test_file_page_migration.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def test_file_page_migration(wiki_domain: str, wiki_username: str, wiki_password
115115
raise ValueError(
116116
"jsondata is None - meta data was not written to the file " "page!"
117117
)
118-
assert jsondata["type"] == WikiFile.__fields__["type"].default
118+
assert jsondata["type"] == WikiFile.__fields__["type"].get_default()
119119
modified_using_page = wtsite.get_page(
120120
WtSite.GetPageParam(titles=[using_page_fpt])
121121
).pages[0]

0 commit comments

Comments
 (0)