Kill six.string_types

3 files changed, 8 insertions, 11 deletions

diff --git a/gbp/git/args.py b/gbp/git/args.py
index 95e50116..b2342ab6 100644
--- a/gbp/git/args.py
+++ b/gbp/git/args.py
@@ -18,7 +18,6 @@
 Git command argument handling helpers
 """
 
-import six
 import collections
 
 
@@ -57,7 +56,7 @@ class GitArgs(object):
         Add arguments to argument list
         """
         for arg in args:
-            if isinstance(arg, six.string_types):
+            if isinstance(arg, str):
                 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 cb8bec19..ca4b3167 100644
--- a/gbp/git/modifier.py
+++ b/gbp/git/modifier.py
@@ -20,7 +20,6 @@ Someone who modifiers something in git
 like committing changes or authoring a patch
 """
 
-import six
 import calendar
 import datetime
 
@@ -64,7 +63,7 @@ class GitModifier(object):
         self._date = None
         tz = GitTz(0)
 
-        if isinstance(date, six.string_types):
+        if isinstance(date, str):
             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 5e2b9708..aa934f4f 100644
--- a/gbp/git/repository.py
+++ b/gbp/git/repository.py
@@ -16,7 +16,6 @@
 #    <http://www.gnu.org/licenses/>
 """A Git repository"""
 
-import six
 import subprocess
 import os.path
 import re
@@ -42,7 +41,7 @@ class GitRemote(object):
     def __init__(self, name, fetch_url, push_urls):
         self._name = name
         self._fetch_url = fetch_url
-        if isinstance(push_urls, six.string_types):
+        if isinstance(push_urls, str):
             self._push_urls = [push_urls]
         else:
             self._push_urls = [url for url in push_urls]
@@ -837,7 +836,7 @@ class GitRepository(object):
 
         if paths is None:
             paths = []
-        elif isinstance(paths, six.string_types):
+        elif isinstance(paths, str):
             paths = [paths]
 
         out, ret = self._git_getoutput('status',
@@ -1360,7 +1359,7 @@ class GitRepository(object):
         """
         extra_env = {}
 
-        if isinstance(paths, six.string_types):
+        if isinstance(paths, str):
             paths = [paths]
 
         args = ['-f'] if force else []
@@ -1382,7 +1381,7 @@ class GitRepository(object):
         @param verbose: be verbose
         @type verbose: C{bool}
         """
-        if isinstance(paths, six.string_types):
+        if isinstance(paths, str):
             paths = [paths]
 
         args = [] if verbose else ['--quiet']
@@ -1493,7 +1492,7 @@ class GitRepository(object):
         @param author_info: authorship information
         @type author_info: L{GitModifier}
         """
-        if isinstance(files, six.string_types):
+        if isinstance(files, str):
             files = [files]
         self._commit(msg=msg, args=files, author_info=author_info)
 
@@ -1623,7 +1622,7 @@ class GitRepository(object):
             args.add(until)
         args.add_cond(options, options)
         args.add("--")
-        if isinstance(paths, six.string_types):
+        if isinstance(paths, str):
             paths = [paths]
         args.add_cond(paths, paths)