From 410049c86d2f4c08d2432c89b736786e0f7f7adb Mon Sep 17 00:00:00 2001 From: Jeremy Fee <jmfee@usgs.gov> Date: Thu, 9 Jul 2015 07:38:53 -0600 Subject: [PATCH] Update io packages to use relative imports --- geomagio/edge/EdgeFactory.py | 6 +++--- geomagio/edge/RawInputClient.py | 2 +- geomagio/iaga2002/IAGA2002Factory.py | 7 ++++--- geomagio/iaga2002/IAGA2002Writer.py | 7 ++++--- geomagio/pcdcp/PCDCPFactory.py | 6 +++--- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/geomagio/edge/EdgeFactory.py b/geomagio/edge/EdgeFactory.py index 06305985d..32ee18c9c 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 e41206315..03c1fa10d 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 c5be4f1bd..1173fba57 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 3a2b25882..90e43425e 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 e9fe5e8fa..cdbd59688 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 -- GitLab