From 452913a284a57a6d347c1e09c1a973faae9bccf2 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Wed, 22 Dec 2021 17:01:28 +0000 Subject: [PATCH] Remove Python 2-specific imports Change-Id: I64810898cd9126cf619df0b8f60e6fa01958943e Signed-off-by: Stephen Finucane --- nova/scheduler/host_manager.py | 7 +------ nova/tests/unit/test_metadata.py | 6 +----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/nova/scheduler/host_manager.py b/nova/scheduler/host_manager.py index 1d9e28d00b43..80511ffad694 100644 --- a/nova/scheduler/host_manager.py +++ b/nova/scheduler/host_manager.py @@ -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): diff --git a/nova/tests/unit/test_metadata.py b/nova/tests/unit/test_metadata.py index 96a1ab277e93..630cb5441888 100644 --- a/nova/tests/unit/test_metadata.py +++ b/nova/tests/unit/test_metadata.py @@ -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