Restructure

setup.py

@@ -383,7 +383,6 @@ packname = 'pyrocko'
 version = time.strftime('2017.7')
 
 subpacknames = [
-    'pyrocko.snufflings',
     'pyrocko.gf',
     'pyrocko.fomosto',
     'pyrocko.fomosto.report',
@@ -391,7 +390,9 @@ subpacknames = [
     'pyrocko.topo',
     'pyrocko.apps',
     'pyrocko.io',
-    'pyrocko.datasets'
+    'pyrocko.gui',
+    'pyrocko.gui.snufflings',
+    'pyrocko.datasets',
 ]
 
 setup(

src/apps/automap.py

@@ -1,8 +1,8 @@
+#!/usr/bin/env python
 # http://pyrocko.org - GPLv3
 #
 # The Pyrocko Developers, 21st Century
 # ---|P------/S----------~Lg----------
-#!/usr/bin/env python
 
 import sys
 import logging

src/apps/cake.py

@@ -1,8 +1,8 @@
+#!/usr/bin/env python
 # http://pyrocko.org - GPLv3
 #
 # The Pyrocko Developers, 21st Century
 # ---|P------/S----------~Lg----------
-#!/usr/bin/env python
 from builtins import range
 from builtins import str
 import sys

src/apps/fomosto.py

@@ -1,8 +1,8 @@
+#!/usr/bin/env python
 # http://pyrocko.org - GPLv3
 #
 # The Pyrocko Developers, 21st Century
 # ---|P------/S----------~Lg----------
-#!/usr/bin/env python
 from __future__ import print_function
 from builtins import range
 

src/apps/hamster.py

@@ -1,8 +1,8 @@
+#!/usr/bin/env python
 # http://pyrocko.org - GPLv3
 #
 # The Pyrocko Developers, 21st Century
 # ---|P------/S----------~Lg----------
-#!/usr/bin/env python
 from __future__ import absolute_import, division
 
 import os

src/apps/jackseis.py

@@ -1,8 +1,8 @@
+#!/usr/bin/env python
 # http://pyrocko.org - GPLv3
 #
 # The Pyrocko Developers, 21st Century
 # ---|P------/S----------~Lg----------
-#!/usr/bin/env python
 from __future__ import absolute_import, division
 
 import sys

src/apps/momo.py

@@ -1,11 +1,11 @@
+#!/usr/bin/env python
 # http://pyrocko.org - GPLv3
 #
 # The Pyrocko Developers, 21st Century
 # ---|P------/S----------~Lg----------
-#!/usr/bin/env python
-
-'''Moment tensor calculator.'''
 
+# Moment tensor calculator
+#
 # Copyright (c) 2010, Sebastian Heimann <sebastian.heimann@zmaw.de>
 #
 # This file is part of pyrocko. For licensing information please see the file

src/apps/snuffler.py

@@ -1,9 +1,9 @@
+#!/usr/bin/env python
 # http://pyrocko.org - GPLv3
 #
 # The Pyrocko Developers, 21st Century
 # ---|P------/S----------~Lg----------
-#!/usr/bin/env python
-from pyrocko import snuffler
+from pyrocko.gui import snuffler
 
 
 def main():

src/automap.py

@@ -2,7 +2,6 @@
 #
 # The Pyrocko Developers, 21st Century
 # ---|P------/S----------~Lg----------
-#!/usr/bin/env python
 from __future__ import absolute_import, print_function
 
 from builtins import str as newstr
@@ -991,7 +990,7 @@ class Map(Object):
             (lon, lat, text, color, font, font_size, style))
 
     def cities_in_region(self):
-        from pyrocko import geonames
+        from pyrocko.datasets import geonames
         cities = geonames.get_cities_region(region=self.wesn, minpop=0)
         cities.extend(self.custom_cities)
         cities.sort(key=lambda x: x.population)

src/datasets/crustdb.py

@@ -2,7 +2,6 @@
 #
 # The Pyrocko Developers, 21st Century
 # ---|P------/S----------~Lg----------
-#!/bin/python
 from __future__ import absolute_import
 from builtins import range
 from builtins import map
@@ -13,12 +12,12 @@ import copy
 import logging
 from os import path
 
-from .crustdb_abbr import ageKey, provinceKey, referenceKey, pubYear  # noqa
+from pyrocko.guts import Object, String, Float, Int
+from pyrocko.guts_array import Array
+from pyrocko.cake import LayeredModel, Material
+from pyrocko.cake_plot import my_model_plot, xscaled, yscaled
 
-from ..guts import Object, String, Float, Int
-from ..guts_array import Array
-from ..cake import LayeredModel, Material
-from ..cake_plot import my_model_plot, xscaled, yscaled
+from .crustdb_abbr import ageKey, provinceKey, referenceKey, pubYear  # noqa
 
 logger = logging.getLogger('pyrocko.crustdb')
 THICKNESS_HALFSPACE = 2

src/datasets/crustdb_abbr.py

@@ -2,10 +2,9 @@
 #
 # The Pyrocko Developers, 21st Century
 # ---|P------/S----------~Lg----------
-#!/bin/python
-'''
-File holds the abbreviations for age, region and helper function
-'''
+
+# File holds the abbreviations for age, region and helper function
+
 EONS = {
     'MCz': 'Mesozoic to Cenozoic',
     'Pz': 'Paleozoic',

src/datasets/gshhg.py

@@ -12,8 +12,7 @@ import numpy as num
 
 from os import path
 
-from .. import config
-from .. import orthodrome
+from pyrocko import config, orthodrome
 
 logger = logging.getLogger('pyrocko.gshhg')
 config = config.config()

src/datasets/tectonics.py

@@ -13,10 +13,10 @@ from collections import defaultdict
 
 import numpy as num
 
-from .. import util, config
-from .. import orthodrome as od
-from ..guts_array import Array
-from ..guts import Object, String
+from pyrocko import util, config
+from pyrocko import orthodrome as od
+from pyrocko.guts_array import Array
+from pyrocko.guts import Object, String
 
 
 PI = math.pi

src/fdsn/enhanced_sacpz.py

@@ -8,8 +8,9 @@ import time
 from collections import defaultdict
 
 from . import station as fs
-from .. import trace, util, pz, io_common
-from ..guts import Object, Tuple, String, Timestamp, Float
+from pyrocko import trace, util, pz
+from pyrocko.io import io_common
+from pyrocko.guts import Object, Tuple, String, Timestamp, Float
 
 
 class EnhancedSacPzError(io_common.FileLoadError):

src/fdsn/resp.py

@@ -10,7 +10,8 @@ import re
 import logging
 
 from . import station as fs
-from .. import util, guts, io_common
+from pyrocko import util, guts
+from pyrocko.io import io_common
 
 logger = logging.getLogger('pyrocko.fdsn.resp')
 

src/fdsn/station.py

@@ -15,12 +15,12 @@ import copy
 
 import numpy as num
 
-from ..guts import (StringChoice, StringPattern, UnicodePattern, String,
-                    Unicode, Int, Float, List, Object, Timestamp,
-                    ValidationError, TBase)
-from ..guts import load_xml  # noqa
+from pyrocko.guts import (StringChoice, StringPattern, UnicodePattern, String,
+                          Unicode, Int, Float, List, Object, Timestamp,
+                          ValidationError, TBase)
+from pyrocko.guts import load_xml  # noqa
 
-from .. import trace, model, util
+from pyrocko import trace, model, util
 
 guts_prefix = 'pf'
 

src/fdsn/ws.py

@@ -16,7 +16,7 @@ except ImportError:
                                 urlopen)
     from urllib.error import HTTPError
 
-from .. import util
+from pyrocko import util
 
 logger = logging.getLogger('pyrocko.fdsn.ws')
 

src/file.py

@@ -2,6 +2,7 @@
 #
 # The Pyrocko Developers, 21st Century
 # ---|P------/S----------~Lg----------
+
 # The container format:
 # * A file consists of records.
 # * A record consists of a record header a record payload, and possibly

src/fomosto/ahfullgreen.py

@@ -11,9 +11,9 @@ import os
 import math
 import signal
 
-from .. import trace, cake, gf
-from ..ahfullgreen import add_seismogram, Impulse
-from ..moment_tensor import MomentTensor, symmat6
+from pyrocko import trace, cake, gf
+from pyrocko.ahfullgreen import add_seismogram, Impulse
+from pyrocko.moment_tensor import MomentTensor, symmat6
 
 km = 1000.
 

src/fomosto/dummy.py

@@ -11,7 +11,7 @@ import signal
 
 import numpy as num
 
-from .. import trace, gf
+from pyrocko import trace, gf
 
 guts_prefix = 'pf'
 

src/fomosto/poel.py

@@ -15,9 +15,9 @@ from os.path import join as pjoin
 
 import numpy as num
 
-from ..guts import Object, Float, Int, List, String
-from ..guts_array import Array
-from .. import trace, util, gf
+from pyrocko.guts import Object, Float, Int, List, String
+from pyrocko.guts_array import Array
+from pyrocko import trace, util, gf
 
 guts_prefix = 'pf'
 

src/fomosto/qseis.py

@@ -17,10 +17,10 @@ from tempfile import mkdtemp
 from subprocess import Popen, PIPE
 from os.path import join as pjoin
 
-from .. import gf
-from .. import trace, util, cake
-from ..moment_tensor import MomentTensor, symmat6
-from ..guts import Float, Int, Tuple, List, Complex, Bool, Object, String
+from pyrocko import gf
+from pyrocko import trace, util, cake
+from pyrocko.moment_tensor import MomentTensor, symmat6
+from pyrocko.guts import Float, Int, Tuple, List, Complex, Bool, Object, String
 
 km = 1e3
 

src/fomosto/qseis2d.py

@@ -18,9 +18,9 @@ from subprocess import Popen, PIPE
 import os.path as op
 from scipy.integrate import cumtrapz
 
-from ..moment_tensor import MomentTensor, symmat6
-from ..guts import Float, Int, Tuple, List, Bool, Object, String
-from .. import trace, util, cake, gf
+from pyrocko.moment_tensor import MomentTensor, symmat6
+from pyrocko.guts import Float, Int, Tuple, List, Bool, Object, String
+from pyrocko import trace, util, cake, gf
 
 km = 1e3
 

src/fomosto/qssp.py

@@ -19,9 +19,9 @@ from tempfile import mkdtemp
 from subprocess import Popen, PIPE
 from os.path import join as pjoin
 
-from .. import trace, util, cake, gf
-from ..guts import Object, Float, String, Bool, Tuple, Int, List
-from ..moment_tensor import MomentTensor, symmat6
+from pyrocko import trace, util, cake, gf
+from pyrocko.guts import Object, Float, String, Bool, Tuple, Int, List
+from pyrocko.moment_tensor import MomentTensor, symmat6
 
 guts_prefix = 'pf'
 

src/gf/builder.py

@@ -11,8 +11,8 @@ import errno
 from os.path import join as pjoin
 import numpy as num
 
+from pyrocko.parimap import parimap
 from . import store
-from ..parimap import parimap
 
 
 def int_arr(*args):

src/gf/meta.py

@@ -14,14 +14,14 @@ import logging
 import numpy as num
 from scipy.interpolate import interp1d
 
-from ..guts import (Object, SObject, String, StringChoice,
-                    StringPattern, Unicode, Float, Bool, Int, TBase, List,
-                    ValidationError, Timestamp, Tuple, Dict)
-from ..guts import dump, load  # noqa
-from ..guts_array import literal, Array
-
-from .. import cake, orthodrome, spit, moment_tensor, trace
-from ..config import config
+from pyrocko.guts import (Object, SObject, String, StringChoice,
+                          StringPattern, Unicode, Float, Bool, Int, TBase,
+                          List, ValidationError, Timestamp, Tuple, Dict)
+from pyrocko.guts import dump, load  # noqa
+from pyrocko.guts_array import literal, Array
+
+from pyrocko import cake, orthodrome, spit, moment_tensor, trace
+from pyrocko.config import config
 
 
 guts_prefix = 'pf'

src/gf/seismosizer.py

@@ -17,13 +17,13 @@ import resource
 
 import numpy as num
 
-from ..guts import (Object, Float, String, StringChoice, List,
-                    Timestamp, Int, SObject, ArgumentError, Dict)
-from ..guts_array import Array
+from pyrocko.guts import (Object, Float, String, StringChoice, List,
+                          Timestamp, Int, SObject, ArgumentError, Dict)
+from pyrocko.guts_array import Array
 
-from .. import moment_tensor as mt
-from .. import trace, model, util, config
-from ..orthodrome import ne_to_latlon
+from pyrocko import moment_tensor as mt
+from pyrocko import trace, model, util, config
+from pyrocko.orthodrome import ne_to_latlon
 
 from . import meta, store, ws
 from .targets import Target, StaticTarget, SatelliteTarget

src/gf/server.py

@@ -37,7 +37,7 @@ import urllib.error
 import re
 from collections import deque
 
-from .. import gf
+from pyrocko import gf
 
 __version__ = '1.0'
 

src/gf/store.py

@@ -21,7 +21,7 @@ from scipy import signal
 
 from . import meta
 from . import store_ext
-from .. import util, spit
+from pyrocko import util, spit
 
 logger = logging.getLogger('pyrocko.gf.store')
 

src/gf/targets.py

@@ -9,8 +9,8 @@ import numpy as num
 import math
 
 from . import meta
-from ..guts import Timestamp, Tuple, String, Float, Object, StringChoice
-from ..guts_array import Array
+from pyrocko.guts import Timestamp, Tuple, String, Float, Object, StringChoice
+from pyrocko.guts_array import Array
 
 d2r = num.pi / 180.
 

src/gui/__init__.py

@@ -0,0 +1,5 @@
+# http://pyrocko.org - GPLv3
+#
+# The Pyrocko Developers, 21st Century
+# ---|P------/S----------~Lg----------
+from .snuffler import Snuffler  # noqa

src/gui/gui_util.py

@@ -10,10 +10,10 @@ import time
 import numpy as num
 import logging
 
-from . import plot
 from .marker import Marker, PhaseMarker, EventMarker  # noqa
 from .marker import MarkerParseError, MarkerOneNSLCRequired  # noqa
 from .marker import load_markers, save_markers  # noqa
+from pyrocko import plot
 
 from PyQt4 import QtCore as qc
 from PyQt4 import QtGui as qg

src/gui/marker.py

@@ -13,8 +13,8 @@ import logging
 
 import numpy as num
 
-from . import util, plot, model, trace
-from .util import TableWriter, TableReader, gmtime_x, mystrftime
+from pyrocko import util, plot, model, trace
+from pyrocko.util import TableWriter, TableReader, gmtime_x, mystrftime
 
 
 logger = logging.getLogger('pyrocko.marker')
@@ -355,7 +355,7 @@ class Marker(object):
 
         from PyQt4 import QtCore as qc
         from PyQt4 import QtGui as qg
-        from pyrocko import gui_util
+        from . import gui_util
 
         if self.selected or self.alerted or not self.nslc_ids:
 
@@ -411,7 +411,7 @@ class Marker(object):
 
         from PyQt4 import QtCore as qc
         from PyQt4 import QtGui as qg
-        from pyrocko import gui_util
+        from . import gui_util
 
         if self.nslc_ids and not self.match_nslc(tr.nslc_id):
             return
@@ -585,7 +585,7 @@ class EventMarker(Marker):
 
     def draw_label(self, p, time_projection, y_projection):
         from PyQt4 import QtGui as qg
-        from pyrocko import gui_util
+        from . import gui_util
 
         u = time_projection(self.tmin)
         v0, v1 = y_projection.get_out_range()

src/gui/marker_editor.py

@@ -11,10 +11,10 @@ from PyQt4 import QtCore as qc
 from PyQt4 import QtGui as qg
 
 from .gui_util import EventMarker, PhaseMarker, make_QPolygonF
-from .beachball import mt2beachball, BeachballError
-from .moment_tensor import kagan_angle
-from .plot import tango_colors
-from . import orthodrome
+from pyrocko.beachball import mt2beachball, BeachballError
+from pyrocko.moment_tensor import kagan_angle
+from pyrocko.plot import tango_colors
+from pyrocko import orthodrome
 
 import numpy as num
 import logging

src/gui/moment_tensor_viewer.py

@@ -10,8 +10,8 @@ from PyQt4 import QtGui as qg
 from .gui_util import make_QPolygonF, LinValControl
 from .pile_viewer import Projection
 
-from . import beachball, moment_tensor as mtm
-from . import plot
+from pyrocko import beachball, moment_tensor as mtm
+from pyrocko import plot
 
 
 class BeachballView(qg.QWidget):

src/gui/pile_viewer.py

@@ -24,11 +24,11 @@ import pyrocko.shadow_pile
 import pyrocko.trace
 import pyrocko.util
 import pyrocko.plot
-import pyrocko.snuffling
-import pyrocko.snufflings
-import pyrocko.marker_editor
+import pyrocko.gui.snuffling
+import pyrocko.gui.snufflings
+import pyrocko.gui.marker_editor
 
-from .util import hpfloat, gmtime_x, mystrftime
+from pyrocko.util import hpfloat, gmtime_x, mystrftime
 
 from .marker import associate_phases_to_events
 
@@ -1339,7 +1339,7 @@ def MakePileViewerMainClass(base):
 
                     if (directory, name) not in self.snuffling_modules:
                         self.snuffling_modules[directory, name] = \
-                            pyrocko.snuffling.SnufflingModule(
+                            pyrocko.gui.snuffling.SnufflingModule(
                                 directory, name, self)
 
                     yield self.snuffling_modules[directory, name]
@@ -1349,12 +1349,13 @@ def MakePileViewerMainClass(base):
             for mod in self.iter_snuffling_modules():
                 try:
                     mod.load_if_needed()
-                except pyrocko.snuffling.BrokenSnufflingModule as e:
+                except pyrocko.gui.snuffling.BrokenSnufflingModule as e:
                     logger.warning('Snuffling module "%s" is broken' % e)
 
             # load the default snufflings on first run
             if self.default_snufflings is None:
-                self.default_snufflings = pyrocko.snufflings.__snufflings__()
+                self.default_snufflings = pyrocko.gui\
+                    .snufflings.__snufflings__()
                 for snuffling in self.default_snufflings:
                     self.add_snuffling(snuffling)
 
@@ -3998,7 +3999,7 @@ class PileViewer(qg.QFrame):
         return frame
 
     def marker_editor(self):
-        editor = pyrocko.marker_editor.MarkerEditor(self)
+        editor = pyrocko.gui.marker_editor.MarkerEditor(self)
         editor.set_viewer(self.get_view())
         self.connect(
             editor.get_marker_model(),

src/gui/snuffler.py

@@ -24,17 +24,18 @@ import pickle
 from os.path import join as pjoin
 from optparse import OptionParser
 
-from . import slink
-from . import serial_hamster
-from . import edl
+from pyrocko import slink
+from pyrocko import serial_hamster
+from pyrocko import edl
+
+from pyrocko import pile            # noqa
+from pyrocko import util            # noqa
+from pyrocko import model           # noqa
+from pyrocko import config          # noqa
+from pyrocko import io              # noqa
+from pyrocko.fdsn import station as fdsn_station
 
-from . import pile            # noqa
-from . import util            # noqa
 from . import pile_viewer     # noqa
-from . import model           # noqa
-from . import config          # noqa
-from . import io              # noqa
-from .fdsn import station as fdsn_station
 
 from PyQt4 import QtCore as qc
 from PyQt4 import QtGui as qg

src/gui/snuffling.py

@@ -19,11 +19,11 @@ import tempfile
 from PyQt4 import QtCore as qc
 from PyQt4 import QtGui as qg
 
-from . import pile, config
+from pyrocko import pile, config
 
-from .gui_util import ValControl, LinValControl, FigureFrame, \
-    WebKitFrame, VTKFrame, PixmapFrame, Marker, EventMarker, PhaseMarker, \
-    load_markers, save_markers
+from .gui_util import (ValControl, LinValControl, FigureFrame, WebKitFrame,
+                       VTKFrame, PixmapFrame, Marker, EventMarker, PhaseMarker,
+                       load_markers, save_markers)
 
 if sys.version_info >= (3, 0):
     from importlib import reload

src/gui/snufflings/README.md

@@ -0,0 +1 @@
+# Pyrocko Snufflings

src/gui/snufflings/__init__.py

@@ -2,8 +2,9 @@
 #
 # The Pyrocko Developers, 21st Century
 # ---|P------/S----------~Lg----------
-from pyrocko.snufflings import minmax, rms, stalta, geofon, ampspec, \
-    catalogs, download
+from __future__ import absolute_import
+from . import (minmax, rms, stalta, geofon, ampspec,
+               catalogs, download)
 modules = [minmax, rms, download, stalta, geofon, ampspec, catalogs]
 
 

src/gui/snufflings/ampspec.py

@@ -2,7 +2,8 @@
 #
 # The Pyrocko Developers, 21st Century
 # ---|P------/S----------~Lg----------
-from pyrocko.snuffling import Snuffling, Param, Switch
+from __future__ import absolute_import
+from ..snuffling import Snuffling, Param, Switch
 import numpy as num
 from matplotlib import cm
 

src/gui/snufflings/catalogs.py

@@ -2,8 +2,9 @@
 #
 # The Pyrocko Developers, 21st Century
 # ---|P------/S----------~Lg----------
-from pyrocko.snuffling import Snuffling, Param, Choice
-from pyrocko.gui_util import EventMarker
+from __future__ import absolute_import
+from ..snuffling import Snuffling, Param, Choice
+from ..gui_util import EventMarker
 
 from pyrocko import catalog
 

src/gui/snufflings/download.py

@@ -2,13 +2,15 @@
 #
 # The Pyrocko Developers, 21st Century
 # ---|P------/S----------~Lg----------
+from __future__ import absolute_import
 import os
 import logging
 
+from pyrocko.gui.gui_util import EventMarker
+
+from pyrocko.gui.snuffling import Param, Snuffling, Switch, Choice
 from pyrocko import util, io, model
 from pyrocko.fdsn import ws as fdsn_ws
-from pyrocko.gui_util import EventMarker
-from pyrocko.snuffling import Param, Snuffling, Switch, Choice
 pjoin = os.path.join
 
 logger = logging.getLogger('pyrocko.snufflings.iris_data')

src/gui/snufflings/geofon.py

@@ -2,8 +2,9 @@
 #
 # The Pyrocko Developers, 21st Century
 # ---|P------/S----------~Lg----------
-from pyrocko.snuffling import Snuffling
-from pyrocko.gui_util import EventMarker
+from __future__ import absolute_import
+from pyrocko.gui.snuffling import Snuffling
+from pyrocko.gui.gui_util import EventMarker
 
 from pyrocko import catalog
 

src/gui/snufflings/minmax.py

@@ -2,8 +2,8 @@
 #
 # The Pyrocko Developers, 21st Century
 # ---|P------/S----------~Lg----------
-from __future__ import print_function
-from pyrocko.snuffling import Snuffling
+from __future__ import print_function, absolute_import
+from pyrocko.gui.snuffling import Snuffling
 from pyrocko import trace
 
 

src/gui/snufflings/rms.py

@@ -2,7 +2,8 @@
 #
 # The Pyrocko Developers, 21st Century
 # ---|P------/S----------~Lg----------
-from pyrocko.snuffling import Snuffling, Param
+from __future__ import absolute_import
+from pyrocko.gui.snuffling import Snuffling, Param
 from pyrocko.trace import Trace
 import numpy as num
 

src/gui/snufflings/stalta.py

@@ -2,11 +2,11 @@
 #
 # The Pyrocko Developers, 21st Century
 # ---|P------/S----------~Lg----------
-from __future__ import print_function
+from __future__ import print_function, absolute_import
 from builtins import zip
 
-from pyrocko.snuffling import Param, Snuffling, Switch, Choice
-from pyrocko.gui_util import Marker
+from pyrocko.gui.snuffling import Param, Snuffling, Switch, Choice
+from pyrocko.gui.gui_util import Marker
 
 h = 3600.
 

src/io/datacube.py

@@ -8,8 +8,11 @@ from __future__ import absolute_import
 import os
 import math
 import numpy as num
-from .. import trace, util, plot, io_common
-from ..guts import Object, Int, String, Timestamp
+
+from pyrocko import trace, util, plot
+from pyrocko.guts import Object, Int, String, Timestamp
+
+from . import io_common
 
 N_GPS_TAGS_WANTED = 200  # must match definition in datacube_ext.c
 

src/io/gse1.py

@@ -8,8 +8,8 @@ from builtins import map
 import sys
 import numpy as num
 
-from .. import util, trace
-from ..io_common import FileLoadError
+from .io_common import FileLoadError
+from pyrocko import util, trace
 
 
 class GSE1LoadError(FileLoadError):

src/io/gse2_io_wrap.py

@@ -10,7 +10,7 @@ import os
 import random
 
 from .io_common import FileLoadError, FileSaveError
-from ..util import ensuredirs
+from pyrocko.util import ensuredirs
 
 
 def detect(first512):
@@ -30,7 +30,7 @@ def detect(first512):
 
 def iload(filename, load_data=True):
 
-    from pyrocko import ims
+    from . import ims
 
     try:
         with open(filename, 'rb') as f:
@@ -56,7 +56,8 @@ def randomid():
 def save(traces, filename_template, additional={}, max_open_files=10,
          overwrite=True):
 
-    from pyrocko import ims, info
+    from pyrocko import info
+    from . import ims
 
     fns = set()
     open_files = {}

src/io/ims.py

@@ -12,7 +12,7 @@ import logging
 
 from . import util
 from .io_common import FileLoadError, FileSaveError
-from .guts import (
+from pyrocko.guts import (
     Object, String, StringChoice, Timestamp, Int, Float, List, Bool, Complex,
     ValidationError)
 

src/io/io_common.py

@@ -2,6 +2,8 @@
 #
 # The Pyrocko Developers, 21st Century
 # ---|P------/S----------~Lg----------
+
+
 class FileError(Exception):
     def __init__(self, *args, **kwargs):
         Exception.__init__(self, *args, **kwargs)

src/io/kan.py

@@ -6,8 +6,9 @@ from __future__ import division, absolute_import
 
 import os
 import numpy as num
-from .. import util, trace
-from ..io_common import FileLoadError
+
+from pyrocko import util, trace
+from .io_common import FileLoadError
 
 
 class KanError(Exception):

src/io/mseed.py

@@ -10,9 +10,9 @@ import os
 import re
 import logging
 
+from pyrocko import trace
+from pyrocko.util import reuse, ensuredirs
 from .io_common import FileLoadError, FileSaveError
-from .. import trace
-from ..util import reuse, ensuredirs
 
 logger = logging.getLogger('pyrocko.mseed')
 

src/io/sac.py

@@ -14,9 +14,9 @@ import numpy as num
 from calendar import timegm
 from time import gmtime
 
+from pyrocko import trace
+from pyrocko.util import reuse
 from .io_common import FileLoadError
-from .. import trace
-from ..util import reuse
 
 logger = logging.getLogger('pyrocko.pile')
 

src/io/seed.py

@@ -8,7 +8,7 @@ import sys
 import calendar
 import logging
 
-from .. import util
+from pyrocko import util
 
 logger = logging.getLogger('pyrocko.seed')
 

src/io/segy.py

@@ -9,8 +9,8 @@ import numpy as num
 import struct
 import calendar
 
+from pyrocko import trace
 from .io_common import FileLoadError
-from .. import trace
 
 
 def ibm2ieee(ibm):

src/io/seisan_response.py

@@ -11,7 +11,7 @@ import logging
 import numpy as num
 from scipy import signal
 
-from . import util, trace
+from pyrocko import util, trace
 
 unpack_fixed = util.unpack_fixed
 

src/io/seisan_waveform.py

@@ -9,9 +9,9 @@ import sys
 import calendar
 import numpy as num
 
+from pyrocko import util, trace
+from pyrocko.util import unpack_fixed
 from .io_common import FileLoadError
-from ..util import unpack_fixed
-from .. import util, trace
 
 
 class SeisanFileError(Exception):

src/io/suds.py

@@ -10,8 +10,8 @@ import logging
 import numpy as num
 from collections import namedtuple, defaultdict
 
+from pyrocko import util, trace, model
 from .io_common import FileLoadError
-from .. import util, trace, model
 
 
 suds_tzero = util.str_to_time('1970-01-01 00:00:00')

src/io/yaff.py

@@ -7,11 +7,11 @@ from __future__ import division, absolute_import
 import os
 from struct import unpack
 
+from pyrocko.file import (File, numtype2type, NoDataAvailable,
+                          size_record_header, FileError)
+from pyrocko import trace
+from pyrocko.util import ensuredirs
 from .io_common import FileLoadError, FileSaveError
-from ..file import File, numtype2type, NoDataAvailable, \
-    size_record_header, FileError
-from .. import trace
-from ..util import ensuredirs
 
 record_formats = {
 

src/pchain.py

@@ -3,6 +3,7 @@
 # The Pyrocko Developers, 21st Century
 # ---|P------/S----------~Lg----------
 
+
 class Stage(object):
     def __init__(self, f):
         self._f = f

src/util.py

@@ -1594,7 +1594,7 @@ def gps_utc_offset(t):
 def make_iload_family(iload_fh, doc_fmt='FMT', doc_yielded_objects='FMT'):
     import itertools
     import glob
-    from pyrocko.io_common import FileLoadError
+    from pyrocko.io.io_common import FileLoadError
 
     def iload_filename(filename, **kwargs):
         try:

test/test_all.py

@@ -28,4 +28,4 @@ if __name__ == '__main__':
         f.close()
     else:
         suite = get_test_suite()
-        unittest.TextTestRunner(verbosity=1).run(suite)
+        unittest.TextTestRunner(verbosity=2).run(suite)

test/test_datacube.py

@@ -7,7 +7,8 @@ import unittest
 import numpy as num
 
 import common
-from pyrocko import util, io, datacube_ext, datacube
+from pyrocko import util, io, datacube_ext
+from pyrocko.io import datacube
 
 
 class DataCubeTestCase(unittest.TestCase):

test/test_gui.py

@@ -4,9 +4,10 @@ try:
     from PyQt4.QtTest import QTest
     from PyQt4.QtCore import Qt
     from PyQt4.QtGui import QStyleOptionSlider, QStyle
-    from pyrocko.snuffler import Snuffler, SnufflerWindow
-    from pyrocko import pile_viewer as pyrocko_pile_viewer
-    from pyrocko import gui_util, util, model
+    from pyrocko.gui.snuffler import Snuffler, SnufflerWindow
+    from pyrocko.gui import pile_viewer as pyrocko_pile_viewer
+    from pyrocko.gui import gui_util
+    from pyrocko import util, model
 except ImportError:
     pass
 import common

test/test_ims.py

@@ -1,11 +1,12 @@
-from __future__ import absolute_import
-from __future__ import print_function
+from __future__ import absolute_import, print_function
 import unittest
 
-from pyrocko import ims, util
 import common
 import numpy as num
 
+from pyrocko import util
+from pyrocko.io import ims
+
 
 def filled_int32(n, v):
     values = num.zeros(n, dtype=num.int32)

test/test_marker.py

@@ -1,7 +1,8 @@
 import unittest
 import tempfile
 
-from pyrocko import marker, util, model
+from pyrocko import util, model
+from pyrocko.gui import marker
 
 
 class MarkerTestCase(unittest.TestCase):

test/test_rdseed.py

@@ -1,8 +1,9 @@
-from pyrocko import rdseed
-from pyrocko import util
 import unittest
 import common
 
+from pyrocko import util
+from pyrocko.io import rdseed
+
 
 @unittest.skipIf(not rdseed.Programs.check(), 'rdseed executeable not found.')
 class RDSeedTestCase(unittest.TestCase):