Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lcmgen python: Fix imports when lcm package is left undefined #494

Merged
merged 1 commit into from
Mar 31, 2024
Merged

lcmgen python: Fix imports when lcm package is left undefined #494

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions lcmgen/emit_python.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,27 +647,33 @@ static void emit_python_fingerprint(const lcmgen_t *lcm, FILE *f, lcm_struct_t *
static void
emit_python_dependencies (const lcmgen_t *lcm, FILE *f, lcm_struct_t *structure, int write_init_py )
{
// Find the set of types to import
GHashTable *dependencies = g_hash_table_new (g_str_hash, g_str_equal);
for (unsigned int m=0; m < structure->members->len; m++) {
lcm_member_t *member = (lcm_member_t *) g_ptr_array_index (structure->members, m);
if (write_init_py) {
if (lcm_is_primitive_type(member->type->lctypename)){
continue;
}
int no_package = g_str_equal(member->type->package, "");
if (write_init_py && !no_package) {
// pyright (The vscode python static analyzer) refuses to understand
// `import foo.bar` in cases where `import foo` works.
// https://github.com/microsoft/pyright/issues/6674
if (! lcm_is_primitive_type (member->type->lctypename) &&
! g_hash_table_lookup (dependencies, member->type->package)) {
// Therefore, when __init__.py is generated, import only the package name.
if (! g_hash_table_lookup (dependencies, member->type->package)) {
g_hash_table_insert (dependencies, member->type->package,
member->type->package);
}
} else {
if (! lcm_is_primitive_type (member->type->lctypename) &&
! g_hash_table_lookup (dependencies, member->type->lctypename)) {
} else {
// Otherwise import each full type.
if (! g_hash_table_lookup (dependencies, member->type->lctypename)) {
g_hash_table_insert (dependencies, member->type->lctypename,
member->type->lctypename);
}
}
}

// Emit the set of imports.
GPtrArray *deps = _hash_table_get_vals (dependencies);
for (int i=0; i < deps->len; i++) {
const char *package = (char *) g_ptr_array_index (deps, i);
Expand Down
Loading