aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Quigley <bryan.quigley@canonical.com>2020-04-08 11:57:10 -0700
committerBryan Quigley <bryan.quigley@canonical.com>2020-04-08 12:21:57 -0700
commit902f1269500808c1a780eec46e2dc4f34be876fd (patch)
tree776281709125e7f1472713ff0efb1d65be7837aa
parent6738ca63a1eab4381e436b7f5d5e0e0cc0d51953 (diff)
downloadsos-902f1269500808c1a780eec46e2dc4f34be876fd.tar.gz
[global] Drop use of __future__
This was used either to * get the print function * get the with function (for py2.5) Resolves: #2005 Signed-off-by: Bryan Quigley <bryan.quigley@canonical.com>
-rw-r--r--sos/policies/__init__.py2
-rw-r--r--sos/policies/amazon.py3
-rw-r--r--sos/policies/ibmkvm.py2
-rw-r--r--sos/policies/redhat.py2
-rw-r--r--sos/policies/suse.py2
-rw-r--r--sos/policies/ubuntu.py2
-rw-r--r--sos/report/plugins/__init__.py2
-rw-r--r--sos/utilities.py2
8 files changed, 0 insertions, 17 deletions
diff --git a/sos/policies/__init__.py b/sos/policies/__init__.py
index 91e8be0e..fc6ed055 100644
--- a/sos/policies/__init__.py
+++ b/sos/policies/__init__.py
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
import os
import re
import platform
diff --git a/sos/policies/amazon.py b/sos/policies/amazon.py
index ce60c5e3..e573aae0 100644
--- a/sos/policies/amazon.py
+++ b/sos/policies/amazon.py
@@ -8,9 +8,6 @@
#
# See the LICENSE file in the source distribution for further information.
-# This enables the use of with syntax in python 2.5 (e.g. jython)
-from __future__ import print_function
-
from sos.policies.redhat import RedHatPolicy, OS_RELEASE
import os
diff --git a/sos/policies/ibmkvm.py b/sos/policies/ibmkvm.py
index bc9f1b36..1990fcd5 100644
--- a/sos/policies/ibmkvm.py
+++ b/sos/policies/ibmkvm.py
@@ -10,8 +10,6 @@
#
# See the LICENSE file in the source distribution for further information.
-from __future__ import print_function
-
from sos.report.plugins import PowerKVMPlugin, ZKVMPlugin, RedHatPlugin
from sos.policies.redhat import RedHatPolicy
diff --git a/sos/policies/redhat.py b/sos/policies/redhat.py
index 4d3da57d..10a6f653 100644
--- a/sos/policies/redhat.py
+++ b/sos/policies/redhat.py
@@ -8,8 +8,6 @@
#
# See the LICENSE file in the source distribution for further information.
-# This enables the use of with syntax in python 2.5 (e.g. jython)
-from __future__ import print_function
import os
import sys
import re
diff --git a/sos/policies/suse.py b/sos/policies/suse.py
index fcb56aa0..87007fc2 100644
--- a/sos/policies/suse.py
+++ b/sos/policies/suse.py
@@ -7,8 +7,6 @@
#
# See the LICENSE file in the source distribution for further information.
-# This enables the use of with syntax in python 2.5 (e.g. jython)
-from __future__ import print_function
import os
import sys
diff --git a/sos/policies/ubuntu.py b/sos/policies/ubuntu.py
index 169602a4..b7067d14 100644
--- a/sos/policies/ubuntu.py
+++ b/sos/policies/ubuntu.py
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
from sos.report.plugins import UbuntuPlugin, DebianPlugin
from sos.policies.debian import DebianPolicy
diff --git a/sos/report/plugins/__init__.py b/sos/report/plugins/__init__.py
index 9e33296d..408fe7d9 100644
--- a/sos/report/plugins/__init__.py
+++ b/sos/report/plugins/__init__.py
@@ -10,8 +10,6 @@
""" This exports methods available for use by plugins for sos """
-from __future__ import with_statement
-
from sos.utilities import (sos_get_command_output, import_module, grep,
fileobj, tail, is_executable)
import os
diff --git a/sos/utilities.py b/sos/utilities.py
index 7921dfa7..24b57d8a 100644
--- a/sos/utilities.py
+++ b/sos/utilities.py
@@ -6,8 +6,6 @@
#
# See the LICENSE file in the source distribution for further information.
-from __future__ import with_statement
-
import os
import re
import inspect