From a551aa81c6dd091cf9a363ca83f3726fb83e35d3 Mon Sep 17 00:00:00 2001 From: Leo Singer Date: Wed, 11 Mar 2015 08:19:28 -0400 Subject: [PATCH] Replace xrange with six.moves.xrange to support Python 3 Also add missing dependency on six. Fixes #226. --- healpy/fitsfunc.py | 3 ++- healpy/projaxes.py | 3 ++- requirements.txt | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/healpy/fitsfunc.py b/healpy/fitsfunc.py index 3db127a53..ea1722e53 100644 --- a/healpy/fitsfunc.py +++ b/healpy/fitsfunc.py @@ -24,6 +24,7 @@ except ImportError: import pyfits as pf import numpy as np +import six from . import pixelfunc from .sphtfunc import Alm import warnings @@ -422,7 +423,7 @@ def mwrfits(filename,data,hdu=1,colnames=None,keys=None): else: colnames = ['']*len(data) cols=[] - for line in xrange(len(data)): + for line in six.moves.xrange(len(data)): cols.append(pf.Column(name=colnames[line], format=getformat(data[line]), array=data[line])) diff --git a/healpy/projaxes.py b/healpy/projaxes.py index 7c07ed9af..02384b1d9 100644 --- a/healpy/projaxes.py +++ b/healpy/projaxes.py @@ -23,6 +23,7 @@ import matplotlib from matplotlib import axes,ticker,colors,cm,lines,cbook,figure import numpy as np +import six from ._healpy_pixel_lib import UNSEEN pi = np.pi @@ -394,7 +395,7 @@ def _make_segment(self,x,y,threshold=None): elif len(w) >= 2: xx.append(x[0:w[0]]) yy.append(y[0:w[0]]) - for i in xrange(len(w)-1): + for i in six.moves.xrange(len(w)-1): xx.append(x[w[i]:w[i+1]]) yy.append(y[w[i]:w[i+1]]) xx.append(x[w[-1]:]) diff --git a/requirements.txt b/requirements.txt index 9015685bf..1a57d05e4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,4 @@ numpy cython>=0.16 matplotlib astropy +six