Revert "pylint: upgrade to 1.3.1"

third_party/logilab/common/changelog.py

Index: third_party/logilab/common/changelog.py
diff --git a/third_party/logilab/common/changelog.py b/third_party/logilab/common/changelog.py
index 2fff2ed6505838e781151cecb76d0ae151ecc4d4..74f512416dc417ebade0069b404d1127f679831c 100644
--- a/third_party/logilab/common/changelog.py
+++ b/third_party/logilab/common/changelog.py
@@ -49,8 +49,6 @@ __docformat__ = "restructuredtext en"
 import sys
 from stat import S_IWRITE
 
-from six import string_types
-
 BULLET = '*'
 SUBBULLET = '-'
 INDENT = ' ' * 4
@@ -66,7 +64,7 @@ class Version(tuple):
     correctly printing it as X.Y.Z
     """
     def __new__(cls, versionstr):
-        if isinstance(versionstr, string_types):
+        if isinstance(versionstr, basestring):
             versionstr = versionstr.strip(' :') # XXX (syt) duh?
             parsed = cls.parse(versionstr)
         else:
@@ -78,7 +76,7 @@ class Version(tuple):
         versionstr = versionstr.strip(' :')
         try:
             return [int(i) for i in versionstr.split('.')]
-        except ValueError as ex:
+        except ValueError, ex:
             raise ValueError("invalid literal for version '%s' (%s)"%(versionstr, ex))
 
     def __str__(self):