openstack/nova
Code Issues Proposed changes

Remove Python 2-specific imports

Browse Source 
Change-Id: I64810898cd9126cf619df0b8f60e6fa01958943e
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane 2021-12-22 17:01:28 +00:00
parent 0396bba4cc
commit 452913a284
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nova/scheduler/host_manager.py
View File

@ -20,11 +20,6 @@ Manage hosts in the current zone.
import collections
import functools
import time
try:
from collections import UserDict as IterableUserDict # Python 3
except ImportError:
from UserDict import IterableUserDict # Python 2
import iso8601
from oslo_log import log as logging
@ -47,7 +42,7 @@ LOG = logging.getLogger(__name__)
HOST_INSTANCE_SEMAPHORE = "host_instance"
class ReadOnlyDict(IterableUserDict):
class ReadOnlyDict(collections.UserDict):
"""A read-only dict."""
def __init__(self, source=None):

6
nova/tests/unit/test_metadata.py
View File

@ -20,13 +20,9 @@ import copy
import hashlib
import hmac
import os
import pickle
import re
try: # python 2
import pickle
except ImportError: # python 3
import cPickle as pickle
from keystoneauth1 import exceptions as ks_exceptions
from keystoneauth1 import session
import mock