From 5607bd9a193ce45de825d0c88d787aae6abc59b7 Mon Sep 17 00:00:00 2001
From: Mike Croucher <michael.p.croucher@googlemail.com>
Date: Mon, 2 Mar 2015 20:13:21 +0000
Subject: [PATCH] Various Py3 related import fixes

---
 GPy/core/model.py                  | 1 +
 GPy/core/parameterization/param.py | 1 +
 GPy/models/mrd.py                  | 4 ++--
 GPy/testing/pickle_tests.py        | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/GPy/core/model.py b/GPy/core/model.py
index 9521733c..097f7b5a 100644
--- a/GPy/core/model.py
+++ b/GPy/core/model.py
@@ -13,6 +13,7 @@ import itertools
 import sys
 from .verbose_optimization import VerboseOptimization
 # import numdifftools as ndt
+from functools import reduce
 
 class Model(Parameterized):
     _fail_count = 0  # Count of failed optimization steps (see objective)
diff --git a/GPy/core/parameterization/param.py b/GPy/core/parameterization/param.py
index 09369efa..1838f2bf 100644
--- a/GPy/core/parameterization/param.py
+++ b/GPy/core/parameterization/param.py
@@ -6,6 +6,7 @@ import numpy
 np = numpy
 from .parameter_core import Parameterizable, adjust_name_for_printing, Pickleable
 from .observable_array import ObsAr
+from functools import reduce
 
 ###### printing
 __constraints_name__ = "Constraint"
diff --git a/GPy/models/mrd.py b/GPy/models/mrd.py
index f3e643c9..f56873fa 100644
--- a/GPy/models/mrd.py
+++ b/GPy/models/mrd.py
@@ -82,7 +82,7 @@ class MRD(BayesianGPLVMMiniBatch):
         assert len(self.names) == len(self.Ylist), "one name per dataset, or None if Ylist is a dict"
 
         if inference_method is None:
-            self.inference_method = InferenceMethodList([VarDTC() for _ in xrange(len(self.Ylist))])
+            self.inference_method = InferenceMethodList([VarDTC() for _ in range(len(self.Ylist))])
         else:
             assert isinstance(inference_method, InferenceMethodList), "please provide one inference method per Y in the list and provide it as InferenceMethodList, inference_method given: {}".format(inference_method)
             self.inference_method = inference_method
@@ -338,4 +338,4 @@ class MRD(BayesianGPLVMMiniBatch):
         super(MRD, self).__setstate__(state)
         self.kern = self.bgplvms[0].kern
         self.likelihood = self.bgplvms[0].likelihood
-        self.parameters_changed()
\ No newline at end of file
+        self.parameters_changed()
diff --git a/GPy/testing/pickle_tests.py b/GPy/testing/pickle_tests.py
index 251b7cce..fd1bf93c 100644
--- a/GPy/testing/pickle_tests.py
+++ b/GPy/testing/pickle_tests.py
@@ -34,7 +34,7 @@ class ListDictTestCase(unittest.TestCase):
         for k,v in d1.items():
             self.assertListEqual(list(v), list(d2[k]), msg)
     def assertArrayListEquals(self, l1, l2):
-        for a1, a2 in itertools.izip(l1,l2):
+        for a1, a2 in zip(l1,l2):
             np.testing.assert_array_equal(a1, a2)
 
 class Test(ListDictTestCase):