Fix imports

bin/geomag.py

@@ -14,10 +14,10 @@ except:
 import geomagio.iaga2002 as iaga2002
 import geomagio.edge as edge
 import geomagio.pcdcp as pcdcp
-from geomagio.Algorithm import Algorithm
+from geomagio import Algorithm, \
+        Controller
 from geomagio.XYZAlgorithm import XYZAlgorithm
-from geomagio.Controller import Controller
-from obspy.core.utcdatetime import UTCDateTime
+from obspy.core import UTCDateTime
 
 
 def main():
@@ -229,7 +229,7 @@ def parse_args():
             help='Requires Host IP # and Port #')
     output_group.add_argument('--output-edge', nargs=3,
             metavar=('HOST', 'PORT', 'TAG'),
-            help='Requires Host IP #, Port # and ID TAG ')
+            help='Requires Host IP #, Port # and ID TAG')
 
     # Algorithms group
     algorithm_group = parser.add_mutually_exclusive_group()

geomagio/__init__.py

 """
 Geomag Algorithm Module
 """
-from Algorithm import Algorithm
 import ChannelConverter
 import StreamConverter
+
+from Algorithm import Algorithm
+from AlgorithmException import AlgorithmException
+from Controller import Controller
 from TimeseriesFactory import TimeseriesFactory
 from TimeseriesFactoryException import TimeseriesFactoryException
+from XYZAlgorithm import XYZAlgorithm
 
 __all__ = [
     'Algorithm',
+    'AlgorithmException',
     'ChannelConverter',
+    'Controller',
     'StreamConverter',
     'TimeseriesFactory',
-    'TimeseriesFactoryException'
+    'TimeseriesFactoryException',
+    'XYZAlgorithm'
 ]

geomagio/edge/EdgeFactory.py

@@ -9,16 +9,17 @@ to take advantage of it's newer realtime abilities.
 Edge is the USGS earthquake hazard centers replacement for earthworm.
 """
 
-import obspy.core
-from obspy.core.utcdatetime import UTCDateTime
 import numpy
-from RawInputClient import RawInputClient
-from geomagio import TimeseriesFactory, TimeseriesFactoryException
-from geomagio import ChannelConverter
+import numpy.ma
+import obspy.core
+from datetime import datetime
 from obspy import earthworm
+from obspy.core import UTCDateTime
+from geomagio import ChannelConverter, \
+        TimeseriesFactory, \
+        TimeseriesFactoryException
 from ObservatoryMetadata import ObservatoryMetadata
-from datetime import datetime
-import numpy.ma
+from RawInputClient import RawInputClient
 
 
 class EdgeFactory(TimeseriesFactory):

geomagio/edge/RawInputClient.py

-# -*- coding: utf-8 -*-
-"""
-Input Client for Edge/CWB/QueryMom.
-
-:copyright:
-    USGS
-:license:
-    GNU General Public License (GPLv2)
-    (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
-"""
 
-from obspy.core.utcdatetime import UTCDateTime
-from datetime import datetime
-from geomagio import TimeseriesFactoryException
-import struct
 import socket  # noqa
+import struct
 import sys
+from datetime import datetime
+from geomagio import TimeseriesFactoryException
+from obspy.core import UTCDateTime
 from time import sleep
 
+
 """
 MAXINPUTSIZE: Edge uses a short for the data count, so the max input size
     for a single data packet to edge is 32767

geomagio/pcdcp/PCDCPFactory.py

 """Factory that loads PCDCP Files."""
 
-import urllib2
 import obspy.core
 import os
-from geomagio import TimeseriesFactory, TimeseriesFactoryException
+import urllib2
+from geomagio import ChannelConverter, \
+        TimeseriesFactory, \
+        TimeseriesFactoryException
 from PCDCPParser import PCDCPParser
 from PCDCPWriter import PCDCPWriter
-from geomagio import ChannelConverter
 
 
 # pattern for pcdcp file names

geomagio/pcdcp/PCDCPWriter.py

 
-from cStringIO import StringIO
-from geomagio import ChannelConverter
 import numpy
-from obspy.core import Stream
 import PCDCPParser
+from cStringIO import StringIO
 from datetime import datetime
+from geomagio import ChannelConverter
+from obspy.core import Stream
 
 
 class PCDCPWriter(object):