Additional pybind11 cleanup

lsst · Mar 25, 2017 · 8c90517 · 8c90517
1 parent 2902d61
commit 8c90517
Show file tree

Hide file tree

Showing 29 changed files with 40 additions and 12 deletions.
diff --git a/examples/growthcurve.py b/examples/growthcurve.py
@@ -35,7 +35,7 @@
 """
 %prog [options] arg
 """
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 import sys
 import optparse
 import math

diff --git a/examples/runSingleFrameTask.py b/examples/runSingleFrameTask.py
@@ -22,7 +22,7 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 import os
 import sys
 import numpy

diff --git a/python/lsst/meas/base/__init__.py b/python/lsst/meas/base/__init__.py
@@ -22,7 +22,7 @@
 
 """lsst..meas.base
 """
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
 # Needed for pybind11-generated docstrings
 from lsst.afw.image import Calib, Wcs
 

diff --git a/python/lsst/meas/base/algorithm.cc b/python/lsst/meas/base/algorithm.cc
@@ -35,6 +35,9 @@ namespace meas {
 namespace base {
 
 PYBIND11_PLUGIN(algorithm) {
+    py::module::import("lsst.afw.image");
+    py::module::import("lsst.afw.table");
+
     py::module mod("algorithm");
 
     /* Module level */

diff --git a/python/lsst/meas/base/apertureFlux.cc b/python/lsst/meas/base/apertureFlux.cc
@@ -127,6 +127,9 @@ PyFluxTransform declareFluxTransform(py::module &mod) {
 }  // <anonymous>
 
 PYBIND11_PLUGIN(apertureFlux) {
+    py::module::import("lsst.afw.geom");
+    py::module::import("lsst.afw.image");
+    py::module::import("lsst.afw.table");
     py::module::import("lsst.meas.base.algorithm");
     py::module::import("lsst.meas.base.flagHandler");
     py::module::import("lsst.meas.base.fluxUtilities");

diff --git a/python/lsst/meas/base/applyApCorr.py b/python/lsst/meas/base/applyApCorr.py
@@ -19,7 +19,7 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division
+from __future__ import absolute_import, division, print_function
 import math
 
 from builtins import object

diff --git a/python/lsst/meas/base/blendedness.cc b/python/lsst/meas/base/blendedness.cc
@@ -76,6 +76,7 @@ PyBlendenessAlgorithm declareBlendednessAlgorithm(py::module &mod) {
 }  // <anonymous>
 
 PYBIND11_PLUGIN(blendedness) {
+    py::module::import("lsst.afw.table");
     py::module::import("lsst.meas.base.algorithm");
     py::module::import("lsst.meas.base.flagHandler");
 

diff --git a/python/lsst/meas/base/centroidUtilities.cc b/python/lsst/meas/base/centroidUtilities.cc
@@ -110,6 +110,7 @@ void declareCentroidChecker(py::module &mod) {
 }  // <anonymous>
 
 PYBIND11_PLUGIN(centroidUtilities) {
+    py::module::import("lsst.afw.table");
     py::module::import("lsst.meas.base.transform");
 
     py::module mod("centroidUtilities");

diff --git a/python/lsst/meas/base/circularApertureFlux.cc b/python/lsst/meas/base/circularApertureFlux.cc
@@ -40,6 +40,8 @@ using PyApertureFluxClass = py::class_<CircularApertureFluxAlgorithm,
 }  // <anonymous>
 
 PYBIND11_PLUGIN(circularApertureFlux) {
+    py::module::import("lsst.daf.base");
+    py::module::import("lsst.afw.table");
     py::module::import("lsst.meas.base.algorithm");
 
     py::module mod("circularApertureFlux");

diff --git a/python/lsst/meas/base/exceptions.cc b/python/lsst/meas/base/exceptions.cc
@@ -38,6 +38,8 @@ PYBIND11_PLUGIN(exceptions) {
     using lsst::pex::exceptions::DomainError;
     using lsst::pex::exceptions::RuntimeError;
 
+    py::module::import("lsst.pex.exceptions");
+
     py::module mod("exceptions");
 
     /* Module level */

diff --git a/python/lsst/meas/base/flagHandler.cc b/python/lsst/meas/base/flagHandler.cc
@@ -115,6 +115,8 @@ void declareFlagHandler(py::module &mod) {
 }  // <anonymous>
 
 PYBIND11_PLUGIN(flagHandler) {
+    py::module::import("lsst.afw.table");
+
     py::module mod("flagHandler");
 
     declareFlagDefinition(mod);

diff --git a/python/lsst/meas/base/fluxUtilities.cc b/python/lsst/meas/base/fluxUtilities.cc
@@ -90,6 +90,8 @@ void declareMagResultKey(py::module &mod) {
 }  // <anonymous>
 
 PYBIND11_PLUGIN(fluxUtilities) {
+    py::module::import("lsst.afw.table");
+
     py::module mod("fluxUtilities");
 
     declareFluxResult(mod);

diff --git a/python/lsst/meas/base/gaussianCentroid.cc b/python/lsst/meas/base/gaussianCentroid.cc
@@ -81,6 +81,7 @@ PyCentroidAlgorithm declareCentroidAlgorithm(py::module & mod) {
 }  // <anonymous>
 
 PYBIND11_PLUGIN(gaussianCentroid) {
+    py::module::import("lsst.afw.table");
     py::module::import("lsst.meas.base.algorithm");
     py::module::import("lsst.meas.base.flagHandler");
     py::module::import("lsst.meas.base.transform");

diff --git a/python/lsst/meas/base/gaussianFlux.cc b/python/lsst/meas/base/gaussianFlux.cc
@@ -79,6 +79,7 @@ PyFluxTransform declareFluxTransform(py::module &mod) {
 }  // <anonymous>
 
 PYBIND11_PLUGIN(gaussianFlux) {
+    py::module::import("lsst.afw.table");
     py::module::import("lsst.meas.base.algorithm");
     py::module::import("lsst.meas.base.flagHandler");
     py::module::import("lsst.meas.base.transform");

diff --git a/python/lsst/meas/base/inputUtilities.cc b/python/lsst/meas/base/inputUtilities.cc
@@ -33,6 +33,8 @@ namespace meas {
 namespace base {
 
 PYBIND11_PLUGIN(inputUtilities) {
+    py::module::import("lsst.afw.table");
+
     py::module mod("inputUtilities");
 
     /* Module level */

diff --git a/python/lsst/meas/base/naiveCentroid.cc b/python/lsst/meas/base/naiveCentroid.cc
@@ -84,6 +84,7 @@ PyCentroidTransform declareCentroidTransform(py::module &mod) {
 }  // <anonymous>
 
 PYBIND11_PLUGIN(naiveCentroid) {
+    py::module::import("lsst.afw.table");
     py::module::import("lsst.meas.base.algorithm");
     py::module::import("lsst.meas.base.flagHandler");
     py::module::import("lsst.meas.base.transform");

diff --git a/python/lsst/meas/base/peakLikelihoodFlux.cc b/python/lsst/meas/base/peakLikelihoodFlux.cc
@@ -78,6 +78,7 @@ PyFluxTransform declareFluxTransform(py::module &mod) {
 }  // <anonymous>
 
 PYBIND11_PLUGIN(peakLikelihoodFlux) {
+    py::module::import("lsst.afw.table");
     py::module::import("lsst.meas.base.algorithm");
     py::module::import("lsst.meas.base.flagHandler");
     py::module::import("lsst.meas.base.transform");

diff --git a/python/lsst/meas/base/pixelFlags.cc b/python/lsst/meas/base/pixelFlags.cc
@@ -38,6 +38,7 @@ namespace meas {
 namespace base {
 
 PYBIND11_PLUGIN(pixelFlags) {
+    py::module::import("lsst.afw.table");
     py::module mod("pixelFlags");
 
     py::class_<PixelFlagsAlgorithm, std::shared_ptr<PixelFlagsAlgorithm>, SimpleAlgorithm> clsPixelFlagsAlgorithm(mod, "PixelFlagsAlgorithm");

diff --git a/python/lsst/meas/base/psfFlux.cc b/python/lsst/meas/base/psfFlux.cc
@@ -79,6 +79,7 @@ PyFluxTransform declareFluxTransform(py::module &mod) {
 }  // <anonymous>
 
 PYBIND11_PLUGIN(psfFlux) {
+    py::module::import("lsst.afw.table");
     py::module::import("lsst.meas.base.algorithm");
     py::module::import("lsst.meas.base.flagHandler");
     py::module::import("lsst.meas.base.fluxUtilities");

diff --git a/python/lsst/meas/base/scaledApertureFlux.cc b/python/lsst/meas/base/scaledApertureFlux.cc
@@ -81,6 +81,7 @@ PyFluxTransform declareFluxTransform(py::module &mod) {
 }  // <anonymous>
 
 PYBIND11_PLUGIN(scaledApertureFlux) {
+    py::module::import("lsst.afw.table");
     py::module::import("lsst.meas.base.algorithm");
     py::module::import("lsst.meas.base.fluxUtilities");
     py::module::import("lsst.meas.base.transform");

diff --git a/python/lsst/meas/base/sdssCentroid.cc b/python/lsst/meas/base/sdssCentroid.cc
@@ -89,6 +89,7 @@ PyCentroidTransform declareCentroidTransform(py::module &mod) {
 }  // <anonymous>
 
 PYBIND11_PLUGIN(sdssCentroid) {
+    py::module::import("lsst.afw.table");
     py::module::import("lsst.meas.base.algorithm");
     py::module::import("lsst.meas.base.flagHandler");
     py::module::import("lsst.meas.base.transform");

diff --git a/python/lsst/meas/base/sdssShape.cc b/python/lsst/meas/base/sdssShape.cc
@@ -34,8 +34,6 @@
 namespace py = pybind11;
 using namespace pybind11::literals;
 
-namespace afwGeom = lsst::afw::geom;
-
 namespace lsst {
 namespace meas {
 namespace base {
@@ -167,6 +165,8 @@ PyShapeTransform declareShapeTransform(py::module &mod) {
 }  // <anonymous>
 
 PYBIND11_PLUGIN(sdssShape) {
+    py::module::import("lsst.afw.geom");
+    py::module::import("lsst.afw.table");
     py::module::import("lsst.meas.base.algorithm");
     py::module::import("lsst.meas.base.flagHandler");
     py::module::import("lsst.meas.base.centroidUtilities");  // for CentroidResult

diff --git a/python/lsst/meas/base/shapeUtilities.cc b/python/lsst/meas/base/shapeUtilities.cc
@@ -100,6 +100,8 @@ void declareShapeResultKey(py::module &mod) {
 }  // <anonymous>
 
 PYBIND11_PLUGIN(shapeUtilities) {
+    py::module::import("lsst.afw.table");
+
     py::module mod("shapeUtilities");
 
     if (_import_array() < 0) {

diff --git a/tests/centroid.py b/tests/centroid.py
@@ -21,7 +21,7 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 import os
 import re
 import math

diff --git a/tests/sillyCentroid.py b/tests/sillyCentroid.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
 
 from lsst.meas.base import SimpleAlgorithm, wrapSimpleAlgorithm, wrapTransform, BasePlugin
 from _sillyCentroid import SillyCentroidAlgorithm, SillyCentroidControl, SillyTransform

diff --git a/tests/testGaussianFlux.py b/tests/testGaussianFlux.py
@@ -21,7 +21,7 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from __future__ import division, absolute_import, print_function
+from __future__ import absolute_import, division, print_function
 from builtins import zip
 from builtins import range
 import unittest

diff --git a/tests/testImportCentroidAlgorithm.py b/tests/testImportCentroidAlgorithm.py
@@ -21,7 +21,7 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from __future__ import division, absolute_import, print_function
+from __future__ import absolute_import, division, print_function
 import unittest
 
 import numpy as np

diff --git a/tests/testInputCount.py b/tests/testInputCount.py
@@ -24,7 +24,7 @@
 """
 Tests for InputCounts measurement algorithm
 """
-from __future__ import division, absolute_import, print_function
+from __future__ import absolute_import, division, print_function
 from builtins import zip
 from builtins import range
 import numpy as np

diff --git a/tests/testLib.py b/tests/testLib.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
 
 from lsst.meas.base import SimpleAlgorithm
 from _sillyCentroid import *