From ddcef33f73c836d2363932e74a29c03ed716c4ae Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Mon, 18 Nov 2019 15:14:21 -0700 Subject: [PATCH] Remove python 2 support --- python/lsst/pipe/drivers/__init__.py | 1 - python/lsst/pipe/drivers/background.py | 4 +--- python/lsst/pipe/drivers/checksum.py | 5 ----- python/lsst/pipe/drivers/coaddDriver.py | 5 ----- python/lsst/pipe/drivers/constructCalibs.py | 4 ---- python/lsst/pipe/drivers/multiBandDriver.py | 3 --- python/lsst/pipe/drivers/singleFrameDriver.py | 2 -- python/lsst/pipe/drivers/skyCorrection.py | 2 -- python/lsst/pipe/drivers/utils.py | 1 - python/lsst/pipe/drivers/visualizeVisit.py | 4 +--- 10 files changed, 2 insertions(+), 29 deletions(-) diff --git a/python/lsst/pipe/drivers/__init__.py b/python/lsst/pipe/drivers/__init__.py index a823ef1..0eea61c 100644 --- a/python/lsst/pipe/drivers/__init__.py +++ b/python/lsst/pipe/drivers/__init__.py @@ -1,2 +1 @@ -from __future__ import absolute_import, division, print_function from .version import * diff --git a/python/lsst/pipe/drivers/background.py b/python/lsst/pipe/drivers/background.py index 57b0945..4635fd9 100644 --- a/python/lsst/pipe/drivers/background.py +++ b/python/lsst/pipe/drivers/background.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, print_function - import numpy import itertools from scipy.ndimage import gaussian_filter @@ -481,7 +479,7 @@ class FocalPlaneBackgroundConfig(Config): binning = Field(dtype=int, default=64, doc="Binning to use for CCD background model (pixels)") -class FocalPlaneBackground(object): +class FocalPlaneBackground: """Background model for a focal plane camera We model the background empirically with the "superpixel" method: we diff --git a/python/lsst/pipe/drivers/checksum.py b/python/lsst/pipe/drivers/checksum.py index 5505864..dd22572 100644 --- a/python/lsst/pipe/drivers/checksum.py +++ b/python/lsst/pipe/drivers/checksum.py @@ -1,8 +1,3 @@ -from __future__ import absolute_import, division, print_function - -from future import standard_library -standard_library.install_aliases() # noqa future needs this here - import hashlib import zlib import pickle diff --git a/python/lsst/pipe/drivers/coaddDriver.py b/python/lsst/pipe/drivers/coaddDriver.py index 1652d41..40c267b 100644 --- a/python/lsst/pipe/drivers/coaddDriver.py +++ b/python/lsst/pipe/drivers/coaddDriver.py @@ -1,8 +1,3 @@ -from __future__ import absolute_import, division, print_function - -from builtins import zip -from builtins import map - import lsst.afw.image as afwImage import lsst.afw.geom as afwGeom from lsst.afw.fits.fitsLib import FitsError diff --git a/python/lsst/pipe/drivers/constructCalibs.py b/python/lsst/pipe/drivers/constructCalibs.py index 2371232..d5bbe40 100644 --- a/python/lsst/pipe/drivers/constructCalibs.py +++ b/python/lsst/pipe/drivers/constructCalibs.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, print_function - import sys import math import time @@ -8,8 +6,6 @@ import collections import numpy as np -from builtins import zip -from builtins import range from astro_metadata_translator import merge_headers, ObservationGroup from astro_metadata_translator.serialize import dates_to_fits diff --git a/python/lsst/pipe/drivers/multiBandDriver.py b/python/lsst/pipe/drivers/multiBandDriver.py index 50becc7..6099e93 100644 --- a/python/lsst/pipe/drivers/multiBandDriver.py +++ b/python/lsst/pipe/drivers/multiBandDriver.py @@ -1,8 +1,5 @@ -from __future__ import absolute_import, division, print_function import os -from builtins import zip - from lsst.pex.config import Config, Field, ConfigurableField from lsst.pipe.base import ArgumentParser, TaskRunner from lsst.pipe.tasks.multiBand import (DetectCoaddSourcesTask, diff --git a/python/lsst/pipe/drivers/singleFrameDriver.py b/python/lsst/pipe/drivers/singleFrameDriver.py index 24af527..7e961aa 100644 --- a/python/lsst/pipe/drivers/singleFrameDriver.py +++ b/python/lsst/pipe/drivers/singleFrameDriver.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, print_function - from lsst.pipe.base import ArgumentParser, ButlerInitializedTaskRunner, ConfigDatasetType from lsst.pipe.tasks.processCcd import ProcessCcdTask from lsst.pex.config import Config, Field, ConfigurableField, ListField diff --git a/python/lsst/pipe/drivers/skyCorrection.py b/python/lsst/pipe/drivers/skyCorrection.py index a03e866..6588690 100644 --- a/python/lsst/pipe/drivers/skyCorrection.py +++ b/python/lsst/pipe/drivers/skyCorrection.py @@ -18,8 +18,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from __future__ import absolute_import, division, print_function - import lsst.afw.math as afwMath import lsst.afw.image as afwImage import lsst.pipe.base as pipeBase diff --git a/python/lsst/pipe/drivers/utils.py b/python/lsst/pipe/drivers/utils.py index 53fcafa..ce7acae 100644 --- a/python/lsst/pipe/drivers/utils.py +++ b/python/lsst/pipe/drivers/utils.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, division, print_function import argparse from lsst.pipe.base import Struct, TaskRunner diff --git a/python/lsst/pipe/drivers/visualizeVisit.py b/python/lsst/pipe/drivers/visualizeVisit.py index 499cf60..dd96011 100644 --- a/python/lsst/pipe/drivers/visualizeVisit.py +++ b/python/lsst/pipe/drivers/visualizeVisit.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, print_function - import numpy as np import lsst.afw.math as afwMath @@ -24,7 +22,7 @@ def makeCameraImage(camera, exposures, binning): binning : `int` Binning size that has been applied to images. """ - class ImageSource(object): + class ImageSource: """Source of images for makeImageFromCamera""" def __init__(self, exposures): """Constructor