commit-0
diff --git a/‎progressbar/_six.py‎
Lines changed: 0 additions & 10 deletions b/‎progressbar/_six.py‎
Lines changed: 0 additions & 10 deletions
diff --git a/‎progressbar/bar.py‎
Lines changed: 3 additions & 2 deletions b/‎progressbar/bar.py‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎progressbar/utils.py‎
Lines changed: 1 addition & 1 deletion b/‎progressbar/utils.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎progressbar/widgets.py‎
Lines changed: 4 additions & 3 deletions b/‎progressbar/widgets.py‎
Lines changed: 4 additions & 3 deletions
@@ -1,18 +1,8 @@
 '''Library to make differences between Python 2 and 3 transparent'''
 import sys
 
-__all__ = [
-    'basestring',
-]
-
 PY3 = sys.version_info[0] == 3
 
-if PY3:  # pragma: no cover
-    basestring = str,
-else:  # pragma: no cover
-    basestring = str, unicode  # NOQA
-
-
 if PY3:  # pragma: no cover
     long_int = int
 else:  # pragma: no cover
 
@@ -13,9 +13,10 @@
 
 from python_utils import converters
 
+import six
+
 from . import widgets
 from . import widgets as widgets_module  # Avoid name collision
-from . import _six
 from . import base
 from . import utils
 
@@ -468,7 +469,7 @@ def _format_widgets(self):
             if isinstance(widget, widgets.AutoWidthWidgetBase):
                 result.append(widget)
                 expanding.insert(0, index)
-            elif isinstance(widget, _six.basestring):
+            elif isinstance(widget, six.string_types):
                 result.append(widget)
                 width -= self.custom_len(widget)
             else:
 
@@ -386,7 +386,7 @@ def format_time(time, precision=datetime.timedelta(seconds=1)):
     '''
     precision_seconds = precision.total_seconds()
 
-    if isinstance(time, _six.basestring + six.integer_types + (float, )):
+    if isinstance(time, six.string_types + six.integer_types + (float, )):
         try:
             time = datetime.timedelta(seconds=_six.long_int(time))
         except OverflowError:  # pragma: no cover
 
@@ -11,8 +11,9 @@
 
 from python_utils import converters
 
+import six
+
 from . import base
-from . import _six
 from . import utils
 
 MAX_DATE = datetime.date(year=datetime.MAXYEAR, month=12, day=31)
@@ -21,7 +22,7 @@
 
 
 def string_or_lambda(input_):
-    if isinstance(input_, _six.basestring):
+    if isinstance(input_, six.string_types):
         def render_input(progress, data, width):
             return input_ % data
 
@@ -39,7 +40,7 @@ def _marker(progress, data, width):
         else:
             return marker
 
-    if isinstance(marker, _six.basestring):
+    if isinstance(marker, six.string_types):
         marker = converters.to_unicode(marker)
         assert len(marker) == 1, 'Markers are required to be 1 char'
         return _marker