diff --git a/mypy/semanal.py b/mypy/semanal.py index 24c9cb7a9e5f..1d680eaf3079 100644 --- a/mypy/semanal.py +++ b/mypy/semanal.py @@ -1802,11 +1802,15 @@ def report_missing_module_attribute(self, import_id: str, source_id: str, import # Suggest alternatives, if any match is found. module = self.modules.get(import_id) if module: - alternatives = set(module.names.keys()).difference({source_id}) - matches = best_matches(source_id, alternatives)[:3] - if matches: - suggestion = "; maybe {}?".format(pretty_seq(matches, "or")) - message += "{}".format(suggestion) + if not self.options.implicit_reexport and source_id in module.names.keys(): + message = ("Module '{}' does not explicitly export attribute '{}'" + "; implicit reexport disabled".format(import_id, source_id)) + else: + alternatives = set(module.names.keys()).difference({source_id}) + matches = best_matches(source_id, alternatives)[:3] + if matches: + suggestion = "; maybe {}?".format(pretty_seq(matches, "or")) + message += "{}".format(suggestion) self.fail(message, context, code=codes.ATTR_DEFINED) self.add_unknown_imported_symbol(imported_id, context) diff --git a/test-data/unit/check-flags.test b/test-data/unit/check-flags.test index 37b2c2a92e68..fd775d5c6e01 100644 --- a/test-data/unit/check-flags.test +++ b/test-data/unit/check-flags.test @@ -1210,7 +1210,7 @@ a = 5 [file other_module_2.py] from other_module_1 import a [out] -main:2: error: Module 'other_module_2' has no attribute 'a' +main:2: error: Module 'other_module_2' does not explicitly export attribute 'a'; implicit reexport disabled [case testNoImplicitReexportRespectsAll] # flags: --no-implicit-reexport @@ -1224,7 +1224,7 @@ from other_module_1 import a, b __all__ = ('b',) [builtins fixtures/tuple.pyi] [out] -main:2: error: Module 'other_module_2' has no attribute 'a' +main:2: error: Module 'other_module_2' does not explicitly export attribute 'a'; implicit reexport disabled [case testNoImplicitReexportStarConsideredImplicit] # flags: --no-implicit-reexport @@ -1234,7 +1234,7 @@ a = 5 [file other_module_2.py] from other_module_1 import * [out] -main:2: error: Module 'other_module_2' has no attribute 'a' +main:2: error: Module 'other_module_2' does not explicitly export attribute 'a'; implicit reexport disabled [case testNoImplicitReexportStarCanBeReexportedWithAll] # flags: --no-implicit-reexport @@ -1248,7 +1248,19 @@ from other_module_1 import * __all__ = ('b',) [builtins fixtures/tuple.pyi] [out] -main:2: error: Module 'other_module_2' has no attribute 'a' +main:2: error: Module 'other_module_2' does not explicitly export attribute 'a'; implicit reexport disabled + +[case textNoImplicitReexportSuggestions] +# flags: --no-implicit-reexport +from other_module_2 import attr_1 + +[file other_module_1.py] +attr_1 = 5 +attr_2 = 6 +[file other_module_2.py] +from other_module_1 import attr_1, attr_2 +[out] +main:2: error: Module 'other_module_2' does not explicitly export attribute 'attr_1'; implicit reexport disabled [case testNoImplicitReexportMypyIni] # flags: --config-file tmp/mypy.ini