Merge "Stop to use the __future__ module."

charms_openstack/adapters.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 """Adapter classes and utilities for use with Reactive interfaces"""
-from __future__ import absolute_import
 
 import collections
 import itertools

charms_openstack/ip.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 # need/want absolute imports for the package imports to work properly
-from __future__ import absolute_import
 import netaddr
 
 import charmhelpers.core.hookenv as hookenv

setup.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function
 
 import sys
 from setuptools import setup, find_packages

unit_tests/test_charms_openstack_devices_pci.py

@@ -19,8 +19,6 @@
 # mock out some charmhelpers libraries as they have apt install side effects
 # sys.modules['charmhelpers.contrib.openstack.utils'] = mock.MagicMock()
 # sys.modules['charmhelpers.contrib.network.ip'] = mock.MagicMock()
-
-from __future__ import absolute_import
 import mock
 
 import charms_openstack.devices.pci as pci

unit_tests/test_charms_openstack_ip.py

@@ -19,7 +19,6 @@
 # mock out some charmhelpers libraries as they have apt install side effects
 # sys.modules['charmhelpers.contrib.openstack.utils'] = mock.MagicMock()
 # sys.modules['charmhelpers.contrib.network.ip'] = mock.MagicMock()
-from __future__ import absolute_import
 
 import unit_tests.utils as utils
 

unit_tests/test_charms_openstack_sdn_ovs.py

@@ -19,7 +19,6 @@
 # mock out some charmhelpers libraries as they have apt install side effects
 # sys.modules['charmhelpers.contrib.openstack.utils'] = mock.MagicMock()
 # sys.modules['charmhelpers.contrib.network.ip'] = mock.MagicMock()
-from __future__ import absolute_import
 
 import unit_tests.utils as utils
 

unit_tests/test_charms_openstack_test_utils.py

@@ -18,7 +18,6 @@
 # mock out some charmhelpers libraries as they have apt install side effects
 # sys.modules['charmhelpers.contrib.openstack.utils'] = mock.MagicMock()
 # sys.modules['charmhelpers.contrib.network.ip'] = mock.MagicMock()
-from __future__ import absolute_import
 
 import unittest