BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-03 04:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Python] Avoid include own type (#8625)

Browse Source 
This prevents the include of the type defined in the pyi,
otherwise this leads to error message like this:
error: Name XYZ already defined (possibly by an import)  [no-redef]
This commit is contained in:
Felix
2025-07-15 20:20:09 +02:00
committed by GitHub
parent 4c9079e31b
commit c7b9dc83f5
12 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/idl_gen_python.cpp
View File

@@ -290,6 +290,7 @@ class PythonStubGenerator {
void GenerateObjectStub(std::stringstream &stub, const StructDef *struct_def,
Imports *imports) const {
std::string name = namer_.ObjectType(*struct_def);
imports->Export(ModuleFor(struct_def), namer_.Type(*struct_def));
stub << "class " << name;
if (version_.major != 3) stub << "(object)";
@@ -327,6 +328,7 @@ class PythonStubGenerator {
void GenerateStructStub(std::stringstream &stub, const StructDef *struct_def,
Imports *imports) const {
std::string type = namer_.Type(*struct_def);
imports->Export(ModuleFor(struct_def), namer_.Type(*struct_def));
stub << "class " << type;
if (version_.major != 3) stub << "(object)";
@@ -545,6 +547,7 @@ class PythonStubGenerator {
void GenerateEnumStub(std::stringstream &stub, const EnumDef *enum_def,
Imports *imports) const {
stub << "class " << namer_.Type(*enum_def);
imports->Export(ModuleFor(enum_def), namer_.Type(*enum_def));
if (version_.major == 3){
imports->Import("enum", "IntEnum");
@@ -589,18 +592,32 @@ class PythonStubGenerator {
}
}
// Remove imports from exports
for (const Import &import : imports.exports) {
if (import.name == "") {
modules.erase(import.module);
} else {
auto search = names_by_module.find(import.module);
if (search != names_by_module.end()) {
search->second.erase(import.name);
}
}
}
for (const std::string &module : modules) {
ss << "import " << module << '\n';
}
for (const auto &import : names_by_module) {
ss << "from " << import.first << " import ";
size_t i = 0;
for (const std::string &name : import.second) {
if (i > 0) ss << ", ";
ss << name;
++i;
if (!import.second.empty()) {
ss << "from " << import.first << " import ";
size_t i = 0;
for (const std::string &name : import.second) {
if (i > 0) ss << ", ";
ss << name;
++i;
}
ss << '\n';
}
ss << '\n';
}
}