diff --git a/geomagio/edge/EdgeFactory.py b/geomagio/edge/EdgeFactory.py index 06305985d14d0a804695501bfcd56c252ce66a84..32ee18c9c9e0e489ce3eadf92d762ae8ed119148 100644 --- a/geomagio/edge/EdgeFactory.py +++ b/geomagio/edge/EdgeFactory.py @@ -15,9 +15,9 @@ import obspy.core from datetime import datetime from obspy import earthworm from obspy.core import UTCDateTime -from geomagio import ChannelConverter, \ - TimeseriesFactory, \ - TimeseriesFactoryException +from .. import ChannelConverter +from ..TimeseriesFactory import TimeseriesFactory +from ..TimeseriesFactoryException import TimeseriesFactoryException from ObservatoryMetadata import ObservatoryMetadata from RawInputClient import RawInputClient diff --git a/geomagio/edge/RawInputClient.py b/geomagio/edge/RawInputClient.py index e41206315c7c0c5e0e13fd677c7a41cc24f4123a..03c1fa10d3fea5a46c62211fb77b1f748ddfb3ea 100644 --- a/geomagio/edge/RawInputClient.py +++ b/geomagio/edge/RawInputClient.py @@ -3,7 +3,7 @@ import socket # noqa import struct import sys from datetime import datetime -from geomagio import TimeseriesFactoryException +from ..TimeseriesFactoryException import TimeseriesFactoryException from obspy.core import UTCDateTime from time import sleep diff --git a/geomagio/iaga2002/IAGA2002Factory.py b/geomagio/iaga2002/IAGA2002Factory.py index c5be4f1bd00e3e36552209b24d038561f441ef6c..1173fba57f7af7e63fd13a5f7b6ebabf4b2fe9b8 100644 --- a/geomagio/iaga2002/IAGA2002Factory.py +++ b/geomagio/iaga2002/IAGA2002Factory.py @@ -1,12 +1,13 @@ """Factory that loads IAGA2002 Files.""" -import urllib2 import obspy.core import os -from geomagio import TimeseriesFactory, TimeseriesFactoryException +import urllib2 +from .. import ChannelConverter +from ..TimeseriesFactory import TimeseriesFactory +from ..TimeseriesFactoryException import TimeseriesFactoryException from IAGA2002Parser import IAGA2002Parser from IAGA2002Writer import IAGA2002Writer -from geomagio import ChannelConverter # pattern for iaga 2002 file names diff --git a/geomagio/iaga2002/IAGA2002Writer.py b/geomagio/iaga2002/IAGA2002Writer.py index 3a2b25882570e016981f1a827e0941bd22cd84a0..90e43425e05ca297d1f71ebd6fdd0659e3b1c26a 100644 --- a/geomagio/iaga2002/IAGA2002Writer.py +++ b/geomagio/iaga2002/IAGA2002Writer.py @@ -1,10 +1,11 @@ from cStringIO import StringIO -from geomagio import TimeseriesFactoryException, ChannelConverter +from datetime import datetime import numpy -import IAGA2002Parser import textwrap -from datetime import datetime +from .. import ChannelConverter +from ..TimeseriesFactoryException import TimeseriesFactoryException +import IAGA2002Parser class IAGA2002Writer(object): diff --git a/geomagio/pcdcp/PCDCPFactory.py b/geomagio/pcdcp/PCDCPFactory.py index e9fe5e8fa6b0a60ac715513e15b0209ded5cd6cc..cdbd5968801b6f0c3c251e137c06974ab2a9e410 100644 --- a/geomagio/pcdcp/PCDCPFactory.py +++ b/geomagio/pcdcp/PCDCPFactory.py @@ -3,9 +3,9 @@ import obspy.core import os import urllib2 -from geomagio import ChannelConverter, \ - TimeseriesFactory, \ - TimeseriesFactoryException +from .. import ChannelConverter +from ..TimeseriesFactory import TimeseriesFactory +from ..TimeseriesFactoryException import TimeseriesFactoryException from PCDCPParser import PCDCPParser from PCDCPWriter import PCDCPWriter