openstack/charms.openstack
Code Issues Proposed changes

Merge "Stop to use the __future__ module."

Browse Source
This commit is contained in:
Zuul 2020-07-13 05:41:43 +00:00 committed by Gerrit Code Review
commit 84da63c663
7 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
charms_openstack/adapters.py
View File

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

1
charms_openstack/ip.py
View File

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

1
setup.py
View File

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

2
unit_tests/test_charms_openstack_devices_pci.py
View File

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

1
unit_tests/test_charms_openstack_ip.py
View File

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

1
unit_tests/test_charms_openstack_sdn_ovs.py
View File

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

1
unit_tests/test_charms_openstack_test_utils.py
View File

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