Remove implicit-map-evaluation in favour of map-builtin-not-iterating

2 files changed, 4 insertions, 11 deletions

diff --git a/checkers/python3.py b/checkers/python3.py
index 0b14a5c..47a5611 100644
--- a/checkers/python3.py
+++ b/checkers/python3.py
@@ -278,14 +278,7 @@ class Python3Checker(checkers.BaseChecker):
                   'Used when a __cmp__ method is defined '
                   '(method is not used by Python 3)',
                   {'maxversion': (3, 0)}),
-        'W1631': ('map is used as implicitly evaluated call',
-                  'implicit-map-evaluation',
-                  'Used when the map builtin is used as implicitly '
-                  'evaluated call, as in "map(func, args)" on a single line. '
-                  'This behaviour will not work in Python 3, where '
-                  'map is a generator and must be evaluated. '
-                  'Prefer a for-loop as alternative.',
-                  {'maxversion': (3, 0)}),
+        # 'W1631': 'implicit-map-evaluation' superceded by map-builtin-not-iterating.
         'W1632': ('input built-in referenced',
                   'input-builtin',
                   'Used when the input built-in is referenced '
@@ -366,14 +359,14 @@ class Python3Checker(checkers.BaseChecker):
             if isinstance(arg, astroid.Tuple):
                 self.add_message('parameter-unpacking', node=arg)
 
-    @utils.check_messages('implicit-map-evaluation')
+    @utils.check_messages('map-builtin-not-iterating')
     def visit_discard(self, node):
         if (isinstance(node.value, astroid.CallFunc) and
                 isinstance(node.value.func, astroid.Name) and
                 node.value.func.name == 'map'):
             module = node.value.func.lookup('map')[0]
             if _is_builtin(module):
-                self.add_message('implicit-map-evaluation', node=node)
+                self.add_message('map-builtin-not-iterating', node=node)
 
     def visit_name(self, node):
         """Detect when a "bad" built-in is referenced."""
diff --git a/test/unittest_checker_python3.py b/test/unittest_checker_python3.py
index d13abbf..375e7d0 100644
--- a/test/unittest_checker_python3.py
+++ b/test/unittest_checker_python3.py
@@ -316,7 +316,7 @@ class Python3CheckerTest(testutils.CheckerTestCase):
     def test_implicit_map_evaluation(self):
         node = test_utils.extract_node('map(str, [1, 2, 3])')
         discard = node.parent
-        message = testutils.Message('implicit-map-evaluation', node=discard)
+        message = testutils.Message('map-builtin-not-iterating', node=discard)
         with self.assertAddsMessages(message):
             # Use node.parent because extract_node returns the value
             # of a discard node, not the discard itself.