Permit lines to be hidden from consideration for wrong-import-order and wrong-import-position.

Author: erikwright

pylint/checkers/imports.py

@@ -436,6 +436,8 @@ def leave_module(self, node):
  self._first_non_import_node = None
 
  def compute_first_non_import_node(self, node):
+ if not self.linter.is_message_enabled('wrong-import-position', node.fromlineno):
+ return
  # if the node does not contain an import instruction, and if it is the
  # first node of the module, keep a track of it (all the import positions
  # of the module will be compared to the position of this first
@@ -466,6 +468,8 @@ def compute_first_non_import_node(self, node):
  compute_first_non_import_node
 
  def visit_functiondef(self, node):
+ if not self.linter.is_message_enabled('wrong-import-position', node.fromlineno):
+ return
  # If it is the first non import instruction of the module, record it.
  if self._first_non_import_node:
  return
@@ -552,8 +556,8 @@ def _check_imports_order(self, _module_node):
  extern_imports = []
  local_imports = []
  std_imports = []
- extern_not_nested = []
- local_not_nested = []
+ extern_not_ignored = []
+ local_not_ignored = []
  isort_obj = isort.SortImports(
  file_contents='', known_third_party=self.config.known_third_party,
  known_standard_library=self.config.known_standard_library,
@@ -567,7 +571,7 @@ def _check_imports_order(self, _module_node):
  import_category = isort_obj.place_module(package)
  if import_category in ('FUTURE', 'STDLIB'):
  std_imports.append((node, package))
- wrong_import = extern_not_nested or local_not_nested
+ wrong_import = extern_not_ignored or local_not_ignored
  if self._is_fallback_import(node, wrong_import):
  continue
  if wrong_import and not nested:
@@ -576,17 +580,17 @@ def _check_imports_order(self, _module_node):
  '"%s"' % wrong_import[0][0].as_string()))
  elif import_category in ('FIRSTPARTY', 'THIRDPARTY'):
  extern_imports.append((node, package))
- if not nested:
- extern_not_nested.append((node, package))
- wrong_import = local_not_nested
+ if not nested and self.linter.is_message_enabled('wrong-import-order', node.fromlineno):
+ extern_not_ignored.append((node, package))
+ wrong_import = local_not_ignored
  if wrong_import and not nested:
  self.add_message('wrong-import-order', node=node,
  args=('external import "%s"' % node.as_string(),
  '"%s"' % wrong_import[0][0].as_string()))
  elif import_category == 'LOCALFOLDER':
  local_imports.append((node, package))
- if not nested:
- local_not_nested.append((node, package))
+ if not nested and self.linter.is_message_enabled('wrong-import-order', node.fromlineno):
+ local_not_ignored.append((node, package))
  return std_imports, extern_imports, local_imports
 
  def _get_imported_module(self, importnode, modname):

pylint/test/functional/disable_wrong_import_order.py

@@ -0,0 +1,11 @@
+"""Checks that disabling 'wrong-import-order' on an import prevents subsequent
+imports from being considered out-of-order in respect to it but does not prevent
+it from being considered for 'ungrouped-imports'."""
+# pylint: disable=unused-import,import-error,no-name-in-module
+
+from first_party.foo import bar # pylint: disable=wrong-import-order
+import logging
+import os.path
+import sys
+from astroid import are_exclusive
+import first_party # [ungrouped-imports]

pylint/test/functional/disable_wrong_import_order.txt

@@ -0,0 +1 @@
+ungrouped-imports:11::Imports from package first_party are not grouped

pylint/test/functional/disable_wrong_import_position.py

@@ -0,0 +1,7 @@
+"""Checks that disabling 'wrong-import-position' on a statement prevents it from
+invalidating subsequent imports."""
+# pylint: disable=unused-import
+
+CONSTANT = True # pylint: disable=wrong-import-position
+
+import sys