Replace `izip` with python's built-in equivalent

Run `2to3-3.8 -f itertools -w . && 2to3-3.8 -f itertools_imports -w .`

See: <https://docs.python.org/2/library/2to3.html#2to3fixer-itertools_imports>
and <https://docs.python.org/2/library/2to3.html#2to3fixer-itertools>

4 files changed, 7 insertions, 7 deletions

diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index cfba9104..b0119b58 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -259,7 +259,7 @@ class Markers(object):
             # if len(self.markers) > len(p_values):
             #    self.markers = self.markers[:len(p_values)]
 
-            for marker, p_value in itertools.izip(self.markers, p_values):
+            for marker, p_value in zip(self.markers, p_values):
                 if not p_value:
                     continue
                 marker['p_value'] = float(p_value)
diff --git a/wqflask/maintenance/quantile_normalize.py b/wqflask/maintenance/quantile_normalize.py
index 41a3aad8..34886f44 100644
--- a/wqflask/maintenance/quantile_normalize.py
+++ b/wqflask/maintenance/quantile_normalize.py
@@ -3,7 +3,7 @@ from __future__ import absolute_import, print_function, division
 import sys
 sys.path.insert(0,'./')
 
-from itertools import izip
+
 
 import MySQLdb
 import urlparse
@@ -60,7 +60,7 @@ def set_data(dataset_name):
 
     sample_list = []
     with open(orig_file, 'r') as orig_fh, open('/home/zas1024/cfw_data/quant_norm.csv', 'r') as quant_fh:
-        for i, (line1, line2) in enumerate(izip(orig_fh, quant_fh)):
+        for i, (line1, line2) in enumerate(zip(orig_fh, quant_fh)):
             trait_dict = {}
             sample_list = []
             if i == 0:
diff --git a/wqflask/wqflask/export_traits.py b/wqflask/wqflask/export_traits.py
index 28c6593d..a8b49829 100644
--- a/wqflask/wqflask/export_traits.py
+++ b/wqflask/wqflask/export_traits.py
@@ -122,7 +122,7 @@ def export_search_results_csv(targs):
 
             csv_rows.append(row_contents)
 
-        csv_rows = list(map(list, itertools.izip_longest(*[row for row in csv_rows])))
+        csv_rows = list(map(list, itertools.zip_longest(*[row for row in csv_rows])))
         writer.writerows(csv_rows)
         csv_data = buff.getvalue()
         buff.close()
diff --git a/wqflask/wqflask/pbkdf2.py b/wqflask/wqflask/pbkdf2.py
index 731c8843..0ed50790 100644
--- a/wqflask/wqflask/pbkdf2.py
+++ b/wqflask/wqflask/pbkdf2.py
@@ -44,7 +44,7 @@ import hmac
 import hashlib
 from struct import Struct
 from operator import xor
-from itertools import izip, starmap
+from itertools import starmap
 
 
 _pack_int = Struct('>I').pack
@@ -72,7 +72,7 @@ def pbkdf2_bin(data, salt, iterations=1000, keylen=24, hashfunc=None):
         rv = u = _pseudorandom(salt + _pack_int(block))
         for i in xrange(iterations - 1):
             u = _pseudorandom(''.join(map(chr, u)))
-            rv = list(starmap(xor, izip(rv, u)))
+            rv = list(starmap(xor, zip(rv, u)))
         buf.extend(rv)
     return ''.join(map(chr, buf))[:keylen]
 
@@ -81,7 +81,7 @@ def safe_str_cmp(a, b):
     if len(a) != len(b):
         return False
     rv = 0
-    for x, y in izip(a, b):
+    for x, y in zip(a, b):
         rv |= ord(x) ^ ord(y)
     return rv == 0