Skip to content

Commit 54f5806

Browse files
committed
Avoid outputting Python files for already generated types
This may overwrite types that have already been generated and can create unwanted empty files. Fixes #8490
1 parent 0312061 commit 54f5806

File tree

8 files changed

+4
-32
lines changed

8 files changed

+4
-32
lines changed

src/idl_gen_python.cpp

+4-7
Original file line numberDiff line numberDiff line change
@@ -2686,14 +2686,11 @@ class PythonGenerator : public BaseGenerator {
26862686
bool SaveType(const std::string &defname, const Namespace &ns,
26872687
const std::string &classcode, const ImportMap &imports,
26882688
const std::string &mod, bool needs_imports) const {
2689+
if (classcode.empty()) return true;
2690+
26892691
std::string code = "";
2690-
if (classcode.empty()) {
2691-
BeginFile(LastNamespacePart(ns), false, &code, "", {});
2692-
code += "# NOTE " + defname + " does not declare any structs or enums\n";
2693-
} else {
2694-
BeginFile(LastNamespacePart(ns), needs_imports, &code, mod, imports);
2695-
code += classcode;
2696-
}
2692+
BeginFile(LastNamespacePart(ns), needs_imports, &code, mod, imports);
2693+
code += classcode;
26972694

26982695
const std::string directories =
26992696
parser_.opts.one_file ? path_ : namer_.Directories(ns.components);

tests/FromInclude.py

-5
This file was deleted.

tests/MyGame/OtherNameSpace/FromInclude.py

-5
This file was deleted.

tests/MyGame/OtherNameSpace/TableB.py

-5
This file was deleted.

tests/MyGame/OtherNameSpace/Unused.py

-5
This file was deleted.

tests/MyGame/OtherNameSpace/__init__.py

Whitespace-only changes.

tests/TableA.py

-5
This file was deleted.

tests/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)