Merge "Stop to use the __future__ module."

src/lib/charm/openstack/manila.py

@@ -15,7 +15,6 @@
 
 # bare functions are provided to the reactive handlers to perform the functions
 # needed on the class.
-from __future__ import absolute_import
 
 import collections
 import os

src/reactive/manila_handlers.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 # this is just for the reactive handlers and calls into the charm.
-from __future__ import absolute_import
 
 import charmhelpers.contrib.openstack.utils as os_utils
 import charmhelpers.core.host as ch_host

unit_tests/test_lib_charm_openstack_manila.py

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

unit_tests/test_manila_handlers.py

@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import absolute_import
-from __future__ import print_function
-
 import mock
 
 import reactive.manila_handlers as handlers