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