Skip to content

Commit

Permalink
Remove Python2 supporting imports.
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffcarlin committed Aug 29, 2018
1 parent 1d9ef89 commit f48a7a0
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 13 deletions.
2 changes: 0 additions & 2 deletions examples/demoPool.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
# I suggest running with n=1, 3, NUM nodes to cover all the operational modes.
#

from __future__ import print_function
import math
from builtins import range
from lsst.ctrl.pool.pool import startPool, Pool, Debugger
NUM = 10 # Number of items in data list

Expand Down
2 changes: 0 additions & 2 deletions python/lsst/ctrl/pool/log.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
from future import standard_library
import os
import copyreg
import lsst.log as lsstLog
from lsst.utils import getPackageDir
standard_library.install_aliases()


def pickleLog(log):
Expand Down
4 changes: 1 addition & 3 deletions python/lsst/ctrl/pool/parallel.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
#!/usr/bin/env python

from __future__ import print_function
from builtins import object

import re
import os
import os.path
Expand All @@ -15,6 +12,7 @@
import contextlib
from lsst.pipe.base import CmdLineTask, TaskRunner
from .pool import startPool, Pool, NODE, abortOnError, setBatchType
from . import log as dummyLog # noqa

__all__ = ["Batch", "PbsBatch", "SlurmBatch", "SmpBatch", "BATCH_TYPES", "BatchArgumentParser",
"BatchCmdLineTask", "BatchPoolTask", ]
Expand Down
5 changes: 0 additions & 5 deletions python/lsst/ctrl/pool/pool.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
from future import standard_library
from builtins import zip
from builtins import range
from builtins import object
# MPI process pool
# Copyright 2013 Paul A. Price
#
Expand Down Expand Up @@ -33,7 +29,6 @@
from lsst.pipe.base import Struct
from future.utils import with_metaclass

standard_library.install_aliases()

__all__ = ["Comm", "Pool", "startPool", "setBatchType", "getBatchType", "abortOnError", "NODE", ]

Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ exclude =

[tool:pytest]
addopts = --flake8
flake8-ignore = E133 E226 E228 E251 N802 N803 N806
flake8-ignore = E133 E226 E228 N802 N803 N806

0 comments on commit f48a7a0

Please sign in to comment.