Revert "Revert "pylint: upgrade to 1.3.1""

third_party/logilab/common/changelog.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.
 #
@@ skipping 31 matching lines @@
 release.
 All the non empty lines before the first entry are considered as the change
 log title.
 """
 
 __docformat__ = "restructuredtext en"
 
 import sys
 from stat import S_IWRITE
 
+from six import string_types
+
 BULLET = '*'
 SUBBULLET = '-'
 INDENT = ' ' * 4
 
 class NoEntry(Exception):
     """raised when we are unable to find an entry"""
 
 class EntryNotFound(Exception):
     """raised when we are unable to find a given entry"""
 
 class Version(tuple):
     """simple class to handle soft version number has a tuple while
     correctly printing it as X.Y.Z
     """
     def __new__(cls, versionstr):
-        if isinstance(versionstr, basestring):
+        if isinstance(versionstr, string_types):
             versionstr = versionstr.strip(' :') # XXX (syt) duh?
             parsed = cls.parse(versionstr)
         else:
             parsed = versionstr
         return tuple.__new__(cls, parsed)
 
     @classmethod
     def parse(cls, versionstr):
         versionstr = versionstr.strip(' :')
         try:
             return [int(i) for i in versionstr.split('.')]
-        except ValueError, ex:
+        except ValueError as ex:
             raise ValueError("invalid literal for version '%s' (%s)"%(versionstr, ex))
 
     def __str__(self):
         return '.'.join([str(i) for i in self])
 
 # upstream change log #########################################################
 
 class ChangeLogEntry(object):
     """a change log entry, i.e. a set of messages associated to a version and
     its release date
@@ skipping 137 matching lines @@
         from logilab.common.fileutils import ensure_fs_mode
         ensure_fs_mode(self.file, S_IWRITE)
         self.write(open(self.file, 'w'))
 
     def write(self, stream=sys.stdout):
         """write changelog to stream"""
         stream.write(self.format_title())
         for entry in self.entries:
             entry.write(stream)