Skip to content

Commit 1937b0a

Browse files
hiwakabahiwakaba
committed
Update the version
1 parent faa8b8f commit 1937b0a

File tree

13 files changed

+79
-19
lines changed

13 files changed

+79
-19
lines changed

‎HISTORY.rst‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22
History
33
=======
44

5+
1.1.3 (2025-09-18)
6+
-------------------
7+
8+
* Removes the eol product from dependencies by @hiwakaba
9+
* Updates packages by @hiwakaba
10+
* Update dependencies by @hiwakaba
11+
* Update dependencies by @hiwakaba
12+
* Updates requests by @hiwakaba
13+
* Fix the docs by @hiwakaba
14+
515
1.1.2 (2024-10-11)
616
-------------------
717

‎README.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Let's try to get a token and create a resource.::
5757
>>> k2hr3_token_url = "http://127.0.0.1:18080"
5858
>>> myhttp = K2hr3Http(k2hr3_token_url)
5959
>>> myhttp.POST(mytoken.create())
60-
>>> mytoken.token // k2hr3 token
60+
>>> mytoken.token # k2hr3 token
6161
>>>
6262
>>> from k2hr3client.resource import K2hr3Resource
6363
>>> k2hr3_resource_name = "test_resource"
@@ -74,7 +74,7 @@ Let's try to get a token and create a resource.::
7474
... "chmpx-slave-ctrlport": "8031"},
7575
... alias=[])
7676
... )
77-
>>> myresource.resp.body // {"result":true...
77+
>>> myresource.resp.body # {"result":true...
7878

7979

8080
Settings

‎src/k2hr3client/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"""K2HR3 Python Client of Token API."""
2323

2424
__author__ = 'Hirotaka Wakabayashi <hiwakaba@lycorp.co.jp>'
25-
__version__ = '1.1.2'
25+
__version__ = '1.1.3'
2626

2727
import configparser
2828
import logging

‎src/k2hr3client/acr.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
# POST a request to create a token to K2HR3 Token API.
3737
myhttp = K2hr3Http("http://127.0.0.1:18080")
3838
myhttp.POST(mytoken.create())
39-
mytoken.token // gAAAAA...
39+
mytoken.token # gAAAAA...
4040
4141
# POST a request to add member to K2HR3 ACR API.
4242
myacr = K2hr3Acr(mytoken.token, "service")

‎src/k2hr3client/api.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
# Import modules from k2hr3client package
2929
from k2hr3client import version
3030
v = version.K2hr3Version()
31+
v.get()
3132
from k2hr3client import http as khttp
3233
httpreq = khttp.K2hr3Http('http://127.0.0.1:18080')
3334

‎src/k2hr3client/list.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
# POST a request to create a token to K2HR3 Token API.
3636
myhttp = K2hr3Http("http://127.0.0.1:18080")
3737
myhttp.POST(mytoken.create())
38-
mytoken.token // gAAAAA...
38+
mytoken.token # gAAAAA...
3939
4040
# GET a request to get list from K2HR3 List API.
4141
mylist = K2hr3List(mytoken.token, "service")
4242
myhttp.GET(mylist.get())
43-
mylist.resp.body // {"result":true...
43+
mylist.resp.body # {"result":true...
4444
4545
"""
4646

‎src/k2hr3client/policy.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
# POST a request to create a token to K2HR3 Token API.
3636
myhttp = K2hr3Http("http://127.0.0.1:18080")
3737
myhttp.POST(mytoken.create())
38-
mytoken.token // gAAAAA...
38+
mytoken.token # gAAAAA...
3939
4040
# POST request to get a K2HR3 Policy API.
4141
mypolicy = K2hr3Policy(mytoken.token)
@@ -50,7 +50,7 @@
5050
alias=[]
5151
)
5252
)
53-
mypolicy.resp.body // {"result":true...
53+
mypolicy.resp.body # {"result":true...
5454
5555
"""
5656

‎src/k2hr3client/resource.py‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
# POST a request to create a token to K2HR3 Token API.
3636
myhttp = K2hr3Http("http://127.0.0.1:18080")
3737
myhttp.POST(mytoken.create())
38-
mytoken.token // gAAAAA...
38+
mytoken.token # gAAAAA...
3939
4040
# POST a request to create a K2HDKC resource.
4141
myresource = K2hr3Resource(mytoken.token)
@@ -51,7 +51,7 @@
5151
"chmpx-slave-ctrlport": "8031"},
5252
alias=[])
5353
)
54-
myresource.resp.body // {"result":true...
54+
myresource.resp.body # {"result":true...
5555
5656
"""
5757

@@ -350,6 +350,15 @@ def resource_path(self, val): # type: ignore # noqa: F811
350350
if getattr(self, '_resource_path', None) is None:
351351
self._resource_path = val
352352

353+
@staticmethod
354+
def json_dumps(params):
355+
"""Return the json params after deleting None data."""
356+
for k in list(params.keys()):
357+
if params[k] is None:
358+
del params[k]
359+
json_params = json.dumps(params)
360+
return json_params
361+
353362
#
354363
# abstract methos that must be implemented in subclasses
355364
#
@@ -380,29 +389,32 @@ def _api_path(self, method: K2hr3HTTPMethod) -> Optional[str]: # pylint: disable
380389
return f'{self.version}/{self.basepath}'
381390
return f'{self.version}/{self.basepath}/{self.resource_path}'
382391
if method == K2hr3HTTPMethod.GET:
392+
# NOTE(hiwkby): service should not be passed if it is None.
383393
if self.api_id == 3:
384-
self.urlparams = json.dumps({
394+
self.urlparams = K2hr3Resource.json_dumps({
385395
'expand': self.expand,
386396
'service': self.service
387397
})
388398
return f'{self.version}/{self.basepath}/{self.resource_path}'
389399
if self.api_id == 4:
390-
self.urlparams = json.dumps({
400+
self.urlparams = K2hr3Resource.json_dumps({
391401
'type': self.data_type,
392402
'keys': self.keys,
393403
'service': self.service
394404
})
395405
return f'{self.version}/{self.basepath}/{self.resource_path}'
396406
if method == K2hr3HTTPMethod.HEAD:
407+
# NOTE(hiwkby): service should not be passed if it is None.
397408
if self.api_id == 5:
398-
self.urlparams = json.dumps({
409+
self.urlparams = K2hr3Resource.json_dumps({
399410
'type': self.data_type,
400411
'keys': self.keys,
401412
'service': self.service
402413
})
403414
return f'{self.version}/{self.basepath}/{self.resource_path}'
415+
# NOTE(hiwkby): service should not be passed if it is None.
404416
if self.api_id == 6:
405-
self.urlparams = json.dumps({
417+
self.urlparams = K2hr3Resource.json_dumps({
406418
'port': self.port,
407419
'cuk': self.cuk,
408420
'role': self.role,

‎src/k2hr3client/service.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
# POST a request to create a token to K2HR3 Token API.
3636
myhttp = K2hr3Http("http://127.0.0.1:18080")
3737
myhttp.POST(mytoken.create())
38-
mytoken.token // gAAAAA...
38+
mytoken.token # gAAAAA...
3939
4040
# POST a request to create a service to K2HR3 Service API.
4141
myservice = K2hr3Service(mytoken.token, "test_service")
@@ -44,7 +44,7 @@
4444
verify = "http://example.com/verify_url.php"
4545
)
4646
)
47-
myservice.resp.body // {"result":true...
47+
myservice.resp.body # {"result":true...
4848
4949
"""
5050

‎src/k2hr3client/tenant.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
# POST a request to create a token to K2HR3 Token API.
3636
myhttp = K2hr3Http("http://127.0.0.1:18080")
3737
myhttp.POST(mytoken.create())
38-
mytoken.token // gAAAAA...
38+
mytoken.token # gAAAAA...
3939
4040
# POST a request to create a tenant to K2HR3 Tenant API.
4141
mytenant = K2hr3Tenant(mytoken.token)
@@ -47,7 +47,7 @@
4747
display = "test tenant display"
4848
)
4949
)
50-
mytenant.resp.body // {"result":true...
50+
mytenant.resp.body # {"result":true...
5151
5252
"""
5353

0 commit comments

Comments
 (0)