summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-08-05 08:31:00 +0000
committerGerrit Code Review <review@openstack.org>2020-08-05 08:31:00 +0000
commit578744aca38d176434f7862f9add6920ab9f1f63 (patch)
treef1c3324a281b6aaea890e311696f4e6e36bdad22
parent1dc592a6fd6693288f479ad770b0ccdac0b48607 (diff)
parentb649d7f4f4903d766c42834429010c7d0952ab4b (diff)
downloadpython-cinderclient-578744aca38d176434f7862f9add6920ab9f1f63.tar.gz
Merge "Stop to use the __future__ module."
-rw-r--r--cinderclient/client.py2
-rw-r--r--cinderclient/shell.py2
-rw-r--r--cinderclient/shell_utils.py2
-rw-r--r--cinderclient/tests/unit/fakes.py2
-rw-r--r--cinderclient/utils.py2
-rw-r--r--cinderclient/v2/shell.py2
-rw-r--r--cinderclient/v3/shell.py2
-rw-r--r--tools/install_venv_common.py2
8 files changed, 0 insertions, 16 deletions
diff --git a/cinderclient/client.py b/cinderclient/client.py
index 485acd9..b013c1e 100644
--- a/cinderclient/client.py
+++ b/cinderclient/client.py
@@ -16,8 +16,6 @@
# under the License.
"""OpenStack Client interface. Handles the REST calls and responses."""
-from __future__ import print_function
-
import glob
import hashlib
import imp
diff --git a/cinderclient/shell.py b/cinderclient/shell.py
index 7fddb5a..09a55b8 100644
--- a/cinderclient/shell.py
+++ b/cinderclient/shell.py
@@ -17,8 +17,6 @@
Command-line interface to the OpenStack Cinder API.
"""
-from __future__ import print_function
-
import argparse
import collections
import getpass
diff --git a/cinderclient/shell_utils.py b/cinderclient/shell_utils.py
index 411dd17..b5db281 100644
--- a/cinderclient/shell_utils.py
+++ b/cinderclient/shell_utils.py
@@ -12,8 +12,6 @@
# License for the specific language governing permissions and limitations
# under the License.
-from __future__ import print_function
-
import sys
import time
diff --git a/cinderclient/tests/unit/fakes.py b/cinderclient/tests/unit/fakes.py
index 61d1904..018a75d 100644
--- a/cinderclient/tests/unit/fakes.py
+++ b/cinderclient/tests/unit/fakes.py
@@ -19,8 +19,6 @@ wrong the tests might raise AssertionError. I've indicated in comments the
places where actual behavior differs from the spec.
"""
-from __future__ import print_function
-
def assert_has_keys(dict, required=None, optional=None):
required = required or []
diff --git a/cinderclient/utils.py b/cinderclient/utils.py
index 04236a3..48d3939 100644
--- a/cinderclient/utils.py
+++ b/cinderclient/utils.py
@@ -12,8 +12,6 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
-
-from __future__ import print_function
import collections
import os
diff --git a/cinderclient/v2/shell.py b/cinderclient/v2/shell.py
index b83175e..d41e014 100644
--- a/cinderclient/v2/shell.py
+++ b/cinderclient/v2/shell.py
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import print_function
-
import argparse
import collections
import copy
diff --git a/cinderclient/v3/shell.py b/cinderclient/v3/shell.py
index b3f69b0..1ccf02e 100644
--- a/cinderclient/v3/shell.py
+++ b/cinderclient/v3/shell.py
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import print_function
-
import argparse
import collections
import os
diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py
index 3b7ac10..0322c18 100644
--- a/tools/install_venv_common.py
+++ b/tools/install_venv_common.py
@@ -22,8 +22,6 @@ environment, it should be kept strictly compatible with Python 2.6.
Synced in from openstack-common
"""
-from __future__ import print_function
-
import optparse
import os
import subprocess