Changeset 251


Ignore:
Timestamp:
08/03/2010 04:34:09 PM (12 years ago)
Author:
marcus
Message:

Renamed parser.py to parse.py to prevent conflicts with python's standard parser module.

Location:
SHX/trunk/src/SeismicHandler
Files:
4 edited
1 moved

Legend:

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

    r248 r251  
    9090    echo_ch("test2") 
    9191#    echo_ch() 
    92     from SeismicHandler.core.modules.parser import parse 
     92    from SeismicHandler.core.modules.parse import parse 
    9393    echo_ch(**(parse("echo_ch test2/new").parsed)) 
  • SHX/trunk/src/SeismicHandler/commands/sdef.py

    r248 r251  
    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.parser import symbol 
     29    >>> from SeismicHandler.core.modules.parse import symbol 
    3030    >>> s = symbol() 
    3131 
  • SHX/trunk/src/SeismicHandler/commands/sdel.py

    r248 r251  
    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.parser import symbol 
     28    >>> from SeismicHandler.core.modules.parse import symbol 
    2929    >>> s = symbol() 
    3030    >>> s.foo = 1 
  • SHX/trunk/src/SeismicHandler/tests/test_parser.py

    r248 r251  
    5757        data = "\n".join(self.addEchoChannel(data.splitlines())) 
    5858 
    59         from SeismicHandler.core.modules import parser 
    60  
    61         s = parser.symbol() 
    62         x = parser.script(StringIO(data), s) 
     59        from SeismicHandler.core.modules.parse import symbol, script 
     60 
     61        s = symbol() 
     62        x = script(StringIO(data), s) 
    6363        x.run() 
    6464 
     
    241241        """ 
    242242 
    243         from SeismicHandler.core.modules.parser import script, symbol 
     243        from SeismicHandler.core.modules.parse import script, symbol 
    244244 
    245245        s = symbol() 
     
    268268            self.fail("Cannot open test data file.") 
    269269 
    270         from SeismicHandler.core.modules.parser import script, symbol 
     270        from SeismicHandler.core.modules.parse import script, symbol 
    271271 
    272272        s = symbol() 
Note: See TracChangeset for help on using the changeset viewer.