X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fclient.py;fp=osmclient%2Fclient.py;h=fe4869a8f9e4609d1224cc22f41b869409e5d708;hb=0046a316387d86e5df191b0aece617fcedeabb26;hp=a076fc47330c4cd79545e64a0cfd03cae53d4c97;hpb=2947e79a42d945edf7b1eed50ccb6191329a9dc3;p=osm%2Fosmclient.git diff --git a/osmclient/client.py b/osmclient/client.py index a076fc4..fe4869a 100644 --- a/osmclient/client.py +++ b/osmclient/client.py @@ -19,7 +19,6 @@ OSM client entry point """ -from osmclient.v1 import client as client from osmclient.sol005 import client as sol005client import logging import verboselogs @@ -28,7 +27,7 @@ import verboselogs verboselogs.install() -def Client(version=1, host=None, sol005=True, *args, **kwargs): +def Client(version=1, host=None, *args, **kwargs): log_format_simple = "%(levelname)s %(message)s" log_format_complete = "%(asctime)s %(levelname)s %(name)s %(filename)s:%(lineno)s %(funcName)s(): %(message)s" log_formatter_simple = logging.Formatter( @@ -53,13 +52,7 @@ def Client(version=1, host=None, sol005=True, *args, **kwargs): logger.setLevel(level=logging.VERBOSE) elif verbose > 2: logger.setLevel(level=logging.DEBUG) - if not sol005: - if version == 1: - return client.Client(host, *args, **kwargs) - else: - raise Exception("Unsupported client version") + if version == 1: + return sol005client.Client(host, *args, **kwargs) else: - if version == 1: - return sol005client.Client(host, *args, **kwargs) - else: - raise Exception("Unsupported client version") + raise Exception("Unsupported client version")