openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Update keyring requirements"

Browse Source
This commit is contained in:
Jenkins
2016-02-04 02:16:11 +00:00
committed by Gerrit Code Review
parent 24ed2381bb cc3aea176c
commit 53de2007c7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
keystoneclient/httpclient.py
View File

@@ -38,8 +38,9 @@ try:
# requirements. Update _min and _bad when that changes.
keyring_v = pkg_resources.parse_version(
pkg_resources.get_distribution("keyring").version)
keyring_min = pkg_resources.parse_version('2.1')
keyring_bad = (pkg_resources.parse_version('3.3'),)
keyring_min = pkg_resources.parse_version('5.5.1')
# This is a list of versions, e.g., pkg_resources.parse_version('3.3')
keyring_bad = []
if keyring_v >= keyring_min and keyring_v not in keyring_bad:
import keyring