fixed tests on all python versions

Author: wolph

progressbar/utils.py

@@ -22,19 +22,20 @@ def len_color(value):
     '''
     Return the length of `value` without ANSI escape codes
 
-    >>> len_color(u'\u001b[1234]abc')
-    3
     >>> len_color(b'\u001b[1234]abc')
     3
+    >>> len_color(u'\u001b[1234]abc')
+    3
     >>> len_color('\u001b[1234]abc')
     3
     '''
-    pattern = u'\u001b\\[.*?[@-~]'
     if isinstance(value, bytes):
+        pattern = '\\\u001b\\[.*?[@-~]'
         pattern = pattern.encode()
         replace = b''
         assert isinstance(pattern, bytes)
     else:
+        pattern = u'\x1b\\[.*?[@-~]'
         replace = ''
 
     value = re.sub(pattern, replace, value)

progressbar/widgets.py

@@ -531,10 +531,17 @@ def __call__(self, progress, data, width=None):
         else:
             fill = ''
 
-        return '%s%s' % (
-            fill,
-            self.markers[data['updates'] % len(self.markers)],
-        )
+        marker = self.markers[data['updates'] % len(self.markers)]
+
+        # Python 3 returns an int when indexing bytes
+        if isinstance(marker, int):  # pragma: no cover
+            marker = bytes(marker)
+            fill = fill.encode()
+        else:
+            # cast fill to the same type as marker
+            fill = type(marker)(fill)
+
+        return fill + marker
 
 
 # Alias for backwards compatibility