Commit a7bb0b2

committed

Implement suggestions from code-review.

1 parent 61f0408 commit a7bb0b2Copy full SHA for a7bb0b2

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,6 @@ def fully_qualify_alias_labels(label, aliases):`
`89`	`89`	`for alias, full_name in aliases.items():`
`90`	`90`	`if label == alias:`
`91`	`91`	`return full_name`
`92`		`- if label.startswith(alias+'.'):`
	`92`	`+ elif label.startswith(alias+'.'):`
`93`	`93`	`return full_name + label[len(alias):]`
`94`	`94`	`return label`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@`
`6`	`6`
`7`	`7`	`from .alias_helper import (`
`8`	`8`	`as_alias_handler,`
	`9`	`+ fully_qualify_alias_labels,`
`9`	`10`	`handle_aliases_in_init_files,`
`10`	`11`	`handle_fdid_aliases,`
`11`	`12`	`not_as_alias_handler,`
`12`		`- retrieve_import_alias_mapping,`
`13`		`- fully_qualify_alias_labels`
	`13`	`+ retrieve_import_alias_mapping`
`14`	`14`	`)`
`15`	`15`	`from ..core.ast_helper import (`
`16`	`16`	`generate_ast,`
`@@ -816,6 +816,7 @@ def add_module( # noqa: C901`
`816`	`816`	`module_path = module[1]`
`817`	`817`
`818`	`818`	`parent_definitions = self.module_definitions_stack[-1]`
	`819`	+ # Here, in `visit_Import` and in `visit_ImportFrom` are the only places the `import_alias_mapping` is updated
`819`	`820`	`parent_definitions.import_alias_mapping.update(import_alias_mapping)`
`820`	`821`	`parent_definitions.import_names = local_names`
`821`	`822`
`@@ -1106,7 +1107,7 @@ def visit_ImportFrom(self, node):`
`1106`	`1107`	`from_from=True`
`1107`	`1108`	`)`
`1108`	`1109`
`1109`		`- # Remember aliases for uninspecatble modules such that we can label them fully qualified`
	`1110`	`+ # Remember aliases for uninspectable modules such that we can label them fully qualified`
`1110`	`1111`	`# e.g. we want a call to "os.system" be recognised, even if we do "from os import system"`
`1111`	`1112`	`# from os import system as mysystem -> module=os, name=system, asname=mysystem`
`1112`	`1113`	`for name in node.names:`

Comments

(0)