Merge pull request #7 from lsst/tickets/DM-7301

Py 3 port
lsst · Sep 5, 2016 · 3981c03 · 3981c03
2 parents cf6d223 + d99b4ac
commit 3981c03
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/python/lsst/__init__.py b/python/lsst/__init__.py
@@ -1,2 +1,3 @@
-import pkgutil, lsstimport
+import pkgutil
+import lsstimport
 __path__ = pkgutil.extend_path(__path__, __name__)
diff --git a/python/lsst/meas/__init__.py b/python/lsst/meas/__init__.py
@@ -1,2 +1,3 @@
-import pkgutil, lsstimport
+import pkgutil
+import lsstimport
 __path__ = pkgutil.extend_path(__path__, __name__)
diff --git a/python/lsst/meas/extensions/__init__.py b/python/lsst/meas/extensions/__init__.py
@@ -1,2 +1,3 @@
-import pkgutil, lsstimport
+import pkgutil
+import lsstimport
 __path__ = pkgutil.extend_path(__path__, __name__)
diff --git a/python/lsst/meas/extensions/simpleShape/__init__.py b/python/lsst/meas/extensions/simpleShape/__init__.py
@@ -4,4 +4,4 @@
 from .version import *   # generated by sconsUtils
 
 measBase.wrapSimpleAlgorithm(SimpleShape, name="ext_simpleShape_SimpleShape",
-        Control=SimpleShapeControl, executionOrder=measBase.BasePlugin.SHAPE_ORDER)
+                             Control=SimpleShapeControl, executionOrder=measBase.BasePlugin.SHAPE_ORDER)
diff --git a/tests/testMeasurementFramework.py b/tests/testMeasurementFramework.py
@@ -86,6 +86,7 @@ def testKeys(self):
         for attr in ("center", "ellipse", "covariance", "getFlag"):
             self.assertTrue(hasattr(result, attr), "Result Object missing {}".format(attr))
 
+
 class TestMemory(lsst.utils.tests.MemoryTestCase):
     pass
 

diff --git a/tests/testSimpleShape.py b/tests/testSimpleShape.py
@@ -119,6 +119,7 @@ def testNoNoiseGaussians(self):
                                  numpy.array(center),
                                  rtol=1E-8, atol=1E-15)
 
+
 class TestMemory(lsst.utils.tests.MemoryTestCase):
     pass