Don't use basestring

to work toward Python3 support

diff --git a/gbp/deb/source.py b/gbp/deb/source.py
index 847df555544d2ea22d5b44c26dc93f8f4593eba6..e523fd57740df7624ff99b9c3c7cd811a1a4a3db 100644 (file)
--- a/gbp/deb/source.py
+++ b/gbp/deb/source.py
@@ -20,6 +20,8 @@ import os
 from gbp.deb.format import DebianSourceFormat
 from gbp.deb.changelog import ChangeLog
 
+import six
+
 class FileVfs(object):
     def __init__(self, dir):
         """
@@ -51,7 +53,7 @@ class DebianSource(object):
         """
         self._changelog = None
 
-        if isinstance(vfs, basestring):
+        if isinstance(vfs, six.string_types):
             self._vfs = FileVfs(vfs)
         else:
             self._vfs = vfs

diff --git a/gbp/git/args.py b/gbp/git/args.py
index f9fc64d6b42447579d1bcaa1404a171965f0394e..6f3dfd0f1dfc07571f950533af4d343f8a83309a 100644 (file)
--- a/gbp/git/args.py
+++ b/gbp/git/args.py
@@ -18,6 +18,7 @@
 Git command argument handling helpers
 """
 
+import six
 import collections
 
 class GitArgs(object):
@@ -55,7 +56,7 @@ class GitArgs(object):
         Add arguments to argument list
         """
         for arg in args:
-            if isinstance(arg, basestring):
+            if isinstance(arg, six.string_types):
                 self._args.append(arg)
             elif isinstance(arg, collections.Iterable):
                 for i in iter(arg):

diff --git a/gbp/git/modifier.py b/gbp/git/modifier.py
index 5878681fd933c9c7ae4d1862e9cbaca37a3e3f61..7aede7a1dd709a4b1c46f6f2b6e18b1c06dd42bb 100644 (file)
--- a/gbp/git/modifier.py
+++ b/gbp/git/modifier.py
@@ -20,6 +20,7 @@ Someone who modifiers something in git
 like committing changes or authoring a patch
 """
 
+import six
 import calendar, datetime
 
 from gbp.git.errors import GitError
@@ -59,7 +60,7 @@ class GitModifier(object):
         self._date = None
         tz = GitTz(0)
 
-        if isinstance(date, basestring):
+        if isinstance(date, six.string_types):
             timestamp, offset = date.split()
             offset_h = int(offset[:-2])
             offset_m = int(offset[-2:])

diff --git a/gbp/git/repository.py b/gbp/git/repository.py
index c261e40518e2be5f46a098919738d639962f49f7..797c8c0e9485481b77066d339760536fd2c97eff 100644 (file)
--- a/gbp/git/repository.py
+++ b/gbp/git/repository.py
@@ -16,6 +16,7 @@
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """A Git repository"""
 
+import six
 import subprocess
 import os.path
 import re
@@ -39,7 +40,7 @@ class GitRemote(object):
     def __init__(self, name, fetch_url, push_urls):
         self._name = name
         self._fetch_url = fetch_url
-        if isinstance(push_urls, basestring):
+        if isinstance(push_urls, six.string_types):
             self._push_urls = [push_urls]
         else:
             self._push_urls = [url for url in push_urls]
@@ -1245,7 +1246,7 @@ class GitRepository(object):
         """
         extra_env = {}
 
-        if isinstance(paths, basestring):
+        if isinstance(paths, six.string_types):
             paths = [ paths ]
 
         args = [ '-f' ] if force else []
@@ -1267,7 +1268,7 @@ class GitRepository(object):
         @param verbose: be verbose
         @type verbose: C{bool}
         """
-        if isinstance(paths, basestring):
+        if isinstance(paths, six.string_types):
             paths = [ paths ]
 
         args =  [] if verbose else ['--quiet']
@@ -1368,7 +1369,7 @@ class GitRepository(object):
         @param author_info: authorship information
         @type author_info: L{GitModifier}
         """
-        if isinstance(files, basestring):
+        if isinstance(files, six.string_types):
             files = [ files ]
         self._commit(msg=msg, args=files, author_info=author_info)
 
@@ -1497,7 +1498,7 @@ class GitRepository(object):
             args.add(until)
         args.add_cond(options, options)
         args.add("--")
-        if isinstance(paths, basestring):
+        if isinstance(paths, six.string_types):
             paths = [ paths ]
         args.add_cond(paths, paths)