From 4f7bebb5737468d191c7425ab5b91e7f3d97da76 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 9 Aug 2016 08:12:54 -0500 Subject: [PATCH] Use os_client_config.__version__ Change-Id: I1cfb37ac34d03df5e0b07067483ca2eefea6c1b1 --- os_http/shell.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/os_http/shell.py b/os_http/shell.py index bb8dc48..a5e579b 100644 --- a/os_http/shell.py +++ b/os_http/shell.py @@ -30,18 +30,12 @@ except ImportError: from keystoneauth1 import exceptions from keystoneauth1 import session import os_client_config -import pbr.version from os_http import version LOG = logging.getLogger(__name__) -# FIXME(jamielennox): OCC should advertise its own version. -# Fix: https://review.openstack.org/#/c/303913/ -try: - _occ_version = pbr.version.VersionInfo('os_client_config').version_string() -except Exception: - _occ_version = "unknown" +_occ_version = os_client_config.__version__ formatter_name = 'console' if sys.stdout.isatty() else 'text'