m-labs · Aug 22, 2015 · Aug 22, 2015 · Aug 22, 2015 · Aug 22, 2015
Showing with 19 additions and 7 deletions.

+3 −4 artiq/gui/explorer.py

+6 −2 artiq/gui/scan.py

+9 −0 artiq/language/environment.py

+1 −1 artiq/protocols/pyon.py
diff --git a/artiq/gui/explorer.py b/artiq/gui/explorer.py
@@ -1,5 +1,4 @@
 import asyncio
-import traceback
 
 from quamash import QtGui, QtCore
 from pyqtgraph import dockarea
@@ -136,12 +135,12 @@ def get_argument_values(self, show_error_message):
         for arg, entry in self._args_to_entries.items():
             try:
                 r[arg] = entry.get_argument_value()
-            except:
+            except Exception as e:
                 if show_error_message:
                     msgbox = QtGui.QMessageBox(self.dialog_parent)
                     msgbox.setWindowTitle("Error")
-                    msgbox.setText("Failed to obtain value for argument '{}'.\n{}"
-                                   .format(arg, traceback.format_exc()))
+                    msgbox.setText("Failed to obtain value for argument '{}':\n{}"
+                                   .format(arg, str(e)))
                     msgbox.setStandardButtons(QtGui.QMessageBox.Ok)
                     msgbox.show()
                 return None

diff --git a/artiq/gui/scan.py b/artiq/gui/scan.py
@@ -40,9 +40,13 @@ def set_values(self, min, max, npoints):
         force_spinbox_value(self.npoints, npoints)
 
     def get_values(self):
+        min = self.min.value()
+        max = self.max.value()
+        if min > max:
+            raise ValueError("Minimum scan boundary must be less than maximum")
         return {
-            "min": self.min.value(),
-            "max": self.max.value(),
+            "min": min,
+            "max": max,
             "npoints": self.npoints.value()
         }
 

diff --git a/artiq/language/environment.py b/artiq/language/environment.py
@@ -133,6 +133,15 @@ def build(self):
         raise NotImplementedError
 
     def dbs(self):
+        """Returns the device manager, the parameter database and the result
+        database, in this order.
+
+        This is the same order that the constructor takes them, allowing
+        sub-objects to be created with this idiom to pass the environment
+        around: ::
+
+            sub_object = SomeLibrary(*self.dbs())
+        """
         return self.__dmgr, self.__pdb, self.__rdb
 
     def get_argument(self, key, processor=None):

diff --git a/artiq/protocols/pyon.py b/artiq/protocols/pyon.py
@@ -153,7 +153,7 @@ def _npscalar(ty, data):
 
 
 _eval_dict = {
-    "__builtins__": None,
+    "__builtins__": {},
 
     "null": None,
     "false": False,