Optimize effect of disabling ungrouped-imports.

Disabling 'ungrouped-imports' for a single line now prevents that line from triggering violations on subsequent lines.

Author: erikwright

ChangeLog

@@ -72,8 +72,9 @@ Release date: 2017-04-13
 
       Close #1342
 
-    * Disabling 'wrong-import-order' or 'wrong-import-position' for a single line now
-      prevents that line from triggering violations on subsequent lines.
+    * Disabling 'wrong-import-order', 'wrong-import-position', or
+      'ungrouped-imports' for a single line now prevents that line from
+      triggering violations on subsequent lines.
 
       Close #1336
 

pylint/checkers/imports.py

@@ -433,6 +433,8 @@ def leave_module(self, node):
         met = set()
         current_package = None
         for import_node, import_name in std_imports + ext_imports + loc_imports:
+            if not self.linter.is_message_enabled('ungrouped-imports', import_node.fromlineno):
+                continue
             package, _, _ = import_name.partition('.')
             if current_package and current_package != package and package in met:
                 self.add_message('ungrouped-imports', node=import_node,

pylint/test/functional/disable_ungrouped_imports.py

@@ -0,0 +1,10 @@
+"""Checks that disabling 'ungrouped-imports' on an import prevents subsequent
+imports from being considered ungrouped in respect to it."""
+# pylint: disable=unused-import,relative-import,wrong-import-position,wrong-import-order,using-constant-test
+# pylint: disable=import-error
+import os
+import logging.config  # pylint: disable=ungrouped-imports
+import os.path
+import logging
+from os.path import join  # [ungrouped-imports]
+import logging.handlers  # [ungrouped-imports]

pylint/test/functional/disable_ungrouped_imports.txt

@@ -0,0 +1,2 @@
+ungrouped-imports:9::Imports from package os are not grouped
+ungrouped-imports:10::Imports from package logging are not grouped