incubator-airflow git commit: [AIRFLOW-1694] Stop using itertools.izip

2017-10-18 Thread bolke
Repository: incubator-airflow
Updated Branches:
  refs/heads/master 2da485681 -> 6110139a8


[AIRFLOW-1694] Stop using itertools.izip

Itertools.zip does not exist in Python 3.

Closes #2674 from yati-sagade/fix-py3-zip


Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/6110139a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/6110139a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/6110139a

Branch: refs/heads/master
Commit: 6110139a8fd7069c87e3c99b3976865576180f67
Parents: 2da4856
Author: Yati Sagade 
Authored: Wed Oct 18 21:53:33 2017 +0200
Committer: Bolke de Bruin 
Committed: Wed Oct 18 21:53:36 2017 +0200

--
 airflow/hooks/hive_hooks.py | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/6110139a/airflow/hooks/hive_hooks.py
--
diff --git a/airflow/hooks/hive_hooks.py b/airflow/hooks/hive_hooks.py
index 7c73491..a8f9c8f 100644
--- a/airflow/hooks/hive_hooks.py
+++ b/airflow/hooks/hive_hooks.py
@@ -14,7 +14,7 @@
 #
 
 from __future__ import print_function
-from builtins import zip
+from six.moves import zip
 from past.builtins import basestring
 
 import unicodecsv as csv
@@ -144,11 +144,9 @@ class HiveCliHook(BaseHook):
 if not d:
 return []
 return as_flattened_list(
-itertools.izip(
-["-hiveconf"] * len(d),
-["{}={}".format(k, v) for k, v in d.items()]
-)
-)
+zip(["-hiveconf"] * len(d),
+["{}={}".format(k, v) for k, v in d.items()])
+)
 
 def run_cli(self, hql, schema=None, verbose=True, hive_conf=None):
 """



incubator-airflow git commit: [AIRFLOW-1694] Stop using itertools.izip

2017-10-18 Thread bolke
Repository: incubator-airflow
Updated Branches:
  refs/heads/v1-9-test 31805e836 -> c6e5ae7c5


[AIRFLOW-1694] Stop using itertools.izip

Itertools.zip does not exist in Python 3.

Closes #2674 from yati-sagade/fix-py3-zip

(cherry picked from commit 6110139a8fd7069c87e3c99b3976865576180f67)
Signed-off-by: Bolke de Bruin 


Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/c6e5ae7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/c6e5ae7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/c6e5ae7c

Branch: refs/heads/v1-9-test
Commit: c6e5ae7c57224ceb52cbf8d15b3362afd3616053
Parents: 31805e8
Author: Yati Sagade 
Authored: Wed Oct 18 21:53:33 2017 +0200
Committer: Bolke de Bruin 
Committed: Wed Oct 18 21:54:24 2017 +0200

--
 airflow/hooks/hive_hooks.py | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c6e5ae7c/airflow/hooks/hive_hooks.py
--
diff --git a/airflow/hooks/hive_hooks.py b/airflow/hooks/hive_hooks.py
index 7c73491..a8f9c8f 100644
--- a/airflow/hooks/hive_hooks.py
+++ b/airflow/hooks/hive_hooks.py
@@ -14,7 +14,7 @@
 #
 
 from __future__ import print_function
-from builtins import zip
+from six.moves import zip
 from past.builtins import basestring
 
 import unicodecsv as csv
@@ -144,11 +144,9 @@ class HiveCliHook(BaseHook):
 if not d:
 return []
 return as_flattened_list(
-itertools.izip(
-["-hiveconf"] * len(d),
-["{}={}".format(k, v) for k, v in d.items()]
-)
-)
+zip(["-hiveconf"] * len(d),
+["{}={}".format(k, v) for k, v in d.items()])
+)
 
 def run_cli(self, hql, schema=None, verbose=True, hive_conf=None):
 """