diff options
| author | Matti Picus <matti.picus@gmail.com> | 2020-01-21 11:28:58 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-21 11:28:58 +1100 |
| commit | f71d9937d1e8a1e709f325f689f1e971e64c26a7 (patch) | |
| tree | 1f8b26a1bb346fab26d2210de286d29011bf2bf1 /numpy/lib/recfunctions.py | |
| parent | b753aa7a3a2c958e70826fb8af3b56db5c758819 (diff) | |
| parent | 9a21ec857b22ff0140a7f71a12f2cc943f163404 (diff) | |
| download | numpy-f71d9937d1e8a1e709f325f689f1e971e64c26a7.tar.gz | |
Merge pull request #15335 from sethtroisi/sys_version_easy
MAINT: Remove sys.version checks
Diffstat (limited to 'numpy/lib/recfunctions.py')
| -rw-r--r-- | numpy/lib/recfunctions.py | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/numpy/lib/recfunctions.py b/numpy/lib/recfunctions.py index 4e62169f4..af4cfa09d 100644 --- a/numpy/lib/recfunctions.py +++ b/numpy/lib/recfunctions.py @@ -5,7 +5,6 @@ Most of these functions were initially implemented by John Hunter for matplotlib. They have been rewritten and extended for convenience. """ -import sys import itertools import numpy as np import numpy.ma as ma @@ -17,9 +16,6 @@ from numpy.lib._iotools import _is_string_like from numpy.compat import basestring from numpy.testing import suppress_warnings -if sys.version_info[0] < 3: - from future_builtins import zip - _check_fill_value = np.ma.core._check_fill_value @@ -333,12 +329,7 @@ def _izip_records(seqarrays, fill_value=None, flatten=True): else: zipfunc = _izip_fields - if sys.version_info[0] >= 3: - zip_longest = itertools.zip_longest - else: - zip_longest = itertools.izip_longest - - for tup in zip_longest(*seqarrays, fillvalue=fill_value): + for tup in itertools.zip_longest(*seqarrays, fillvalue=fill_value): yield tuple(zipfunc(tup)) |