Finish converting tests to work both on Python 2 and 3. Also, drop 2to3 for tests.

16 files changed, 50 insertions, 26 deletions

diff --git a/pylint/test/functional/anomalous_unicode_escape.py b/pylint/test/functional/anomalous_unicode_escape_py2.py
index 19a6912..19a6912 100644
--- a/pylint/test/functional/anomalous_unicode_escape.py
+++ b/pylint/test/functional/anomalous_unicode_escape_py2.py
diff --git a/pylint/test/functional/anomalous_unicode_escape_py2.rc b/pylint/test/functional/anomalous_unicode_escape_py2.rc
new file mode 100644
index 0000000..a2328ed
--- /dev/null
+++ b/pylint/test/functional/anomalous_unicode_escape_py2.rc
@@ -0,0 +1,2 @@
+[testoptions]

+max_pyver=3.0
\ No newline at end of file
diff --git a/pylint/test/functional/anomalous_unicode_escape.txt b/pylint/test/functional/anomalous_unicode_escape_py2.txt
index c242cb9..c242cb9 100644
--- a/pylint/test/functional/anomalous_unicode_escape.txt
+++ b/pylint/test/functional/anomalous_unicode_escape_py2.txt
diff --git a/pylint/test/functional/anomalous_unicode_escape_py3.py b/pylint/test/functional/anomalous_unicode_escape_py3.py
new file mode 100644
index 0000000..1588ca0
--- /dev/null
+++ b/pylint/test/functional/anomalous_unicode_escape_py3.py
@@ -0,0 +1,19 @@
+# pylint:disable=W0105, W0511, C0121
+"""Test for backslash escapes in byte vs unicode strings"""
+
+# Would be valid in Unicode, but probably not what you want otherwise
+BAD_UNICODE = b'\u0042'  # [anomalous-unicode-escape-in-string]
+BAD_LONG_UNICODE = b'\U00000042'  # [anomalous-unicode-escape-in-string]
+# +1:[anomalous-unicode-escape-in-string]
+BAD_NAMED_UNICODE = b'\N{GREEK SMALL LETTER ALPHA}'
+
+GOOD_UNICODE = u'\u0042'
+GOOD_LONG_UNICODE = u'\U00000042'
+GOOD_NAMED_UNICODE = u'\N{GREEK SMALL LETTER ALPHA}'
+
+
+# Valid raw strings
+RAW_BACKSLASHES = r'raw'
+
+# In a comment you can have whatever you want: \ \\ \n \m
+# even things that look like bad strings: "C:\Program Files"
diff --git a/pylint/test/functional/anomalous_unicode_escape_py3.rc b/pylint/test/functional/anomalous_unicode_escape_py3.rc
new file mode 100644
index 0000000..8c6eb56
--- /dev/null
+++ b/pylint/test/functional/anomalous_unicode_escape_py3.rc
@@ -0,0 +1,2 @@
+[testoptions]

+min_pyver=3.0
\ No newline at end of file
diff --git a/pylint/test/functional/anomalous_unicode_escape_py3.txt b/pylint/test/functional/anomalous_unicode_escape_py3.txt
new file mode 100644
index 0000000..d2c5d10
--- /dev/null
+++ b/pylint/test/functional/anomalous_unicode_escape_py3.txt
@@ -0,0 +1,3 @@
+anomalous-unicode-escape-in-string:5::"Anomalous Unicode escape in byte string: '\u'. String constant might be missing an r or u prefix."
+anomalous-unicode-escape-in-string:6::"Anomalous Unicode escape in byte string: '\U'. String constant might be missing an r or u prefix."
+anomalous-unicode-escape-in-string:8::"Anomalous Unicode escape in byte string: '\N'. String constant might be missing an r or u prefix."
\ No newline at end of file
diff --git a/pylint/test/input/func_w0401.py b/pylint/test/input/func_w0401.py
index caf59c9..12227bc 100644
--- a/pylint/test/input/func_w0401.py
+++ b/pylint/test/input/func_w0401.py
@@ -1,9 +1,9 @@
 """test cyclic import
 """
-# pylint: disable=print-statement, no-absolute-import
-__revision__ = 0
+# pylint: disable=no-absolute-import
+from __future__ import print_function
 
-from input import w0401_cycle
+from . import w0401_cycle
 
-if __revision__:
-    print w0401_cycle
+if w0401_cycle:
+    print(w0401_cycle)
diff --git a/pylint/test/input/func_w0406.py b/pylint/test/input/func_w0406.py
index 84a5550..6feff50 100644
--- a/pylint/test/input/func_w0406.py
+++ b/pylint/test/input/func_w0406.py
@@ -3,7 +3,7 @@
 from __future__ import print_function
 __revision__ = 0
 
-import func_w0406
+from . import func_w0406
 
 if __revision__:
     print(func_w0406)
diff --git a/pylint/test/input/func_w1202.py b/pylint/test/input/func_w1202.py
index efe6b1a..7efb825 100644
--- a/pylint/test/input/func_w1202.py
+++ b/pylint/test/input/func_w1202.py
@@ -1,10 +1,11 @@
-# pylint: disable=E1101, no-absolute-import
+# pylint: disable=E1101, no-absolute-import, import-error
 """test checking use of the logging module
 """
 
-__revision__ = ''
-
-import __builtin__
+try:
+    import __builtin__ as builtins
+except ImportError:
+    import builtins
 
 # Muck up the names in an effort to confuse...
 import logging as renamed_logging
@@ -20,7 +21,7 @@ renamed_logging.log(renamed_logging.DEBUG, FORMAT_STR.format(4, 5))
 
 # Statements that should not be flagged:
 renamed_logging.debug(format(66, 'x'))
-renamed_logging.debug(__builtin__.format(66, 'x'))
+renamed_logging.debug(builtins.format(66, 'x'))
 renamed_logging.log(renamed_logging.DEBUG, 'msg: Run!'.upper())
 logging.debug('{0}, {1}'.format(4, 5))
 logging.log(logging.DEBUG, 'msg: {}'.format('Run!'))
diff --git a/pylint/test/input/w0401_cycle.py b/pylint/test/input/w0401_cycle.py
index cea6b93..ddb4255 100644
--- a/pylint/test/input/w0401_cycle.py
+++ b/pylint/test/input/w0401_cycle.py
@@ -1,9 +1,9 @@
 """w0401 dependency
 """
 # pylint: disable=print-statement, no-absolute-import
-__revision__ = 0
+from __future__ import print_function
 
-import input.func_w0401
+from . import func_w0401
 
-if __revision__:
-    print input
+if func_w0401:
+    print(input)
diff --git a/pylint/test/messages/func_import_syntax_error_py30.txt b/pylint/test/messages/func_import_syntax_error_py30.txt
index 00e7da0..4db95f1 100644
--- a/pylint/test/messages/func_import_syntax_error_py30.txt
+++ b/pylint/test/messages/func_import_syntax_error_py30.txt
@@ -1,4 +1,3 @@
 C:  1: Missing module docstring
-C:  1: Missing required attribute "__revision__"
-E:  2: No name 'syntax_error' in module 'input'
+F:  2: Unable to import 'syntax_error' (expected an indented block (<string>, line 2))
 W:  2: Unused import syntax_error
diff --git a/pylint/test/messages/func_w0233_py30.txt b/pylint/test/messages/func_w0233_py30.txt
new file mode 100644
index 0000000..361c84c
--- /dev/null
+++ b/pylint/test/messages/func_w0233_py30.txt
@@ -0,0 +1,5 @@
+E: 22:CCC: Module 'func_w0233' has no 'BBBB' member
+E: 27:CCC.__init__: Module 'func_w0233' has no 'BBBB' member
+F: 20: Unable to import 'nonexistant'
+W: 12:AAAA.__init__: __init__ method from a non direct base class 'BBBBMixin' is called
+W: 48:Super2.__init__: __init__ method from base class 'dict' is not called
\ No newline at end of file
diff --git a/pylint/test/messages/func_w0401.txt b/pylint/test/messages/func_w0401.txt
index 74b14dc..dc668f2 100644
--- a/pylint/test/messages/func_w0401.txt
+++ b/pylint/test/messages/func_w0401.txt
@@ -1,2 +1 @@
 R:  1: Cyclic import (input.func_w0401 -> input.w0401_cycle)
-W:  6: Redefining built-in 'input'
diff --git a/pylint/test/messages/func_w1202.txt b/pylint/test/messages/func_w1202.txt
index 9dbc26b..eb65fbe 100644
--- a/pylint/test/messages/func_w1202.txt
+++ b/pylint/test/messages/func_w1202.txt
@@ -1,4 +1,4 @@
-W: 16: Use % formatting in logging functions but pass the % parameters as arguments
 W: 17: Use % formatting in logging functions but pass the % parameters as arguments
 W: 18: Use % formatting in logging functions but pass the % parameters as arguments
 W: 19: Use % formatting in logging functions but pass the % parameters as arguments
+W: 20: Use % formatting in logging functions but pass the % parameters as arguments
diff --git a/pylint/test/regrtest_data/package/__init__.py b/pylint/test/regrtest_data/package/__init__.py
index 7041268..34550e9 100644
--- a/pylint/test/regrtest_data/package/__init__.py
+++ b/pylint/test/regrtest_data/package/__init__.py
@@ -11,4 +11,4 @@ class AudioTime(object):
 
     DECIMAL = 3
 
-import subpackage
+from . import subpackage
diff --git a/setup.py b/setup.py
index 2abfada..77b6ea3 100644
--- a/setup.py
+++ b/setup.py
@@ -115,12 +115,6 @@ class MyInstallLib(install_lib.install_lib):
                 shutil.rmtree(dest, ignore_errors=True)
                 shutil.copytree(directory, dest,
                                 ignore=shutil.ignore_patterns(*exclude))
-                if sys.version_info >= (3, 0):
-                    # process manually python file in include_dirs (test data)
-                    # pylint: disable=no-name-in-module
-                    from distutils.util import run_2to3
-                    print(('running 2to3 on', dest))
-                    run_2to3([dest])
 
     # override this since pip/easy_install attempt to byte compile test data
     # files, some of them being syntactically wrong by design, and this scares