Merge "TrivialFix: Remove unnecessary future imports"

manilaclient/common/cliutils.py

@@ -16,8 +16,6 @@
 # W0621: Redefining name %s from outer scope
 # pylint: disable=W0603,W0621
 
-from __future__ import print_function
-
 import getpass
 import inspect
 import os

manilaclient/shell.py

@@ -18,8 +18,6 @@
 Command-line interface to the OpenStack Manila API.
 """
 
-from __future__ import print_function
-
 import argparse
 import glob
 import imp

manilaclient/tests/unit/fakes.py

@@ -18,8 +18,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(dictonary, required=None, optional=None):
     if required is None:

manilaclient/tests/unit/v2/fakes.py

@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import print_function
-
 import manilaclient
 from manilaclient import api_versions
 from manilaclient.tests.unit.v2 import fake_clients as fakes

manilaclient/v2/shell.py

@@ -13,8 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from __future__ import print_function
-
 
 from operator import xor
 import os

tools/install_venv.py

@@ -20,8 +20,6 @@
 Installation script for Nova's development virtualenv
 """
 
-from __future__ import print_function
-
 import optparse
 import os
 import subprocess