diff options
| author | Florian Bruhin <me@the-compiler.org> | 2015-07-26 11:00:07 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2015-07-26 11:00:07 +0200 |
| commit | 99d3a65574db1d7ea35dacee33b3a83cebfcea38 (patch) | |
| tree | 85928a27f3a59a43983e68b7be6cabb9d5d124c7 | |
| parent | 4f67ba0b84ad47ed47559b6a2c9e9edfa002ef57 (diff) | |
| download | pylint-99d3a65574db1d7ea35dacee33b3a83cebfcea38.tar.gz | |
Get rid of logilab.common.compat.
| -rw-r--r-- | pylint/checkers/exceptions.py | 2 | ||||
| -rw-r--r-- | pylint/checkers/utils.py | 3 | ||||
| -rw-r--r-- | pylint/pyreverse/diadefslib.py | 2 | ||||
| -rw-r--r-- | pylint/test/unittest_lint.py | 7 |
4 files changed, 6 insertions, 8 deletions
diff --git a/pylint/checkers/exceptions.py b/pylint/checkers/exceptions.py index 37b4c9f..f40c2aa 100644 --- a/pylint/checkers/exceptions.py +++ b/pylint/checkers/exceptions.py @@ -20,7 +20,7 @@ import sys import astroid from astroid import YES, Instance, unpack_infer, List, Tuple from astroid import helpers -from logilab.common.compat import builtins +from six.moves import builtins import six from pylint.checkers import BaseChecker diff --git a/pylint/checkers/utils.py b/pylint/checkers/utils.py index aff56b0..bbfc3d2 100644 --- a/pylint/checkers/utils.py +++ b/pylint/checkers/utils.py @@ -26,8 +26,7 @@ import warnings import astroid from astroid import helpers from astroid import scoped_nodes -from logilab.common.compat import builtins -from six.moves import map # pylint: disable=redefined-builtin +from six.moves import map, builtins # pylint: disable=redefined-builtin BUILTINS_NAME = builtins.__name__ COMP_NODE_TYPES = astroid.ListComp, astroid.SetComp, astroid.DictComp, astroid.GenExpr diff --git a/pylint/pyreverse/diadefslib.py b/pylint/pyreverse/diadefslib.py index 2c6d15b..0ef1465 100644 --- a/pylint/pyreverse/diadefslib.py +++ b/pylint/pyreverse/diadefslib.py @@ -16,7 +16,7 @@ """handle diagram generation options for class diagram or default diagrams """ -from logilab.common.compat import builtins +from six.moves import builtins import astroid diff --git a/pylint/test/unittest_lint.py b/pylint/test/unittest_lint.py index f756702..f95db3a 100644 --- a/pylint/test/unittest_lint.py +++ b/pylint/test/unittest_lint.py @@ -22,8 +22,7 @@ from os.path import join, basename, dirname, isdir, abspath, sep import unittest import six - -from logilab.common.compat import reload +from six.moves import reload_module from pylint import config, lint from pylint.lint import PyLinter, Run, preprocess_options, \ @@ -512,7 +511,7 @@ class ConfigTC(unittest.TestCase): pylintd = join(tempfile.gettempdir(), '.pylint.d') os.environ['PYLINTHOME'] = pylintd try: - reload(config) + reload_module(config) self.assertEqual(config.PYLINT_HOME, pylintd) finally: try: @@ -532,7 +531,7 @@ class ConfigTC(unittest.TestCase): os.environ['PYLINTRC'] = '.' self.assertEqual(config.find_pylintrc(), None) finally: - reload(config) + reload_module(config) def test_pylintrc_parentdir(self): with tempdir() as chroot: |