Merge 16d9c9a into 5e3d188

apstools/_version.py

@@ -495,7 +495,7 @@ def get_versions():
         # versionfile_source is the relative path from the top of the source
         # tree (where the .git directory might live) to this file. Invert
         # this to find the root from __file__.
-        for _i in cfg.versionfile_source.split('/'):
+        for _ in cfg.versionfile_source.split('/'):
             root = os.path.dirname(root)
     except NameError:
         return {"version": "0+unknown", "full-revisionid": None,

apstools/callbacks.py

@@ -67,8 +67,8 @@ def __init__(self):
 
     def receiver(self, key, document):
         """keep all documents from recent plan in memory"""
-        uid = document.get("uid", None) or document.get("datum_id", None)
-        if "uid" is None:
+        uid = document.get("uid") or document.get("datum_id")
+        if uid is None:
             raise KeyError("No uid in '{}' document".format(key))
         self.uids.append(uid)
         logger = logging.getLogger(__name__)

apstools/synApps_ophyd/__init__.py

@@ -37,3 +37,18 @@
 from .save_data import *
 from .sscan import *
 from .swait import *
+
+__all__ = """
+    busyRecord
+    BusyStatus
+    SaveData
+    sscanRecord  
+    sscanDevice
+    swaitRecord 
+    userCalcsDevice
+    swait_setup_random_number 
+    swait_setup_gaussian
+    swait_setup_lorentzian 
+    swait_setup_incrementer
+    """.split()
+    ]