From 5916702cb2f4bb4d6a1e027af1ff2240ad48fa52 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 8 Mar 2018 10:30:31 +0100 Subject: [PATCH] Remove usage of ordereddict This was only needed for Python < 2.7, but glanceclient's setup.cfg already declares compatibility only with 2.7. Change-Id: I80d42abf5dd5565da424a90a93545ba82ef7a58d --- glanceclient/tests/unit/test_shell.py | 5 +---- test-requirements.txt | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/glanceclient/tests/unit/test_shell.py b/glanceclient/tests/unit/test_shell.py index 898a9eb6..ce2fec3f 100644 --- a/glanceclient/tests/unit/test_shell.py +++ b/glanceclient/tests/unit/test_shell.py @@ -15,10 +15,7 @@ # under the License. import argparse -try: - from collections import OrderedDict -except ImportError: - from ordereddict import OrderedDict +from collections import OrderedDict import hashlib import logging import os diff --git a/test-requirements.txt b/test-requirements.txt index 8bec3aaf..af93ae59 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,7 +5,6 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 mock>=2.0.0 # BSD -ordereddict>=1.1 # MIT os-client-config>=1.28.0 # Apache-2.0 openstackdocstheme>=1.18.1 # Apache-2.0 reno>=2.5.0 # Apache-2.0