Skip to content

Commit dbddbac

Browse files
authored
Refactor parent module handling in import logic and add generated __init__.py files (#2662)
1 parent 747fed5 commit dbddbac

5 files changed

Lines changed: 21 additions & 3 deletions

File tree

src/datamodel_code_generator/parser/base.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2426,9 +2426,15 @@ class Processed(NamedTuple):
24262426
imports = module_to_import[module_] = Imports(self.use_exact_imports)
24272427
init = False
24282428
if module_:
2429-
parent = (*module_[:-1], "__init__.py")
2430-
if parent not in results:
2431-
results[parent] = Result(body="")
2429+
if len(module_) == 1:
2430+
parent = ("__init__.py",)
2431+
if parent not in results:
2432+
results[parent] = Result(body="")
2433+
else:
2434+
for i in range(1, len(module_)):
2435+
parent = (*module_[:i], "__init__.py")
2436+
if parent not in results:
2437+
results[parent] = Result(body="")
24322438
if (*module_, "__init__.py") in results:
24332439
module = (*module_, "__init__.py")
24342440
init = True
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# generated by datamodel-codegen:
2+
# filename: external_files_in_directory
3+
# timestamp: 2019-07-26T00:00:00+00:00
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# generated by datamodel-codegen:
2+
# filename: external_files_in_directory
3+
# timestamp: 2019-07-26T00:00:00+00:00
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# generated by datamodel-codegen:
2+
# filename: nested_package_enum_default.json
3+
# timestamp: 1985-10-26T08:21:00+00:00
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# generated by datamodel-codegen:
2+
# filename: nested_package_enum_default.json
3+
# timestamp: 1985-10-26T08:21:00+00:00

0 commit comments

Comments
 (0)