Merge pull request #58 from lsst/tickets/DM-16296-obs_sdss

DM-16296: Flake8 fixes and remove python2 support

bin.src/genCoaddRegistry.py

@@ -22,7 +22,6 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from __future__ import print_function
 import glob
 from optparse import OptionParser
 import os

bin.src/genInputRegistry.py

@@ -22,7 +22,6 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from __future__ import print_function
 import glob
 from optparse import OptionParser
 import os

config/sourceAssoc.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 config.inputLevel = "filter"
 config.inputSourceDataset = "src"
 config.inputCalexpMetadataDataset = "calexp_md"

python/lsst/obs/sdss/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.

python/lsst/obs/sdss/convertOpECalib.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-from builtins import range
 import os
 
 import numpy as np

python/lsst/obs/sdss/convertasTrans.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import, division, print_function
-from builtins import range
-from builtins import object
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.

python/lsst/obs/sdss/convertfpM.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import, division, print_function
-from builtins import range
-from builtins import object
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.

python/lsst/obs/sdss/convertpsField.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-from builtins import range
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.

python/lsst/obs/sdss/converttsField.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.

python/lsst/obs/sdss/makeCamera.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import, division, print_function
-from builtins import str
-from builtins import range
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.

python/lsst/obs/sdss/sdssMapper.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-from builtins import map
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.
@@ -33,9 +31,6 @@
 from lsst.obs.sdss.converttsField import converttsField
 import lsst.afw.image.utils as afwImageUtils
 
-# Solely to get boost serialization registrations for Measurement subclasses
-import lsst.meas.algorithms as measAlgo  # flake8: noqa
-
 
 class SdssMapper(CameraMapper):
     packageName = 'obs_sdss'
@@ -67,10 +62,9 @@ def _computeCcdExposureId(self, dataId):
 
         @param dataId (dict) Data identifier with run, rerun, filter, camcol, field
         """
-        return ((int(dataId['run'])
-                 * 10 + self.filterIdMap[dataId['filter']])
-                * 10 + dataId['camcol']) \
-            * 10000 + dataId['field']
+        return ((int(dataId['run']) * 10 +
+                 self.filterIdMap[dataId['filter']]) * 10 +
+                dataId['camcol']) * 10000 + dataId['field']
 
     def _computeCoaddExposureId(self, dataId, singleFilter):
         """Compute the 64-bit (long) identifier for a coadd.

python/lsst/obs/sdss/sdssNullIsr.py

@@ -19,7 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 import lsst.pex.config as pexConfig
 import lsst.pipe.base as pipeBase
 import lsst.afw.image as afwImage
@@ -69,7 +68,7 @@ class SdssNullIsrConfig(ProcessCcdTask.ConfigClass):
 # \}
 
 class SdssNullIsrTask(pipeBase.Task):
-    """!Load SDSS post-ISR data from fpC, fpM, asTrans, etc. files
+    r"""!Load SDSS post-ISR data from fpC, fpM, asTrans, etc. files
 
     @anchor SdssNullIsrTask_
 

python/lsst/obs/sdss/yanny.py

@@ -27,9 +27,6 @@
 #
 # Modules
 #
-from __future__ import print_function
-from builtins import range
-from past.builtins import basestring
 import re
 import os
 import os.path
@@ -332,9 +329,8 @@ def __init__(self, filename=None, np=False, debug=False):
             # Handle file-like objects
             #
             # NOTE: commented out to remove astropy.extern.six dependency
-            # NOTE: Should be revisited when Python 3 support is added to the stack
             # if isinstance(filename, six.string_types):
-            if isinstance(filename, basestring):
+            if isinstance(filename, str):
                 if os.access(filename, os.R_OK):
                     self.filename = filename
                     with open(filename, 'r') as f:
@@ -1023,7 +1019,7 @@ def append(self, datatable):
     #
 
     def _parse(self):
-        """Converts text into tables that users can use.
+        r"""Converts text into tables that users can use.
 
         This method is for use internally by the yanny object.  It is not
         meant to be called by users.

setup.cfg

@@ -1,14 +1,11 @@
 [flake8]
 max-line-length = 110
-ignore = E133, E226, E228, N802, N803, N806
+ignore = E133, E226, E228, N802, N803, N806, W504
 exclude =
     __init__.py,
     config/*,
     description/camera/camera.py
 
 [tool:pytest]
 addopts = --flake8
-flake8-ignore = E133 E226 E228 N802 N803 N806
-    __init__.py
-    config/*
-    description/camera/camera.py
+flake8-ignore = E133 E226 E228 N802 N803 N806 W504

tests/test_sdss.py

@@ -21,7 +21,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 import os
 import unittest