bugfixes in order to make the GUI work

pylot/core/read/data.py

@@ -242,8 +242,7 @@ class PilotDataStructure(object):
 
     def expandDataPath(self):
         datapath = os.path.join(self.getFields()['ROOT'],
-                                self.getFields()['DATABASE'],
-                                "*{0}".format(self.getFields()['SUFFIX']))
+                                self.getFields()['DATABASE'])
         return datapath
 
 

pylot/core/util/__init__.py

@@ -1,6 +1,6 @@
 from pylot.core.util.connection import checkurl
 from pylot.core.util.defaults import FILTERDEFAULTS
-from pylot.core.util.errors import OptionsError, FormatError
+from pylot.core.util.errors import OptionsError, FormatError, DatastructureError
 from pylot.core.util.layouts import layoutStationButtons
 from pylot.core.util.utils import fnConstructor, createArrival, createEvent,\
     createPick, createAmplitude, createOrigin, createMagnitude, getOwner, \

pylot/core/util/errors.py

@@ -10,4 +10,7 @@ class OptionsError(Exception):
     pass
 
 class FormatError(Exception):
-    pass
+    pass
+
+class DatastructureError(Exception):
+    pass

pylot/core/util/utils.py

@@ -118,8 +118,7 @@ def createEvent(origintime, cinfo, etype, resID=None, authority_id=None):
 
 
 def createPick(origintime, picknum, picktime, eventnum, cinfo, phase, station,
-               wfseedstr,
-               authority_id):
+               wfseedstr, authority_id):
     '''
     createPick - function to create an ObsPy Pick
 

pylot/core/util/widgets.py

@@ -110,9 +110,7 @@ class PropertiesDlg(QDialog):
     def accept(self, *args, **kwargs):
         self.apply()
         self.destroy()
-
-    def reject(self, *args, **kwargs):
-        self.destroy()
+        return self.accepted
 
     def apply(self):
         for widint in range(self.tabWidget.count()):