[py3k] Replace basestring with six.string_types

7 files changed, 23 insertions, 10 deletions

diff --git a/changelog.py b/changelog.py
index d912374..2fff2ed 100644
--- a/changelog.py
+++ b/changelog.py
@@ -49,6 +49,8 @@ __docformat__ = "restructuredtext en"
 import sys
 from stat import S_IWRITE
 
+from six import string_types
+
 BULLET = '*'
 SUBBULLET = '-'
 INDENT = ' ' * 4
@@ -64,7 +66,7 @@ class Version(tuple):
     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:
diff --git a/configuration.py b/configuration.py
index d04e77b..77a636f 100644
--- a/configuration.py
+++ b/configuration.py
@@ -123,6 +123,8 @@ from copy import copy
 from ConfigParser import ConfigParser
 from warnings import warn
 
+from six import string_types
+
 from logilab.common.compat import raw_input, str_encode as _encode
 from logilab.common.deprecation import deprecated
 from logilab.common.textutils import normalize_text, unquote
@@ -368,7 +370,7 @@ def format_option_value(optdict, value):
         value = value.pattern
     elif optdict.get('type') == 'yn':
         value = value and 'yes' or 'no'
-    elif isinstance(value, (str, unicode)) and value.isspace():
+    elif isinstance(value, string_types) and value.isspace():
         value = "'%s'" % value
     elif optdict.get('type') == 'time' and isinstance(value, (float, int, long)):
         value = format_time(value)
diff --git a/logging_ext.py b/logging_ext.py
index 54cc48f..3b6a580 100644
--- a/logging_ext.py
+++ b/logging_ext.py
@@ -24,6 +24,8 @@ import os
 import sys
 import logging
 
+from six import string_types
+
 from logilab.common.textutils import colorize_ansi
 
 
@@ -131,7 +133,7 @@ def get_threshold(debug=False, logthreshold=None):
             logthreshold = logging.DEBUG
         else:
             logthreshold = logging.ERROR
-    elif isinstance(logthreshold, basestring):
+    elif isinstance(logthreshold, string_types):
         logthreshold = getattr(logging, THRESHOLD_MAP.get(logthreshold,
                                                           logthreshold))
     return logthreshold
diff --git a/registry.py b/registry.py
index 62c9707..9b804f5 100644
--- a/registry.py
+++ b/registry.py
@@ -86,6 +86,8 @@ from os.path import join, isdir, exists
 from logging import getLogger
 from warnings import warn
 
+from six import string_types
+
 from logilab.common.modutils import modpath_from_file
 from logilab.common.logging_ext import set_log_methods
 from logilab.common.decorators import classproperty
@@ -294,7 +296,7 @@ class Registry(dict):
         # XXXFIXME this is a duplication of unregister()
         # remove register_and_replace in favor of unregister + register
         # or simplify by calling unregister then register here
-        if not isinstance(replaced, basestring):
+        if not isinstance(replaced, string_types):
             replaced = self.objid(replaced)
         # prevent from misspelling
         assert obj is not replaced, 'replacing an object by itself: %s' % obj
@@ -601,7 +603,7 @@ class RegistryStore(dict):
         :meth:`~logilab.common.registry.RegistryStore.register_and_replace` for
         instance).
         """
-        assert isinstance(modname, basestring), \
+        assert isinstance(modname, string_types), \
             'modname expected to be a module name (ie string), got %r' % modname
         for obj in objects:
             if self.is_registrable(obj) and obj.__module__ == modname and not obj in butclasses:
diff --git a/shellutils.py b/shellutils.py
index 02d4455..6fad79d 100644
--- a/shellutils.py
+++ b/shellutils.py
@@ -37,6 +37,8 @@ import random
 import subprocess
 from os.path import exists, isdir, islink, basename, join
 
+from six import string_types
+
 from logilab.common import STD_BLACKLIST, _handle_blacklist
 from logilab.common.compat import raw_input
 from logilab.common.compat import str_to_bytes
@@ -164,7 +166,7 @@ def find(directory, exts, exclude=False, blacklist=STD_BLACKLIST):
     :return:
       the list of all matching files
     """
-    if isinstance(exts, basestring):
+    if isinstance(exts, string_types):
         exts = (exts,)
     if exclude:
         def match(filename, exts):
diff --git a/testlib.py b/testlib.py
index 85fd918..b5d40f5 100644
--- a/testlib.py
+++ b/testlib.py
@@ -59,6 +59,7 @@ from ConfigParser import ConfigParser
 from itertools import dropwhile
 from inspect import isgeneratorfunction
 
+from six import string_types
 from six.moves import builtins
 
 from logilab.common.deprecation import deprecated
@@ -459,7 +460,7 @@ class Tags(set):
         if kwargs:
            raise TypeError("%s are an invalid keyword argument for this function" % kwargs.keys())
 
-        if len(tags) == 1 and not isinstance(tags[0], basestring):
+        if len(tags) == 1 and not isinstance(tags[0], string_types):
             tags = tags[0]
         super(Tags, self).__init__(tags, **kwargs)
 
@@ -969,9 +970,9 @@ class TestCase(unittest.TestCase):
         :param striplines: Boolean to trigger line stripping before comparing
         """
         msg = []
-        if not isinstance(text1, basestring):
+        if not isinstance(text1, string_types):
             msg.append('text1 is not a string (%s)'%(type(text1)))
-        if not isinstance(text2, basestring):
+        if not isinstance(text2, string_types):
             msg.append('text2 is not a string (%s)'%(type(text2)))
         if msg:
             self.fail('\n'.join(msg))
diff --git a/ureports/nodes.py b/ureports/nodes.py
index d63b582..a9585b3 100644
--- a/ureports/nodes.py
+++ b/ureports/nodes.py
@@ -23,6 +23,8 @@ __docformat__ = "restructuredtext en"
 
 from logilab.common.tree import VNode
 
+from six import string_types
+
 class BaseComponent(VNode):
     """base report component
 
@@ -79,7 +81,7 @@ class Text(BaseComponent):
         super(Text, self).__init__(**kwargs)
         #if isinstance(data, unicode):
         #    data = data.encode('ascii')
-        assert isinstance(data, (str, unicode)), data.__class__
+        assert isinstance(data, string_types), data.__class__
         self.escaped = escaped
         self.data = data