Merge "Stop to use the __future__ module."
This commit is contained in:
commit
84da63c663
@ -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
|
||||
|
@ -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
|
||||
|
1
setup.py
1
setup.py
@ -1,5 +1,4 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from __future__ import print_function
|
||||
|
||||
import sys
|
||||
from setuptools import setup, find_packages
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user