Index: third_party/logilab/common/changelog.py |
=================================================================== |
--- third_party/logilab/common/changelog.py (revision 292986) |
+++ third_party/logilab/common/changelog.py (working copy) |
@@ -49,6 +49,8 @@ |
import sys |
from stat import S_IWRITE |
+from six import string_types |
+ |
BULLET = '*' |
SUBBULLET = '-' |
INDENT = ' ' * 4 |
@@ -64,7 +66,7 @@ |
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: |
@@ -76,7 +78,7 @@ |
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): |