From 30a67fac8546ce46f24bc9fd9d5cf861a20e7160 Mon Sep 17 00:00:00 2001 From: Vincent Llorens Date: Tue, 8 Nov 2016 11:18:01 +0100 Subject: [PATCH] Clean up oslo imports We used to put `try / except ImportError` around oslo lib imports to support both the `oslo_lib` and `oslo.lib` name patterns. It is now useless since the newer versions of these libs all support the `import oslo_lib` pattern. Tested on CentOS 7 with the OpenStack Liberty repository. Tested on Ubuntu 14.04 with OpenStack Liberty CloudArchive repository. Change-Id: I7a147586d7a933506df62e34424e5fc57b3ff503 Sem-Ver: bugfix --- synergy/common/config.py | 5 +---- synergy/common/service.py | 5 +---- synergy/service.py | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/synergy/common/config.py b/synergy/common/config.py index 59ab795..cac32a9 100644 --- a/synergy/common/config.py +++ b/synergy/common/config.py @@ -1,7 +1,4 @@ -try: - from oslo_config import cfg -except ImportError: - from oslo.config import cfg +from oslo_config import cfg __author__ = "Lisa Zangrando" __email__ = "lisa.zangrando[AT]pd.infn.it" diff --git a/synergy/common/service.py b/synergy/common/service.py index 80258a4..bd1dbdb 100644 --- a/synergy/common/service.py +++ b/synergy/common/service.py @@ -3,10 +3,7 @@ import os import signal import sys -try: - from oslo_config import cfg -except ImportError: - from oslo.config import cfg +from oslo_config import cfg __author__ = "Lisa Zangrando" diff --git a/synergy/service.py b/synergy/service.py index 3ef49ae..4b7d7f0 100644 --- a/synergy/service.py +++ b/synergy/service.py @@ -9,10 +9,7 @@ from cgi import escape from cgi import parse_qs from pkg_resources import iter_entry_points -try: - from oslo_config import cfg -except ImportError: - from oslo.config import cfg +from oslo_config import cfg from synergy.common import config from synergy.common.manager import Manager