summaryrefslogtreecommitdiff
path: root/pylint/test
diff options
context:
space:
mode:
Diffstat (limited to 'pylint/test')
-rw-r--r--pylint/test/functional/ungrouped_imports.py2
-rw-r--r--pylint/test/functional/wrong_import_order.py3
-rw-r--r--pylint/test/functional/wrong_import_order.txt1
-rw-r--r--pylint/test/functional/wrong_import_position.py2
4 files changed, 3 insertions, 5 deletions
diff --git a/pylint/test/functional/ungrouped_imports.py b/pylint/test/functional/ungrouped_imports.py
index 9626062..2204c80 100644
--- a/pylint/test/functional/ungrouped_imports.py
+++ b/pylint/test/functional/ungrouped_imports.py
@@ -1,6 +1,6 @@
"""Checks import order rule"""
# pylint: disable=unused-import,relative-import,wrong-import-order,using-constant-test
-
+# pylint: disable=import-error
import six
import logging.config
import os.path
diff --git a/pylint/test/functional/wrong_import_order.py b/pylint/test/functional/wrong_import_order.py
index 9fc3996..3e4f6a0 100644
--- a/pylint/test/functional/wrong_import_order.py
+++ b/pylint/test/functional/wrong_import_order.py
@@ -1,5 +1,5 @@
"""Checks import order rule"""
-# pylint: disable=unused-import,relative-import,ungrouped-imports
+# pylint: disable=unused-import,relative-import,ungrouped-imports,import-error
import six
import os.path # [wrong-import-order]
@@ -7,5 +7,4 @@ from astroid import are_exclusive
import sys # [wrong-import-order]
import datetime # [wrong-import-order]
import unused_import
-import scipy # [wrong-import-order]
import astroid
diff --git a/pylint/test/functional/wrong_import_order.txt b/pylint/test/functional/wrong_import_order.txt
index 537355c..7505c6e 100644
--- a/pylint/test/functional/wrong_import_order.txt
+++ b/pylint/test/functional/wrong_import_order.txt
@@ -1,4 +1,3 @@
wrong-import-order:5::standard import "import os.path" comes before "import six"
wrong-import-order:7::standard import "import sys" comes before "import six"
wrong-import-order:8::standard import "import datetime" comes before "import six"
-wrong-import-order:10::external import "import scipy" comes before "from astroid import are_exclusive"
diff --git a/pylint/test/functional/wrong_import_position.py b/pylint/test/functional/wrong_import_position.py
index 32a8314..1547ff2 100644
--- a/pylint/test/functional/wrong_import_position.py
+++ b/pylint/test/functional/wrong_import_position.py
@@ -1,6 +1,6 @@
"""Checks import order rule"""
# pylint: disable=unused-import,relative-import,ungrouped-imports,wrong-import-order,using-constant-test
-
+# pylint: disable=import-error
import os.path
if True:
from astroid import are_exclusive