Merge pull request #308 from tacaswell/mnt/simplify_RE_call

MNT: pass callbacks directly to _RE.__call__

Author: dmgav

bluesky_queueserver/manager/worker.py

@@ -463,8 +463,6 @@ def _generate_new_plan(self, parameters):
         plan_info = parameters
 
         try:
-            from bluesky.preprocessors import subs_wrapper
-
             with self._allowed_items_lock:
                 allowed_plans, allowed_devices = self._allowed_plans, self._allowed_devices
 
@@ -492,8 +490,7 @@ def _generate_new_plan(self, parameters):
 
             def get_start_plan_func(plan_func, plan_args, plan_kwargs, plan_meta):
                 def start_plan_func():
-                    g = subs_wrapper(plan_func(*plan_args, **plan_kwargs), {"all": [self._run_reg_cb]})
-                    return self._RE(g, **plan_meta)
+                    return self._RE(plan_func(*plan_args, **plan_kwargs), {"all": [self._run_reg_cb]}, **plan_meta)
 
                 return start_plan_func
 

docs/source/conf.py

@@ -106,9 +106,6 @@
 # a list of builtin themes.
 #
 html_theme = 'sphinx_rtd_theme'
-import sphinx_rtd_theme
-
-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the