From b4ad1b2d733f40a1584abd28c9dc67e8743016e4 Mon Sep 17 00:00:00 2001 From: Mike Croucher Date: Fri, 27 Feb 2015 19:32:38 +0000 Subject: [PATCH] Python3 compatbility fixes --- GPy/core/parameterization/index_operations.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/GPy/core/parameterization/index_operations.py b/GPy/core/parameterization/index_operations.py index e5273e55..01a13c8b 100644 --- a/GPy/core/parameterization/index_operations.py +++ b/GPy/core/parameterization/index_operations.py @@ -66,7 +66,11 @@ class ParameterIndexOperations(object): self.add(t, i) def iteritems(self): - return self._properties.iteritems() + try: + return self._properties.iteritems() + except AttributeError: + #Changed this from iteritems to items for Py3 compatibility. It didn't break the test suite. + return self._properties.items() def items(self): return self._properties.items() @@ -101,7 +105,11 @@ class ParameterIndexOperations(object): return reduce(lambda a,b: a+b.size, self.iterindices(), 0) def iterindices(self): - return self._properties.itervalues() + try: + return self._properties.itervalues() + except AttributeError: + #Changed this from itervalues to values for Py3 compatibility. It didn't break the test suite. + return self._properties.values() def indices(self): return self._properties.values()