Changeset 247


Ignore:
Timestamp:
08/03/2010 12:28:18 PM (12 years ago)
Author:
marcus
Message:

Even more refactoring (see also revision r245).

Location:
SHX/trunk/src/SeismicHandler
Files:
2 added
12 edited
2 moved

Legend:

Unmodified
Added
Removed
  • SHX/trunk/src/SeismicHandler/commands/echo.py

    r246 r247  
    1616#    along with SHX.  If not, see <http://www.gnu.org/licenses/>. 
    1717 
    18 from SeismicHandler.core.modules.command import BaseCommand 
     18from SeismicHandler.core.basic.command import BaseCommand 
    1919from SeismicHandler.core import Settings 
    2020 
  • SHX/trunk/src/SeismicHandler/commands/echo_ch.py

    r246 r247  
    1616#    along with SHX.  If not, see <http://www.gnu.org/licenses/>. 
    1717 
    18 from SeismicHandler.core.modules.command import BaseCommand 
     18from SeismicHandler.core.basic.command import BaseCommand 
    1919from SeismicHandler.core import Settings 
    2020 
     
    9090    echo_ch("test2") 
    9191#    echo_ch() 
    92     from SeismicHandler.core.parser import parse 
     92    from SeismicHandler.modules.parser import parse 
    9393    echo_ch(**(parse("echo_ch test2/new").parsed)) 
  • SHX/trunk/src/SeismicHandler/commands/reads.py

    r246 r247  
    1616#    along with SHX.  If not, see <http://www.gnu.org/licenses/>. 
    1717 
    18 from SeismicHandler.core.modules.command import BaseCommand 
     18from SeismicHandler.core.basic.command import BaseCommand 
    1919from SeismicHandler.core import Settings 
     20from obspy.core import read 
    2021 
    2122provides = {"reads": "reads"} 
  • SHX/trunk/src/SeismicHandler/commands/sdef.py

    r246 r247  
    1616#    along with SHX.  If not, see <http://www.gnu.org/licenses/>. 
    1717 
    18 from SeismicHandler.core.modules.command import BaseCommand 
     18from SeismicHandler.core.basic.command import BaseCommand 
    1919from SeismicHandler.core import Settings 
    2020 
  • SHX/trunk/src/SeismicHandler/commands/sdel.py

    r246 r247  
    1616#    along with SHX.  If not, see <http://www.gnu.org/licenses/>. 
    1717 
    18 from SeismicHandler.core.modules.command import BaseCommand 
     18from SeismicHandler.core.basic.command import BaseCommand 
    1919from SeismicHandler.core import Settings 
    2020 
  • SHX/trunk/src/SeismicHandler/commands/switch.py

    r246 r247  
    1616#    along with SHX.  If not, see <http://www.gnu.org/licenses/>. 
    1717 
    18 from SeismicHandler.core.modules.command import BaseCommand 
     18from SeismicHandler.core.basic.command import BaseCommand 
    1919from SeismicHandler.core import Settings 
    2020 
  • SHX/trunk/src/SeismicHandler/core/__init__.py

    r246 r247  
    2222#print "it's __init__ from core" 
    2323 
    24 import SeismicHandler.core.modules.parser as parser 
    2524from SeismicHandler.core.modules.traces import traces as t 
    2625from SeismicHandler.core.modules.history import History as history 
    27 from SeismicHandler.core.basic import codes 
     26#from SeismicHandler.core.basic import codes 
    2827from SeismicHandler.core.modules.log import Logging 
    2928from SeismicHandler.core.modules.runtime import runtime 
  • SHX/trunk/src/SeismicHandler/core/basic/command.py

    r246 r247  
    1616#    along with SHX.  If not, see <http://www.gnu.org/licenses/>. 
    1717 
    18 from SeismicHandler.core.log import logging 
    19 from SeismicHandler.core.modules.Messages import MessageService, Message 
     18from SeismicHandler.core.modules.log import logging 
     19from SeismicHandler.core.modules.messages import MessageService, Message 
    2020from SeismicHandler.core import history 
    2121 
  • SHX/trunk/src/SeismicHandler/core/basic/error.py

    r246 r247  
    2222"""module for SHX exceptions""" 
    2323 
    24 from SeismicHandler.core.log import logging 
     24from SeismicHandler.core.modules.log import logging 
    2525 
    2626class Error(Exception): 
  • SHX/trunk/src/SeismicHandler/core/modules/messages.py

    r245 r247  
    2525""" 
    2626 
    27 from SeismicHandler.core.error import Error 
    28 from SeismicHandler.core.log import logging 
     27from SeismicHandler.core.basic.error import Error 
     28from SeismicHandler.core.modules.log import logging 
    2929 
    3030class NotifierNotCallableError(Error): 
  • SHX/trunk/src/SeismicHandler/core/modules/runtime.py

    r246 r247  
    2323 
    2424import sys 
    25 from SeismicHandler.core.tools import Property 
     25from SeismicHandler.core.basic.tools import Property 
    2626 
    2727class runtime(object): 
  • SHX/trunk/src/SeismicHandler/core/modules/traces.py

    r246 r247  
    2121 
    2222import sys 
    23 print sys.path 
     23#print sys.path 
    2424#print "it's traces" 
    2525 
  • SHX/trunk/src/SeismicHandler/tests/test_parser.py

    r246 r247  
    5757        data = "\n".join(self.addEchoChannel(data.splitlines())) 
    5858 
    59         from SeismicHandler.core import parser 
     59        from SeismicHandler.modules import parser 
    6060 
    6161        s = parser.symbol() 
     
    241241        """ 
    242242 
    243         from SeismicHandler.core.parser import script, symbol 
     243        from SeismicHandler.modules.parser import script, symbol 
    244244 
    245245        s = symbol() 
     
    268268            self.fail("Cannot open test data file.") 
    269269 
    270         from SeismicHandler.core.parser import script, symbol 
     270        from SeismicHandler.modules.parser import script, symbol 
    271271 
    272272        s = symbol() 
Note: See TracChangeset for help on using the changeset viewer.