Changeset 256


Ignore:
Timestamp:
10.08.2010 14:17:39 (9 years ago)
Author:
marcus
Message:

All tests now work again.

Location:
SHX/trunk/src/SeismicHandler
Files:
16 edited

Legend:

Unmodified
Added
Removed
  • SHX/trunk/src/SeismicHandler/basics/command.py

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

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

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

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

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

    r251 r256  
    1616#    along with SHX.  If not, see <http://www.gnu.org/licenses/>. 
    1717 
    18 from SeismicHandler.core.basic.command import BaseCommand 
     18from SeismicHandler.basics.command import BaseCommand 
    1919from SeismicHandler.core import Settings 
    2020 
     
    2727    This command deals with the local and/or global symbol set. This is defined 
    2828    a parser level, for doctest is has to done manually. 
    29     >>> from SeismicHandler.core.modules.parse import symbol 
     29    >>> from SeismicHandler.modules.parse import symbol 
    3030    >>> s = symbol() 
    3131 
  • SHX/trunk/src/SeismicHandler/commands/sdel.py

    r251 r256  
    1616#    along with SHX.  If not, see <http://www.gnu.org/licenses/>. 
    1717 
    18 from SeismicHandler.core.basic.command import BaseCommand 
     18from SeismicHandler.basics.command import BaseCommand 
    1919from SeismicHandler.core import Settings 
    2020 
     
    2626    This command deals with the local and/or global symbol set. This is defined 
    2727    a parser level, for doctest is has to done manually. 
    28     >>> from SeismicHandler.core.modules.parse import symbol 
     28    >>> from SeismicHandler.modules.parse import symbol 
    2929    >>> s = symbol() 
    3030    >>> s.foo = 1 
  • SHX/trunk/src/SeismicHandler/commands/switch.py

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

    r252 r256  
    2020# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA 
    2121 
    22 from SeismicHandler.core.modules.traces import Traces 
    23 from SeismicHandler.core.modules.history import History as history 
    24 from SeismicHandler.core.basic import codes 
    25 from SeismicHandler.core.modules.log import Logging 
    26 from SeismicHandler.core.modules.runtime import runtime 
     22from SeismicHandler.basics import codes 
     23from SeismicHandler.modules.traces import Traces 
     24from SeismicHandler.modules.history import History as history 
     25from SeismicHandler.modules.log import Logging 
     26from SeismicHandler.modules.runtime import runtime 
    2727 
    2828from obspy.core import read as obspy_read 
  • SHX/trunk/src/SeismicHandler/modules/messages.py

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

    • Property svn:executable deleted
  • SHX/trunk/src/SeismicHandler/modules/runtime.py

    r255 r256  
    2323 
    2424import sys 
    25 from SeismicHandler.core.basic.tools import Property 
     25from SeismicHandler.basics.tools import Property 
    2626from obspy.core.util import AttribDict 
    2727 
     
    7171 
    7272    def __init__(self): 
    73         print self.__configuration 
    74         self.__configuration = 1 
     73#        print self.__configuration 
     74#        self.__configuration = 1 
     75        pass 
    7576 
    7677    def __getattr__(self, name): 
  • SHX/trunk/src/SeismicHandler/modules/traces.py

    r255 r256  
    2121 
    2222import sys 
    23 #print sys.path 
    24 #print "it's traces" 
    25  
    2623from obspy.core.stream import Stream 
    2724 
  • SHX/trunk/src/SeismicHandler/tests/test_base.py

    r244 r256  
    2222""" 
    2323 
    24 from SeismicHandler.core.command import BaseCommand 
     24from SeismicHandler.basics.command import BaseCommand 
    2525import unittest 
    2626import sys 
  • SHX/trunk/src/SeismicHandler/tests/test_events.py

    r244 r256  
    11# -*- coding: utf-8 -*- 
    22 
    3 from SeismicHandler.core.modules.Messages import Message, MessageService 
     3from SeismicHandler.modules.Messages import Message, MessageService 
    44import unittest 
    55 
  • SHX/trunk/src/SeismicHandler/tests/test_parser.py

    r251 r256  
    2626from StringIO import StringIO 
    2727 
     28from SeismicHandler.modules.parse import symbol, script 
     29 
    2830class parserTestCase(unittest.TestCase): 
    2931    outfile = "parserTestCase".upper() 
     
    5658        """ 
    5759        data = "\n".join(self.addEchoChannel(data.splitlines())) 
    58  
    59         from SeismicHandler.core.modules.parse import symbol, script 
    6060 
    6161        s = symbol() 
     
    241241        """ 
    242242 
    243         from SeismicHandler.core.modules.parse import script, symbol 
    244  
    245243        s = symbol() 
    246244        x = script("script3", s, searchpath=["data"]) 
     
    268266            self.fail("Cannot open test data file.") 
    269267 
    270         from SeismicHandler.core.modules.parse import script, symbol 
    271  
    272268        s = symbol() 
    273269        x = script(scpt, s, searchpath=["data"]) 
Note: See TracChangeset for help on using the changeset viewer.