From d64bb82cf917198f699b4d4873ed589b69cfcd2c Mon Sep 17 00:00:00 2001 From: DanRyanIrish Date: Thu, 1 Jun 2017 19:14:11 -0400 Subject: [PATCH] Make cube instal Python 3 compatible. --- docs/conf.py | 6 +++++- setup.py | 6 +++++- sunpycube/spectra/spectrogram.py | 7 +++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 2d4cf56..aca5b2a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -43,7 +43,11 @@ # Get configuration information from setup.cfg from distutils import config -conf = config.ConfigParser() +try: + from ConfigParser import ConfigParser +except ImportError: + from configparser import ConfigParser +conf = ConfigParser() conf.read([os.path.join(os.path.dirname(__file__), '..', 'setup.cfg')]) setup_cfg = dict(conf.items('metadata')) diff --git a/setup.py b/setup.py index 59255f0..c1de2ae 100755 --- a/setup.py +++ b/setup.py @@ -22,7 +22,11 @@ # Get some values from the setup.cfg from distutils import config -conf = config.ConfigParser() +try: + from ConfigParser import ConfigParser +except ImportError: + from configparser import ConfigParser +conf = ConfigParser() conf.read(['setup.cfg']) metadata = dict(conf.items('metadata')) diff --git a/sunpycube/spectra/spectrogram.py b/sunpycube/spectra/spectrogram.py index 3f33788..3577396 100644 --- a/sunpycube/spectra/spectrogram.py +++ b/sunpycube/spectra/spectrogram.py @@ -12,7 +12,6 @@ import datetime from random import randint -from itertools import izip from copy import copy from math import floor @@ -722,7 +721,7 @@ def interpolate(self, frequency): freq_axis[0] >= frequency >= self_freq_axis[-1] """ lfreq, lvalue = None, None - for freq, value in izip(self.freq_axis, self.data[:, :]): + for freq, value in zip(self.freq_axis, self.data[:, :]): if freq < frequency: break lfreq, lvalue = freq, value @@ -764,7 +763,7 @@ def linearize_freqs(self, delta_freq=None): fillto = np.abs(fillto) fillfrom = np.abs(fillfrom) - for row, from_, to_ in izip(self, fillfrom, fillto): + for row, from_, to_ in zip(self, fillfrom, fillto): new[from_: to_] = row vrs = self._get_params() @@ -997,7 +996,7 @@ def join_many(cls, specs, mk_arr=None, nonlinear=False, # Amount of pixels left out due to non-linearity. Needs to be # considered for correct time axes. sd = 0 - for x, elem in izip(xs, specs): + for x, elem in zip(xs, specs): diff = x - elem.shape[1] e_time_axis = elem.time_axis