Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(308)

Unified Diff: third_party/pylint/checkers/newstyle.py

Issue 719313003: Revert "pylint: upgrade to 1.3.1" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/pylint/checkers/misc.py ('k') | third_party/pylint/checkers/raw_metrics.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/pylint/checkers/newstyle.py
diff --git a/third_party/pylint/checkers/newstyle.py b/third_party/pylint/checkers/newstyle.py
index cc8f640731f3704a693f0e5dc6e2fa82c0e726b6..7bb146da15f3e6942e8d9f68d4d0e9dbac606f4d 100644
--- a/third_party/pylint/checkers/newstyle.py
+++ b/third_party/pylint/checkers/newstyle.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2014 LOGILAB S.A. (Paris, FRANCE).
+# Copyright (c) 2005-2006 LOGILAB S.A. (Paris, FRANCE).
# http://www.logilab.fr/ -- mailto:contact@logilab.fr
#
# This program is free software; you can redistribute it and/or modify it under
@@ -12,57 +12,39 @@
#
# You should have received a copy of the GNU General Public License along with
# this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
"""check for new / old style related problems
"""
-import sys
-import astroid
+from logilab import astng
-from pylint.interfaces import IAstroidChecker
+from pylint.interfaces import IASTNGChecker
from pylint.checkers import BaseChecker
from pylint.checkers.utils import check_messages
MSGS = {
'E1001': ('Use of __slots__ on an old style class',
- 'slots-on-old-class',
- 'Used when an old style class uses the __slots__ attribute.',
- {'maxversion': (3, 0)}),
+ 'Used when an old style class uses the __slots__ attribute.'),
'E1002': ('Use of super on an old style class',
- 'super-on-old-class',
- 'Used when an old style class uses the super builtin.',
- {'maxversion': (3, 0)}),
- 'E1003': ('Bad first argument %r given to super()',
- 'bad-super-call',
+ 'Used when an old style class uses the super builtin.'),
+ 'E1003': ('Bad first argument %r given to super class',
'Used when another argument than the current class is given as \
first argument of the super builtin.'),
- 'E1004': ('Missing argument to super()',
- 'missing-super-argument',
- 'Used when the super builtin didn\'t receive an \
- argument.',
- {'maxversion': (3, 0)}),
'W1001': ('Use of "property" on an old style class',
- 'property-on-old-class',
'Used when PyLint detect the use of the builtin "property" \
on an old style class while this is relying on new style \
- classes features.',
- {'maxversion': (3, 0)}),
- 'C1001': ('Old-style class defined.',
- 'old-style-class',
- 'Used when a class is defined that does not inherit from another'
- 'class and does not inherit explicitly from "object".',
- {'maxversion': (3, 0)})
+ classes features'),
}
class NewStyleConflictChecker(BaseChecker):
"""checks for usage of new style capabilities on old style classes and
- other new/old styles conflicts problems
- * use of property, __slots__, super
- * "super" usage
+ other new/old styles conflicts problems
+ * use of property, __slots__, super
+ * "super" usage
"""
-
- __implements__ = (IAstroidChecker,)
+
+ __implements__ = (IASTNGChecker,)
# configuration section name
name = 'newstyle'
@@ -72,78 +54,53 @@ class NewStyleConflictChecker(BaseChecker):
# configuration options
options = ()
- @check_messages('slots-on-old-class', 'old-style-class')
+ @check_messages('E1001')
def visit_class(self, node):
"""check __slots__ usage
- """
+ """
if '__slots__' in node and not node.newstyle:
- self.add_message('slots-on-old-class', node=node)
- # The node type could be class, exception, metaclass, or
- # interface. Presumably, the non-class-type nodes would always
- # have an explicit base class anyway.
- if not node.bases and node.type == 'class':
- self.add_message('old-style-class', node=node)
+ self.add_message('E1001', node=node)
- @check_messages('property-on-old-class')
+ @check_messages('W1001')
def visit_callfunc(self, node):
"""check property usage"""
parent = node.parent.frame()
- if (isinstance(parent, astroid.Class) and
- not parent.newstyle and
- isinstance(node.func, astroid.Name)):
+ if (isinstance(parent, astng.Class) and
+ not parent.newstyle and
+ isinstance(node.func, astng.Name)):
name = node.func.name
if name == 'property':
- self.add_message('property-on-old-class', node=node)
+ self.add_message('W1001', node=node)
- @check_messages('super-on-old-class', 'bad-super-call', 'missing-super-argument')
+ @check_messages('E1002', 'E1003')
def visit_function(self, node):
"""check use of super"""
# ignore actual functions or method within a new style class
if not node.is_method():
return
klass = node.parent.frame()
- for stmt in node.nodes_of_class(astroid.CallFunc):
+ for stmt in node.nodes_of_class(astng.CallFunc):
expr = stmt.func
- if not isinstance(expr, astroid.Getattr):
+ if not isinstance(expr, astng.Getattr):
continue
call = expr.expr
# skip the test if using super
- if isinstance(call, astroid.CallFunc) and \
- isinstance(call.func, astroid.Name) and \
+ if isinstance(call, astng.CallFunc) and \
+ isinstance(call.func, astng.Name) and \
call.func.name == 'super':
if not klass.newstyle:
# super should not be used on an old style class
- self.add_message('super-on-old-class', node=node)
+ self.add_message('E1002', node=node)
else:
# super first arg should be the class
- if not call.args and sys.version_info[0] == 3:
- # unless Python 3
- continue
-
try:
supcls = (call.args and call.args[0].infer().next()
or None)
- except astroid.InferenceError:
+ except astng.InferenceError:
continue
-
- if supcls is None:
- self.add_message('missing-super-argument', node=call)
- continue
-
if klass is not supcls:
- name = None
- # if supcls is not YES, then supcls was infered
- # and use its name. Otherwise, try to look
- # for call.args[0].name
- if supcls is not astroid.YES:
- name = supcls.name
- else:
- if hasattr(call.args[0], 'name'):
- name = call.args[0].name
- if name is not None:
- self.add_message('bad-super-call',
- node=call,
- args=(name, ))
+ supcls = getattr(supcls, 'name', supcls)
+ self.add_message('E1003', node=node, args=supcls)
def register(linter):
« no previous file with comments | « third_party/pylint/checkers/misc.py ('k') | third_party/pylint/checkers/raw_metrics.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698