Merge pull request #2492 from kalekundert/features

Add support for numpy arrays (and dicts) to approx.
pytest-dev · Jul 6, 2017 · ef62b86 · ef62b86
2 parents b62aef3 + 7a1a439
commit ef62b86
Show file tree

Hide file tree

Showing 8 changed files with 456 additions and 176 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,9 +20,11 @@ env:
     - TOXENV=py27-pexpect
     - TOXENV=py27-xdist
     - TOXENV=py27-trial
+    - TOXENV=py27-numpy
     - TOXENV=py35-pexpect
     - TOXENV=py35-xdist
     - TOXENV=py35-trial
+    - TOXENV=py35-numpy
     - TOXENV=py27-nobyte
     - TOXENV=doctesting
     - TOXENV=freeze

diff --git a/_pytest/compat.py b/_pytest/compat.py
@@ -125,6 +125,7 @@ def isclass(object):
 if _PY3:
     import codecs
     imap = map
+    izip = zip
     STRING_TYPES = bytes, str
     UNICODE_TYPES = str,
 
@@ -160,7 +161,7 @@ def _escape_strings(val):
     STRING_TYPES = bytes, str, unicode
     UNICODE_TYPES = unicode,
 
-    from itertools import imap  # NOQA
+    from itertools import imap, izip  # NOQA
 
     def _escape_strings(val):
         """In py2 bytes and str are the same type, so return if it's a bytes