Annihilate pyclaw.io.

I think the only important change here is the one in
pyclaw/src/pyclaw/fileio/setup.py.

src/forestclaw/fileio/__init__.py

@@ -5,7 +5,7 @@
 
 from __future__ import absolute_import
 import logging
-logger = logging.getLogger('pyclaw.io')
+logger = logging.getLogger('pyclaw.fileio')
 
 from . import ascii
 __all__ = ["ascii.read", "ascii.write"]

src/forestclaw/fileio/ascii.py

@@ -15,7 +15,7 @@
 from clawpack.pyclaw.fileio.ascii import read
 from clawpack.pyclaw.util import read_data_line
 
-logger = logging.getLogger('pyclaw.io')
+logger = logging.getLogger('pyclaw.fileio')
 
 
 def write_patch_header(f, patch):

src/petclaw/fileio/hdf5.py

@@ -19,7 +19,7 @@
 from clawpack import petclaw
 import six
 
-logger = logging.getLogger('pyclaw.io')
+logger = logging.getLogger('pyclaw.fileio')
 
 try:
     import h5py
@@ -222,4 +222,4 @@ def from_hdf5_dataset(dset, ndim, ranges, shape):
     elif ndim == 2:
         return dset[:,ranges[0][0]:ranges[0][1],ranges[1][0]:ranges[1][1]].reshape(shape,order='F')
     elif ndim == 3:
-        return dset[:,ranges[0][0]:ranges[0][1],ranges[1][0]:ranges[1][1],ranges[2][0]:ranges[2][1]].reshape(shape,order='F')
+        return dset[:,ranges[0][0]:ranges[0][1],ranges[1][0]:ranges[1][1],ranges[2][0]:ranges[2][1]].reshape(shape,order='F')

src/pyclaw/controller.py

@@ -456,12 +456,12 @@ def file_format(self):
     @file_format.setter
     def file_format(self, value):
         if value.lower() == 'petsc':
-            self._io_module = __import__("clawpack.petclaw.io.petsc", 
-                                         fromlist=["clawpack.petclaw.io"])
+            self._io_module = __import__("clawpack.petclaw.fileio.petsc", 
+                                         fromlist=["clawpack.petclaw.fileio"])
             self._file_format = value
         else:
-            self._io_module = __import__("clawpack.pyclaw.io.%s" % value, 
-                                         fromlist=['clawpack.pyclaw.io'])
+            self._io_module = __import__("clawpack.pyclaw.fileio.%s" % value, 
+                                         fromlist=['clawpack.pyclaw.fileio'])
             self._file_format = value
 
 

src/pyclaw/fileio/__init__.py

@@ -5,7 +5,7 @@
 
 from __future__ import absolute_import
 import logging
-logger = logging.getLogger('pyclaw.io')
+logger = logging.getLogger('pyclaw.fileio')
 
 from . import ascii
 __all__ = ['ascii.read', 'ascii.write']

src/pyclaw/fileio/ascii.py

@@ -14,7 +14,7 @@
 from clawpack.pyclaw.util import read_data_line
 from six.moves import range
 
-logger = logging.getLogger('pyclaw.io')
+logger = logging.getLogger('pyclaw.fileio')
 
 def write(solution, frame, path, file_prefix='fort', write_aux=False,
                     options={}, write_p=False):

src/pyclaw/fileio/binary.py

@@ -16,7 +16,7 @@
 import clawpack.pyclaw as pyclaw
 from six.moves import range
 
-logger = logging.getLogger('pyclaw.io')
+logger = logging.getLogger('pyclaw.fileio')
 
 
 def read(solution,frame,path='./',file_prefix='fort',read_aux=False,

src/pyclaw/fileio/hdf5.py

@@ -22,7 +22,7 @@
 from clawpack import pyclaw
 import six
 
-logger = logging.getLogger('pyclaw.io')
+logger = logging.getLogger('pyclaw.fileio')
 
 # Import appropriate hdf5 package
 use_h5py = False

src/pyclaw/fileio/netcdf.py

@@ -37,7 +37,7 @@
 import six
 from six.moves import range
 
-logger = logging.getLogger('pyclaw.io')
+logger = logging.getLogger('pyclaw.fileio')
 
 # Import appropriate netcdf package
 use_netcdf4 = False

src/pyclaw/fileio/setup.py

@@ -3,7 +3,7 @@
 from __future__ import absolute_import
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
-    config = Configuration('io', parent_package, top_path)
+    config = Configuration('fileio', parent_package, top_path)
     return config
 
 if __name__ == '__main__':

src/pyclaw/log.config

@@ -42,7 +42,7 @@ parent=(pyclaw)
 [logger_io]
 level=NOTSET
 propagate=0
-qualname=pyclaw.io
+qualname=pyclaw.fileio
 handlers=file
 channel=io
 parent=(pyclaw)

src/pyclaw/solution.py

@@ -298,7 +298,7 @@ def write(self,frame,path='./',file_format='ascii',file_prefix=None,
                                 write_aux=write_aux,options=options,
                            write_p=write_p)
             msg = "Wrote out solution in format %s for time t=%s" % (form,self.t)
-            logging.getLogger('pyclaw.io').info(msg)
+            logging.getLogger('pyclaw.fileio').info(msg)
 
 
     def read(self, frame, path='./_output', file_format='ascii',