Revert "Revert "pylint: upgrade to 1.3.1""

third_party/pylint/pyreverse/utils.py

-# Copyright (c) 2002-2010 LOGILAB S.A. (Paris, FRANCE).
+# Copyright (c) 2002-2013 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
 # the terms of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 #
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 #
 # 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.,
-# 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 """
 generic classes/functions for pyreverse core/extensions
 """
 
 import sys
 import re
 import os
 
 ########### pyreverse option utils ##############################
 
@@ skipping 17 matching lines @@
 def insert_default_options():
     """insert default options to sys.argv
     """
     options = get_default_options()
     options.reverse()
     for arg in options:
         sys.argv.insert(1, arg)
 
 
 
-# astng utilities ###########################################################
+# astroid utilities ###########################################################
 
 SPECIAL = re.compile('^__[A-Za-z0-9]+[A-Za-z0-9_]*__$')
 PRIVATE = re.compile('^__[_A-Za-z0-9]*[A-Za-z0-9]+_?$')
 PROTECTED = re.compile('^_[_A-Za-z0-9]*$')
 
 def get_visibility(name):
     """return the visibility from a name: public, protected, private or special
     """
     if SPECIAL.match(name):
         visibility = 'special'
@@ skipping 35 matching lines @@
 _CONSTRUCTOR = 1
 _SPECIAL = 2
 _PROTECTED = 4
 _PRIVATE = 8
 MODES = {
     'ALL'       : 0,
     'PUB_ONLY'  : _SPECIAL + _PROTECTED + _PRIVATE,
     'SPECIAL'   : _SPECIAL,
     'OTHER'     : _PROTECTED + _PRIVATE,
 }
-VIS_MOD = {'special': _SPECIAL, 'protected': _PROTECTED, \
-            'private': _PRIVATE, 'public': 0 }
+VIS_MOD = {'special': _SPECIAL, 'protected': _PROTECTED,
+           'private': _PRIVATE, 'public': 0}
 
-class FilterMixIn:
+class FilterMixIn(object):
     """filter nodes according to a mode and nodes' visibility
     """
     def __init__(self, mode):
         "init filter modes"
         __mode = 0
         for nummod in mode.split('+'):
             try:
                 __mode += MODES[nummod]
             except KeyError, ex:
                 print >> sys.stderr, 'Unknown filter mode %s' % ex
         self.__mode = __mode
 
 
     def show_attr(self, node):
         """return true if the node should be treated
         """
         visibility = get_visibility(getattr(node, 'name', node))
-        return not (self.__mode & VIS_MOD[visibility] )
+        return not (self.__mode & VIS_MOD[visibility])