projects
/
osm
/
osmclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove set_default_params method from client.py
[osm/osmclient.git]
/
osmclient
/
sol005
/
client.py
diff --git
a/osmclient/sol005/client.py
b/osmclient/sol005/client.py
index
fadd377
..
be11dd1
100644
(file)
--- a/
osmclient/sol005/client.py
+++ b/
osmclient/sol005/client.py
@@
-48,7
+48,7
@@
class Client(object):
def __init__(
self,
host=None,
def __init__(
self,
host=None,
- so_port=
9999
,
+ so_port=
443
,
user="admin",
password="admin",
project="admin",
user="admin",
password="admin",
project="admin",
@@
-65,16
+65,14
@@
class Client(object):
self._token = None
self._url = None
if host.startswith("http://") or host.startswith("https://"):
self._token = None
self._url = None
if host.startswith("http://") or host.startswith("https://"):
- self._url =
self._
host
+ self._url = host
else:
else:
- if len(host.split(":")) > 1:
+ host_fields = host.split(":")
+ if len(host_fields) > 1:
# backwards compatible, port provided as part of host
# backwards compatible, port provided as part of host
- self._host = host.split(":")[0]
- self._so_port = host.split(":")[1]
- else:
- self._host = host
- self._so_port = so_port
- self._url = "https://{}:{}/osm".format(self._host, self._so_port)
+ host = host_fields[0]
+ so_port = host_fields[1]
+ self._url = "https://{}:{}/osm".format(host, so_port)
self._http_client = http.Http(self._url, **kwargs)
self._headers["Accept"] = "application/json"
self._headers["Content-Type"] = "application/yaml"
self._http_client = http.Http(self._url, **kwargs)
self._headers["Accept"] = "application/json"
self._headers["Content-Type"] = "application/yaml"
@@
-149,12
+147,3
@@
class Client(object):
version = resp.split()[2]
date = resp.split()[4]
return "{} {}".format(version, date)
version = resp.split()[2]
date = resp.split()[4]
return "{} {}".format(version, date)
-
- def set_default_params(self, **kwargs):
- host = kwargs.pop("host", None)
- if host is not None:
- self._host = host
- port = kwargs.pop("port", None)
- if port is not None:
- self._so_port = port
- self._http_client.set_query_admin(**kwargs)