Changeset 442

Timestamp:

08/25/2011 06:11:35 PM (11 years ago)

Author:

marcus

Message:

• use searchpath as defined in configuration file
• all present commands pass tests

Location:

SHX/trunk/SeismicHandler

Files:

• commands/echo_ch.py (modified) (1 diff)
• commands/reads.py (modified) (1 diff)
• commands/sdef.py (modified) (2 diffs)
• commands/sdel.py (modified) (3 diffs)
• modules/parse.py (modified) (1 diff)

SHX/trunk/SeismicHandler/commands/echo_ch.py

@@ -90 +90 @@
     echo_ch("test2")
 #    echo_ch()
-    from SeismicHandler.modules.parse import parse
-    echo_ch(**(parse("echo_ch test2/new").parsed))
+    from SeismicHandler.modules.parse import Parse
+    echo_ch(**(Parse("echo_ch test2/new").parsed))

SHX/trunk/SeismicHandler/commands/reads.py

@@ -17 +17 @@
 
 from SeismicHandler.basics.command import BaseCommand
-from obspy.core import read
 
 provides = {"reads": "reads"}

SHX/trunk/SeismicHandler/commands/sdef.py

@@ -26 +26 @@
     This command deals with the local and/or global symbol set. This is defined
     a parser level, for doctest is has to done manually.
-    >>> from SeismicHandler.modules.parse import symbol
-    >>> s = symbol()
+    >>> from SeismicHandler.modules.parse import Symbol
+    >>> s = Symbol()
 
     Define a local symbol:
@@ -51 +51 @@
     If we initialize another symbol set, the globally defined symbols should
     be still there:
-    >>> s1 = symbol()
+    >>> s1 = Symbol()
     >>> s1.bar
     3

SHX/trunk/SeismicHandler/commands/sdel.py

@@ -25 +25 @@
     This command deals with the local and/or global symbol set. This is defined
     a parser level, for doctest is has to done manually.
-    >>> from SeismicHandler.modules.parse import symbol
-    >>> s = symbol()
+    >>> from SeismicHandler.modules.parse import Symbol
+    >>> s = Symbol()
     >>> s.foo = 1
     >>> s.setGlobal("bar", 2)
@@ -36 +36 @@
     Traceback (most recent call last):
     ...
-    Exception: Symbol FOO not found!
+    ShxError: Symbol 'FOO' not found!
 
     Explicit deleting of a global symbol needs a qualifier. If no local symbol
@@ -47 +47 @@
     If we initialize another symbol set, the globally defined symbol should
     be gone:
-    >>> s1 = symbol()
+    >>> s1 = Symbol()
     >>> s1.bar #doctest: +ELLIPSIS
     Traceback (most recent call last):
     ...
-    Exception: Symbol BAR not found!
+    ShxError: Symbol 'BAR' not found!
 
 

SHX/trunk/SeismicHandler/modules/parse.py

@@ -246 +246 @@
             self.parameters = parameters
 
+        self.searchpath = ["."]
         if "searchpath" in kwargs:
-            self.searchpath = kwargs["searchpath"]
+            self.searchpath += kwargs["searchpath"]
         else:
-            # XXX use default search path from configuration
-            self.searchpath = [""]
+            # use search path from configuration
+            self.searchpath += Settings.config.paths.scripts
 
         try: