Skip to content

Commit 0ff83ae

Browse files
committed
Second pass review suggestions by Wei
1 parent caff925 commit 0ff83ae

2 files changed

Lines changed: 22 additions & 18 deletions

File tree

airflow-core/src/airflow/serialization/serde.py

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -368,26 +368,30 @@ def _register():
368368
for _, module_name, _ in iter_namespace(airflow.serialization.serializers):
369369
module = import_module(module_name)
370370
for serializers in getattr(module, "serializers", ()):
371-
s = serializers if isinstance(serializers, str) else qualname(serializers)
372-
if s in _serializers and _serializers[s] != module:
373-
raise AttributeError(f"duplicate {s} for serialization in {module} and {_serializers[s]}")
374-
log.debug("registering %s for serialization", s)
375-
_serializers[s] = module
371+
s_qualname = serializers if isinstance(serializers, str) else qualname(serializers)
372+
if s_qualname in _serializers and _serializers[s_qualname] != module:
373+
raise AttributeError(
374+
f"duplicate {s_qualname} for serialization in {module} and {_serializers[s_qualname]}"
375+
)
376+
log.debug("registering %s for serialization", s_qualname)
377+
_serializers[s_qualname] = module
376378
for deserializers in getattr(module, "deserializers", ()):
377-
d = deserializers if isinstance(deserializers, str) else qualname(deserializers)
378-
if d in _deserializers and _deserializers[d] != module:
379+
d_qualname = deserializers if isinstance(deserializers, str) else qualname(deserializers)
380+
if d_qualname in _deserializers and _deserializers[d_qualname] != module:
379381
raise AttributeError(
380-
f"duplicate {d} for deserialization in {module} and {_deserializers[d]}"
382+
f"duplicate {d_qualname} for deserialization in {module} and {_deserializers[d_qualname]}"
381383
)
382-
log.debug("registering %s for deserialization", d)
383-
_deserializers[d] = module
384-
_extra_allowed.add(d)
384+
log.debug("registering %s for deserialization", d_qualname)
385+
_deserializers[d_qualname] = module
386+
_extra_allowed.add(d_qualname)
385387
for stringifiers in getattr(module, "stringifiers", ()):
386-
c = stringifiers if isinstance(stringifiers, str) else qualname(stringifiers)
387-
if c in _deserializers and _deserializers[c] != module:
388-
raise AttributeError(f"duplicate {c} for stringifiers in {module} and {_stringifiers[c]}")
389-
log.debug("registering %s for stringifying", c)
390-
_stringifiers[c] = module
388+
c_qualname = stringifiers if isinstance(stringifiers, str) else qualname(stringifiers)
389+
if c_qualname in _deserializers and _deserializers[c_qualname] != module:
390+
raise AttributeError(
391+
f"duplicate {c_qualname} for stringifiers in {module} and {_stringifiers[c_qualname]}"
392+
)
393+
log.debug("registering %s for stringifying", c_qualname)
394+
_stringifiers[c_qualname] = module
391395

392396
log.debug("loading serializers took %.3f seconds", timer.duration)
393397

airflow-core/tests/unit/plugins/test_plugin_ignore.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ def test_find_not_should_ignore_path_glob(self, tmp_path):
104104
}
105105
ignore_list_file = ".airflowignore_glob"
106106
print("-" * 20)
107-
for file_path_raw in find_path_from_directory(plugin_folder_path, ignore_list_file, "glob"):
108-
file_path = Path(file_path_raw)
107+
for raw_file_path in find_path_from_directory(plugin_folder_path, ignore_list_file, "glob"):
108+
file_path = Path(raw_file_path)
109109
if file_path.is_file() and file_path.suffix == ".py":
110110
detected_files.add(file_path.name)
111111
print(file_path)

0 commit comments

Comments
 (0)