Revert "Revert "Remove v1 version of osmclient which was used with old NBI (pre-Relea...

[osm/osmclient.git] / osmclient / client.py

diff --git a/osmclient/client.py b/osmclient/client.py
index a076fc4..fe4869a 100644 (file)
--- 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")