More granular versions for deprecated modules.

Close #991

4 files changed, 18 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 2e4f95386..588964f29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,11 @@ Release date: TBA
 
       Close #990
 
+    * More granular versions for deprecated modules.
+
+      Close #991
+
+
 What's new in Pylint 1.6.1?
 ===========================
 
diff --git a/pylint/checkers/stdlib.py b/pylint/checkers/stdlib.py
index b01139ccf..9510c33d4 100644
--- a/pylint/checkers/stdlib.py
+++ b/pylint/checkers/stdlib.py
@@ -105,14 +105,14 @@ class StdlibChecker(BaseChecker):
             'tkinter.Menu.tk_bindForTraversal',
         ],
         2: {
-            (2, 6): [
+            (2, 6, 0): [
                 'commands.getstatus',
                 'os.popen2',
                 'os.popen3',
                 'os.popen4',
                 'macostools.touched',
             ],
-            (2, 7): [
+            (2, 7, 0): [
                 'unittest.case.TestCase.assertEquals',
                 'unittest.case.TestCase.assertNotEquals',
                 'unittest.case.TestCase.assertAlmostEquals',
@@ -125,15 +125,15 @@ class StdlibChecker(BaseChecker):
             ],
         },
         3: {
-            (3, 0): [
+            (3, 0, 0): [
                 'inspect.getargspec',
                 'unittest.case.TestCase._deprecate.deprecated_func',
             ],
-            (3, 1): [
+            (3, 1, 0): [
                 'base64.encodestring', 'base64.decodestring',
                 'ntpath.splitunc',
             ],
-            (3, 2): [
+            (3, 2, 0): [
                 'cgi.escape',
                 'configparser.RawConfigParser.readfp',
                 'xml.etree.ElementTree.Element.getchildren',
@@ -141,21 +141,23 @@ class StdlibChecker(BaseChecker):
                 'xml.etree.ElementTree.XMLParser.getiterator',
                 'xml.etree.ElementTree.XMLParser.doctype',
             ],
-            (3, 3): [
-                'inspect.getmoduleinfo', 'inspect.getmodulename',
+            (3, 3, 0): [
+                'inspect.getmoduleinfo',
                 'logging.warn', 'logging.Logger.warn',
                 'logging.LoggerAdapter.warn',
                 'nntplib._NNTPBase.xpath',
                 'platform.popen',
             ],
-            (3, 4): [
-                'asyncio.tasks.async',
+            (3, 4, 0): [
                 'importlib.find_loader',
                 'plistlib.readPlist', 'plistlib.writePlist',
                 'plistlib.readPlistFromBytes',
                 'plistlib.writePlistToBytes',
             ],
-            (3, 5): [
+            (3, 4, 4): [
+                'asyncio.tasks.async',
+            ],
+            (3, 5, 0): [
                 'fractions.gcd',
                 'inspect.getfullargspec', 'inspect.getargvalues',
                 'inspect.formatargspec', 'inspect.formatargvalues',
diff --git a/pylint/test/functional/deprecated_methods_py3.py b/pylint/test/functional/deprecated_methods_py3.py
index e7191eb02..3e2897f40 100644
--- a/pylint/test/functional/deprecated_methods_py3.py
+++ b/pylint/test/functional/deprecated_methods_py3.py
@@ -19,7 +19,7 @@ xml.etree.ElementTree.Element('tag').getiterator()  # [deprecated-method]
 xml.etree.ElementTree.XMLParser('tag', None, None).doctype(None, None, None)  # [deprecated-method]
 nntplib.NNTP(None).xpath(None) # [deprecated-method]
 inspect.getmoduleinfo(inspect) # [deprecated-method]
-inspect.getmodulename(inspect) # [deprecated-method]
+
 inspect.getargspec(None) # [deprecated-method]
 logging.warn("a") # [deprecated-method]
 platform.popen([]) # [deprecated-method]
diff --git a/pylint/test/functional/deprecated_methods_py3.txt b/pylint/test/functional/deprecated_methods_py3.txt
index 29a2ce867..972b97b63 100644
--- a/pylint/test/functional/deprecated_methods_py3.txt
+++ b/pylint/test/functional/deprecated_methods_py3.txt
@@ -4,7 +4,6 @@ deprecated-method:18::Using deprecated method getiterator()
 deprecated-method:19::Using deprecated method doctype()
 deprecated-method:20::Using deprecated method xpath()
 deprecated-method:21::Using deprecated method getmoduleinfo()
-deprecated-method:22::Using deprecated method getmodulename()
 deprecated-method:23::Using deprecated method getargspec()
 deprecated-method:24::Using deprecated method warn()
 deprecated-method:25::Using deprecated method popen()