diff --git a/bin/__init__.py b/bin/__init__.py index fa2c72cead9dfea1429df60ffe1c891876ebec98..a01f64b9ef8b91d00ee7c52e54c11004c75bba04 100644 --- a/bin/__init__.py +++ b/bin/__init__.py @@ -1,7 +1,8 @@ """Module for bin """ +from __future__ import absolute_import -import geomag +from . import geomag __all__ = [ 'geomag' diff --git a/geomagio/iaga2002/IAGA2002Factory.py b/geomagio/iaga2002/IAGA2002Factory.py index b7f5f601e3287447b14b37126e4531e67c9ec596..eb48e32a5b1d6a48cf4571539252ad374ce7c513 100644 --- a/geomagio/iaga2002/IAGA2002Factory.py +++ b/geomagio/iaga2002/IAGA2002Factory.py @@ -58,7 +58,7 @@ class IAGA2002Factory(TimeseriesFactory): endtime = obspy.core.UTCDateTime(parser.times[-1]) data = parser.data stream = obspy.core.Stream() - length = len(data[data.keys()[0]]) + length = len(data[list(data)[0]]) if starttime != endtime: rate = (length - 1) / (endtime - starttime) else: diff --git a/geomagio/pcdcp/PCDCPFactory.py b/geomagio/pcdcp/PCDCPFactory.py index ad70d01ed5601abb290c7fb1039382ea09f37676..fb3d9ea8c499680e6697ec5a94ea37e2da7945c9 100644 --- a/geomagio/pcdcp/PCDCPFactory.py +++ b/geomagio/pcdcp/PCDCPFactory.py @@ -69,7 +69,7 @@ class PCDCPFactory(TimeseriesFactory): minute=endMinute) data = parser.data - length = len(data[data.keys()[0]]) + length = len(data[list(data)[0]]) rate = (length - 1) / (endtime - starttime) stream = obspy.core.Stream() diff --git a/test/TimeseriesUtility_test.py b/test/TimeseriesUtility_test.py index a64c92ef2704c651eab305537f3da707abef8f33..ea1adc9e4a2c2f753b1d9638a4832e7dddef897f 100644 --- a/test/TimeseriesUtility_test.py +++ b/test/TimeseriesUtility_test.py @@ -1,6 +1,8 @@ #! /usr/bin/env python +from __future__ import absolute_import + from nose.tools import assert_equals -from StreamConverter_test import __create_trace +from .StreamConverter_test import __create_trace import numpy from geomagio import TimeseriesUtility from obspy.core import Stream, UTCDateTime