Revert "Revert "pylint: upgrade to 1.3.1""

third_party/logilab/common/__init__.py

 # copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 # contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
 #
 # This file is part of logilab-common.
 #
 # logilab-common is free software: you can redistribute it and/or modify it under
 # the terms of the GNU Lesser General Public License as published by the Free
 # Software Foundation, either version 2.1 of the License, or (at your option) any
 # later version.
 #
 # logilab-common 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 Lesser General Public License for more
 # details.
 #
 # You should have received a copy of the GNU Lesser General Public License along
 # with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
 """Logilab common library (aka Logilab's extension to the standard library).
 
 :type STD_BLACKLIST: tuple
 :var STD_BLACKLIST: directories ignored by default by the functions in
   this package which have to recurse into directories
 
 :type IGNORED_EXTENSIONS: tuple
 :var IGNORED_EXTENSIONS: file extensions that may usually be ignored
 """
 __docformat__ = "restructuredtext en"
+
+from six.moves import range
+
 from logilab.common.__pkginfo__ import version as __version__
 
 STD_BLACKLIST = ('CVS', '.svn', '.hg', 'debian', 'dist', 'build')
 
 IGNORED_EXTENSIONS = ('.pyc', '.pyo', '.elc', '~', '.swp', '.orig')
 
 # set this to False if you've mx DateTime installed but you don't want your db
 # adapter to use it (should be set before you got a connection)
 USE_MX_DATETIME = True
 
@@ skipping 12 matching lines @@
 
     def __getitem__(self, attr):
         try:
             return getattr(self.__proxy, attr)
         except AttributeError:
             raise KeyError(attr)
 
 class nullobject(object):
     def __repr__(self):
         return '<nullobject>'
-    def __nonzero__(self):
+    def __bool__(self):
         return False
+    __nonzero__ = __bool__
 
 class tempattr(object):
     def __init__(self, obj, attr, value):
         self.obj = obj
         self.attr = attr
         self.value = value
 
     def __enter__(self):
         self.oldvalue = getattr(self.obj, self.attr)
         setattr(self.obj, self.attr, self.value)
@@ skipping 90 matching lines @@
     """remove files/directories in the black list
 
     dirnames/filenames are usually from os.walk
     """
     for norecurs in blacklist:
         if norecurs in dirnames:
             dirnames.remove(norecurs)
         elif norecurs in filenames:
             filenames.remove(norecurs)