bump version, Merge branch 'numpy'

casperdcl · casperdcl · commit bb53160c84ff · 2016-06-26T11:44:17.000Z
diff --git a/tqdm/_tqdm.py b/tqdm/_tqdm.py
@@ -508,7 +508,9 @@ def __init__(self, iterable=None, desc=None, total=None, leave=True,
         self.start_t = self.last_print_t = self._time()
 
     def __len__(self):
-        return len(self.iterable) if self.iterable else self.total
+        return (self.iterable.shape[0] if hasattr(self.iterable, 'shape')
+                else len(self.iterable)) if self.iterable is not None \
+            else self.total
 
     def __enter__(self):
         return self
diff --git a/tqdm/_version.py b/tqdm/_version.py
@@ -8,7 +8,7 @@
 __all__ = ["__version__"]
 
 # major, minor, patch, -extra
-version_info = 4, 7, 5
+version_info = 4, 7, 6
 
 # Nice string for the version
 __version__ = '.'.join(map(str, version_info))
diff --git a/tqdm/tests/tests_tqdm.py b/tqdm/tests/tests_tqdm.py
@@ -1216,3 +1216,15 @@ def test_write():
     # Restore stdout and stderr
     sys.stderr = stde
     sys.stdout = stdo
+
+
+@with_setup(pretest, posttest)
+def test_len():
+    """Test advance len (numpy array shape)"""
+    try:
+        import numpy as np
+    except:
+        raise SkipTest
+    with closing(StringIO()) as f:
+        with tqdm(np.zeros((3, 4)), file=f) as t:
+            assert len(t) == 3
