Merge pull request #6 from lsst/tickets/DM-9190

DM-9190: Cleanup pybind11 remaining code
lsst · Apr 6, 2017 · 6174d4c · 6174d4c
2 parents 89126b0 + faf8efb
commit 6174d4c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/python/lsst/display/ds9/SConscript b/python/lsst/display/ds9/SConscript
@@ -1,3 +1,3 @@
 # -*- python -*-
 from lsst.sconsUtils import scripts
-scripts.BasicSConscript.pybind11(['_xpa'])
+scripts.BasicSConscript.pybind11(['xpa'], addUnderscore=False)
diff --git a/python/lsst/display/ds9/_xpa.cc → python/lsst/display/ds9/xpa.cc b/python/lsst/display/ds9/_xpa.cc → python/lsst/display/ds9/xpa.cc
@@ -19,7 +19,7 @@
  * the GNU General Public License along with this program.  If not,
  * see <https://www.lsstcorp.org/LegalNotices/>.
  */
-#include <pybind11/pybind11.h>
+#include "pybind11/pybind11.h"
 
 #include "xpa.h"
 #include "lsst/pex/exceptions/Runtime.h"
@@ -145,8 +145,9 @@ void reset() { myXPA::get(true); }
 
 }  // <anonymous>
 
-PYBIND11_PLUGIN(_xpa) {
-    py::module mod("_xpa", "Simple interface to the xpa routines used to communicate with ds9");
+PYBIND11_PLUGIN(xpa) {
+    py::module::import("lsst.pex.exceptions");
+    py::module mod("xpa", "Simple interface to the xpa routines used to communicate with ds9");
 
     py::class_<xparec> cls(mod, "xparec");
     cls.def(py::init<>());

diff --git a/python/lsst/display/ds9/xpa.py b/python/lsst/display/ds9/xpa.py