remove more 2.4 compat

13 files changed, 6 insertions, 19 deletions

diff --git a/README b/README
index 1fb72b510..8657b7775 100644
--- a/README
+++ b/README
@@ -3,9 +3,8 @@ README for PyLint
 
 Dependencies
 ------------
-Pylint requires the logilab-astng (version >= 0.17.4), logilab-common
-(version >= 0.38) and the optik (only for python < 2.3) packages. 
-Pylint should be compatible with any python >= 2.2.
+Pylint requires the logilab-astng (version >= 0.21.0), logilab-common
+(version >= 0.53).
 
 * http://www.logilab.org/projects/astng
 * http://www.logilab.org/projects/common
diff --git a/checkers/base.py b/checkers/base.py
index 89551ab2c..dc0fd2783 100755
--- a/checkers/base.py
+++ b/checkers/base.py
@@ -17,7 +17,6 @@
 
 
 from logilab import astng
-from logilab.common.compat import any, set
 from logilab.common.ureports import Table
 from logilab.astng import are_exclusive
 
diff --git a/checkers/imports.py b/checkers/imports.py
index d0740ad9a..a0936bd69 100644
--- a/checkers/imports.py
+++ b/checkers/imports.py
@@ -18,7 +18,6 @@
 from logilab.common.graph import get_cycles, DotBackend
 from logilab.common.modutils import is_standard_module
 from logilab.common.ureports import VerbatimText, Paragraph
-from logilab.common.compat import sorted, set
 
 from logilab import astng
 from logilab.astng import are_exclusive
diff --git a/checkers/logging.py b/checkers/logging.py
index c71b46bbb..17851e4e0 100644
--- a/checkers/logging.py
+++ b/checkers/logging.py
@@ -17,8 +17,6 @@
 from logilab import astng
 from pylint import checkers
 from pylint import interfaces
-from logilab.common.compat import set
-
 
 EAGER_STRING_INTERPOLATION = 'W6501'
 
diff --git a/checkers/similar.py b/checkers/similar.py
index f60901476..20d7f94a1 100644
--- a/checkers/similar.py
+++ b/checkers/similar.py
@@ -21,7 +21,6 @@ from __future__ import generators
 import sys
 from itertools import izip
 
-from logilab.common.compat import set, sorted
 from logilab.common.ureports import Table
 
 from pylint.interfaces import IRawChecker
diff --git a/checkers/string_format.py b/checkers/string_format.py
index c00ca4cdf..f8f2389fc 100644
--- a/checkers/string_format.py
+++ b/checkers/string_format.py
@@ -22,7 +22,6 @@ import string
 from logilab import astng
 from pylint.interfaces import IASTNGChecker
 from pylint.checkers import BaseChecker
-from logilab.common.compat import set
 
 MSGS = {
     'E9900': ("Unsupported format character %r (%#02x) at index %d",
diff --git a/checkers/typecheck.py b/checkers/typecheck.py
index ba1bfd0df..1ed47134e 100644
--- a/checkers/typecheck.py
+++ b/checkers/typecheck.py
@@ -16,9 +16,6 @@
 """try to find more bugs in the code using astng inference capabilities
 """
 
-from logilab.common.compat import set
-
-
 from logilab import astng
 from logilab.astng import InferenceError, NotFoundError, YES, Instance
 
diff --git a/checkers/utils.py b/checkers/utils.py
index 975ac15bb..8f02ac02f 100644
--- a/checkers/utils.py
+++ b/checkers/utils.py
@@ -19,7 +19,7 @@
 """
 
 from logilab import astng
-from logilab.common.compat import set, builtins
+from logilab.common.compat import builtins
 BUILTINS_NAME = builtins.__name__
 
 try:
diff --git a/doc/manual.txt b/doc/manual.txt
index 3ea7c60ed..767cf8e0a 100644
--- a/doc/manual.txt
+++ b/doc/manual.txt
@@ -61,8 +61,7 @@ Installation
 Dependencies
 ''''''''''''
 Pylint requires the latest `logilab-astng`_ and `logilab-common`_
-packages. It should be compatible with any python version greater than
-2.2.0.
+packages. It should be compatible with any python version >= 2.5.
 
 .. _`logilab-astng`: http://www.logilab.org/project/name/astng
 .. _`logilab-common`: http://www.logilab.org/project/name/common
diff --git a/lint.py b/lint.py
index a1146a6f4..ac7eae710 100644
--- a/lint.py
+++ b/lint.py
@@ -44,7 +44,6 @@ from logilab.common.textutils import splitstrip
 from logilab.common.ureports import Table, Text, Section
 from logilab.common.graph import ordered_nodes
 from logilab.common.__pkginfo__ import version as common_version
-from logilab.common.compat import set
 
 from logilab.astng import MANAGER, nodes
 from logilab.astng.__pkginfo__ import version as astng_version
diff --git a/pyreverse/diadefslib.py b/pyreverse/diadefslib.py
index 11662634c..68ca68ca4 100644
--- a/pyreverse/diadefslib.py
+++ b/pyreverse/diadefslib.py
@@ -16,7 +16,7 @@
 """handle diagram generation options for class diagram or default diagrams
 """
 
-from logilab.common.compat import set, builtins
+from logilab.common.compat import builtins
 BUILTINS_NAME = builtins.__name__
 from logilab import astng
 from logilab.astng.utils import LocalsVisitor
diff --git a/test/unittest_lint.py b/test/unittest_lint.py
index 368377c8c..81d1d399b 100644
--- a/test/unittest_lint.py
+++ b/test/unittest_lint.py
@@ -20,7 +20,7 @@ from os.path import join, basename, dirname, isdir, abspath
 from cStringIO import StringIO
 
 from logilab.common.testlib import TestCase, unittest_main, create_files
-from logilab.common.compat import sorted, reload
+from logilab.common.compat import reload
 
 from pylint import config
 from pylint.lint import PyLinter, Run, UnknownMessage
diff --git a/utils.py b/utils.py
index faedfc0dd..541014f5e 100644
--- a/utils.py
+++ b/utils.py
@@ -27,7 +27,6 @@ from logilab.common.modutils import modpath_from_file, get_module_files, \
 from logilab.common.textutils import normalize_text
 from logilab.common.configuration import rest_format_section
 from logilab.common.ureports import Section
-from logilab.common.compat import set
 
 from logilab.astng import nodes, Module