Merge "Remove future imports"

doc/ext/term.py

@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import unicode_literals
-
 import importlib
 import inspect
 

lower-constraints.txt

@@ -30,7 +30,6 @@ extras==1.0.0
 fasteners==0.14.1
 fixtures==3.0.0
 freezegun==0.3.10
-future==0.16.0
 futurist==1.8.0
 gitdb2==2.0.3
 GitPython==2.1.8

watcher/api/config.py

@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import unicode_literals
-
 from oslo_config import cfg
 from watcher.api import hooks
 

watcher/applier/actions/factory.py

@@ -15,8 +15,6 @@
 # limitations under the License.
 #
 
-from __future__ import unicode_literals
-
 from oslo_log import log
 
 from watcher.applier.loading import default

watcher/applier/loading/default.py

@@ -11,9 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import unicode_literals
-
-
 from watcher.common.loader import default
 
 

watcher/common/loader/base.py

@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import unicode_literals
-
 import abc
 
 

watcher/common/loader/default.py

@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import unicode_literals
-
 from oslo_config import cfg
 from oslo_log import log
 from stevedore import driver as drivermanager

watcher/db/purge.py

@@ -15,8 +15,6 @@
 # limitations under the License.
 #
 
-from __future__ import print_function
-
 import collections
 import datetime
 import itertools

watcher/decision_engine/loading/default.py

@@ -19,9 +19,6 @@
 # limitations under the License.
 #
 
-from __future__ import unicode_literals
-
-
 from watcher.common.loader import default
 
 

watcher/decision_engine/strategy/strategies/workload_balance.py

@@ -17,8 +17,6 @@
 # limitations under the License.
 #
 
-from __future__ import division
-
 from oslo_log import log
 
 from watcher._i18n import _

watcher/tests/api/test_hooks.py

@@ -14,8 +14,6 @@
 
 """Tests for the Pecan API hooks."""
 
-from __future__ import unicode_literals
-
 import mock
 from oslo_config import cfg
 import oslo_messaging as messaging

watcher/tests/api/test_utils.py

@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import unicode_literals
-
 from oslo_config import cfg
 import wsme
 

watcher/tests/applier/actions/loading/test_default_actions_loader.py

@@ -12,7 +12,6 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import unicode_literals
 
 from watcher.applier.actions import base as abase
 from watcher.applier.loading import default

watcher/tests/applier/actions/test_change_node_power_state.py

@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import unicode_literals
-
 import jsonschema
 import mock
 

watcher/tests/applier/actions/test_change_nova_service_state.py

@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import unicode_literals
-
 import jsonschema
 import mock
 

watcher/tests/applier/actions/test_migration.py

@@ -13,9 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import unicode_literals
-
-
 import jsonschema
 import mock
 

watcher/tests/applier/actions/test_resize.py

@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import unicode_literals
 import jsonschema
 import mock
 

watcher/tests/applier/actions/test_volume_migration.py

@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import unicode_literals
-
 import jsonschema
 import mock
 

watcher/tests/applier/workflow_engine/loading/test_default_engine_loader.py

@@ -13,7 +13,6 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import unicode_literals
 
 from watcher.applier.loading import default
 from watcher.applier.workflow_engine import base as wbase

watcher/tests/cmd/test_api.py

@@ -14,9 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import types
 
 import mock

watcher/tests/cmd/test_applier.py

@@ -14,9 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import types
 
 import mock

watcher/tests/cmd/test_decision_engine.py

@@ -14,9 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import types
 
 import mock

watcher/tests/common/loader/test_loader.py

@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import unicode_literals
-
 import mock
 
 from oslo_config import cfg

watcher/tests/decision_engine/datasources/test_ceilometer_helper.py

@@ -14,9 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import mock
 
 from watcher.common import clients