replace usage of six.string_types by plain str

Author: a-detiste

nixio/block.py

@@ -13,7 +13,6 @@
     from sys import maxsize as maxint
 import numpy as np
 from inspect import isclass
-from six import string_types
 try:
     from collections.abc import OrderedDict
 except ImportError:
@@ -358,8 +357,7 @@ def create_data_frame(self, name="", type_="", col_dict=None,
         if col_dict is not None:
             for nam, dt in col_dict.items():
                 if isclass(dt):
-                    if any(issubclass(dt, st) for st in string_types) \
-                            or issubclass(dt, np.string_):
+                    if issubclass(dt, str) or issubclass(dt, np.string_):
                         col_dict[nam] = util.vlen_str_dtype
                 if 'U' in str(dt) or dt == np.string_:
                     col_dict[nam] = util.vlen_str_dtype

nixio/data_frame.py

@@ -19,7 +19,6 @@
 from .data_set import DataSet
 from .datatype import DataType
 from .section import Section
-from six import string_types
 import csv
 
 
@@ -55,8 +54,7 @@ def append_column(self, column, name, datatype=None):
             raise ValueError("Too much entries for column in this dataframe")
         if datatype is None:
             datatype = DataType.get_dtype(column[0])
-        if isclass(datatype) and any(issubclass(datatype, st)
-                                     for st in string_types):
+        if isclass(datatype) and issubclass(datatype, str):
             datatype = util.vlen_str_dtype
         dt_arr = [(n, dty) for n, dty in zip(self.column_names, self.dtype)]
         dt_arr.append((name, datatype))

nixio/datatype.py

@@ -7,7 +7,6 @@
 # modification, are permitted under the terms of the BSD License. See
 # LICENSE file in the root of the Project.
 from numbers import Integral, Real
-from six import string_types
 
 import numpy as np
 
@@ -41,7 +40,7 @@ def get_dtype(cls, value):
             return cls.Int64
         elif isinstance(value, Real):
             return cls.Double
-        elif isinstance(value, string_types):
+        elif isinstance(value, str):
             return cls.String
         else:
             raise ValueError("Unknown type for value {}".format(value))

nixio/feature.py

@@ -10,7 +10,6 @@
 from .data_frame import DataFrame
 from .link_type import LinkType
 from .exceptions import UnsupportedLinkType
-from six import string_types
 from .util import util
 
 
@@ -53,7 +52,7 @@ def link_type(self):
 
     @link_type.setter
     def link_type(self, link_type):
-        if isinstance(link_type, string_types):
+        if isinstance(link_type, str):
             link_type = link_type.lower()
         link_type = LinkType(link_type)
         self._h5group.set_attr("link_type", link_type.value)

nixio/property.py

@@ -13,7 +13,7 @@
     from collections import Sequence, Iterable
 from enum import Enum
 from numbers import Number
-from six import string_types, ensure_str, ensure_text
+from six import ensure_str, ensure_text
 import numpy as np
 
 from .datatype import DataType
@@ -268,7 +268,7 @@ def values(self, vals):
             self.delete_values()
             return
 
-        if not isinstance(vals, (Sequence, Iterable)) or isinstance(vals, string_types):
+        if not isinstance(vals, (Sequence, Iterable)) or isinstance(vals, str):
             vals = [vals]
 
         # Make sure all values are of the same data type
@@ -294,7 +294,7 @@ def extend_values(self, data):
         dataset.write_data(arr, slc=np.s_[src_len: src_len + dlen])
 
     def _check_new_value_types(self, data):
-        if isinstance(data, (Sequence, Iterable)) and not isinstance(data, string_types):
+        if isinstance(data, (Sequence, Iterable)) and not isinstance(data, str):
             single_val = data[0]
         else:
             single_val = data

nixio/section.py

@@ -14,7 +14,6 @@
     from collections.abc import Sequence, Iterable
 except ImportError:
     from collections import Sequence, Iterable
-from six import string_types
 import numpy as np
 from .container import Container, SectionContainer
 from .datatype import DataType
@@ -147,7 +146,7 @@ def create_property(self, name="", values_or_dtype=0, oid=None,
             # Make sure all values are of the same data type
             single_val = vals
             if (isinstance(vals, (Sequence, Iterable)) and
-                    not isinstance(vals, string_types)):
+                    not isinstance(vals, str)):
                 single_val = vals[0]
             else:
                 # Make sure the data will always be created with an array.

nixio/tag.py

@@ -9,7 +9,6 @@
 import warnings
 
 import numpy as np
-from six import string_types
 
 from .entity import Entity
 from .source_link_container import SourceLinkContainer
@@ -107,7 +106,7 @@ def create_feature(self, data, link_type):
         :returns: The created feature object.
         :rtype: nixio.Feature
         """
-        if isinstance(link_type, string_types):
+        if isinstance(link_type, str):
             link_type = link_type.lower()
         link_type = LinkType(link_type)
         features = self._h5group.open_group("features")

nixio/test/test_data_array.py

@@ -8,7 +8,6 @@
 # LICENSE file in the root of the Project.
 import os
 import time
-from six import string_types
 import sys
 import unittest
 import numpy as np
@@ -307,8 +306,8 @@ def test_data_array_dimensions(self):
         self.assertRaises(IndexError, lambda: self.array.dimensions[-4])
         self.assertRaises(IndexError, lambda: self.array.dimensions[3])
 
-        assert isinstance(str(self.array.dimensions), string_types)
-        assert isinstance(repr(self.array.dimensions), string_types)
+        assert isinstance(str(self.array.dimensions), str)
+        assert isinstance(repr(self.array.dimensions), str)
 
         dims = list(self.array.dimensions)
         for i in range(3):

nixio/test/test_data_frame.py

@@ -5,7 +5,6 @@
 import os
 import time
 import numpy as np
-from six import string_types
 try:
     from collections.abc import OrderedDict
 except ImportError:
@@ -65,7 +64,7 @@ def test_create_with_list(self):
         assert df_li.column_names == self.df1.column_names
         assert df_li.dtype == self.df1.dtype
         for i in df_li[:]:
-            self.assertIsInstance(i['id'], string_types)
+            self.assertIsInstance(i['id'], str)
             self.assertIsInstance(i['sig2'], np.int32)
 
     def test_column_name_collision(self):

nixio/test/test_nix_compatibility.py

@@ -12,7 +12,6 @@
 except ImportError:
     from collections import Iterable
 from collections import OrderedDict
-from six import string_types
 from subprocess import Popen, PIPE
 import numpy as np
 import pytest
@@ -725,7 +724,7 @@ def check_group_children_counts(group, nda, ntg, nmt):
 def compare(expected, actual):
     if (isinstance(expected, Iterable) and
             isinstance(actual, Iterable) and not
-            isinstance(expected, string_types)):
+            isinstance(expected, str)):
         assert len(expected) == len(actual), "Expected {}, got {}".format(expected, actual)
         for exp, act in zip(expected, actual):
             compare(exp, act)