osc-lib 3.0.1__py3-none-any.whl → 3.1.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. osc_lib/api/api.py +3 -4
  2. {osc_lib-3.0.1.dist-info → osc_lib-3.1.0.dist-info}/AUTHORS +1 -0
  3. {osc_lib-3.0.1.dist-info → osc_lib-3.1.0.dist-info}/METADATA +2 -2
  4. {osc_lib-3.0.1.dist-info → osc_lib-3.1.0.dist-info}/RECORD +8 -8
  5. osc_lib-3.1.0.dist-info/pbr.json +1 -0
  6. osc_lib-3.0.1.dist-info/pbr.json +0 -1
  7. {osc_lib-3.0.1.dist-info → osc_lib-3.1.0.dist-info}/LICENSE +0 -0
  8. {osc_lib-3.0.1.dist-info → osc_lib-3.1.0.dist-info}/WHEEL +0 -0
  9. {osc_lib-3.0.1.dist-info → osc_lib-3.1.0.dist-info}/top_level.txt +0 -0
osc_lib/api/api.py CHANGED
@@ -12,10 +12,9 @@
12
12
  #
13
13
 
14
14
  """Base API Library"""
15
-
16
15
  from keystoneauth1 import exceptions as ksa_exceptions
17
16
  from keystoneauth1 import session as ksa_session
18
- import simplejson as json
17
+ import requests
19
18
 
20
19
  from osc_lib import exceptions
21
20
  from osc_lib.i18n import _
@@ -153,7 +152,7 @@ class BaseAPI(object):
153
152
  # Should this move into _requests()?
154
153
  try:
155
154
  return ret.json()
156
- except json.JSONDecodeError:
155
+ except requests.JSONDecodeError:
157
156
  return ret
158
157
 
159
158
  def delete(self, url, session=None, **params):
@@ -218,7 +217,7 @@ class BaseAPI(object):
218
217
  )
219
218
  try:
220
219
  return ret.json()
221
- except json.JSONDecodeError:
220
+ except requests.JSONDecodeError:
222
221
  return ret
223
222
 
224
223
  # Layered actions built on top of the basic action methods do not
{osc_lib-3.0.1.dist-info → osc_lib-3.1.0.dist-info}/AUTHORS RENAMED
@@ -123,6 +123,7 @@ Stephen Finucane <stephenfin@redhat.com>
123
123
  Steve Martinelli <s.martinelli@gmail.com>
124
124
  Steve Martinelli <stevemar@ca.ibm.com>
125
125
  Swapnil Kulkarni (coolsvap) <me@coolsvap.net>
126
+ Takashi Kajinami <kajinamit@oss.nttdata.com>
126
127
  Takashi Kajinami <tkajinam@redhat.com>
127
128
  Tang Chen <chen.tang@easystack.cn>
128
129
  Tang Chen <tangchen@cn.fujitsu.com>
{osc_lib-3.0.1.dist-info → osc_lib-3.1.0.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: osc-lib
3
- Version: 3.0.1
3
+ Version: 3.1.0
4
4
  Summary: OpenStackClient Library
5
5
  Home-page: https://docs.openstack.org/osc-lib/latest/
6
6
  Author: OpenStack
@@ -26,7 +26,7 @@ Requires-Dist: openstacksdk (>=0.15.0)
26
26
  Requires-Dist: oslo.i18n (>=3.15.3)
27
27
  Requires-Dist: oslo.utils (>=3.33.0)
28
28
  Requires-Dist: pbr (!=2.1.0,>=2.0.0)
29
- Requires-Dist: simplejson (>=3.5.1)
29
+ Requires-Dist: requests (>=2.14.2)
30
30
  Requires-Dist: stevedore (>=1.20.0)
31
31
 
32
32
  =======
{osc_lib-3.0.1.dist-info → osc_lib-3.1.0.dist-info}/RECORD RENAMED
@@ -6,7 +6,7 @@ osc_lib/logs.py,sha256=fE2tCRrFps-YMnnu8vzxijcdLniYY-7_K1Z94kKDu9A,7127
6
6
  osc_lib/shell.py,sha256=DWKuPDVpEpruiawF0lhEsZ-dykQgCMPgiIrd3O0-zTY,19223
7
7
  osc_lib/version.py,sha256=Csam3SVWQ7sUSXbOOBIPyv9DAHv_EfMIPpExsXYMVX0,710
8
8
  osc_lib/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
9
- osc_lib/api/api.py,sha256=boBrpyKAKiKjt87EnnM3JYX8J03q6JLFlkekxUSoFbc,12554
9
+ osc_lib/api/api.py,sha256=qXPa5ewTgUfMsXe0KLlO04JoH-fHEuaa7TO-E72GzoI,12551
10
10
  osc_lib/api/auth.py,sha256=DeFE5zOSAIdai6iDdf1nk9gijEX2Uc0PBVmGnwB7eJU,8177
11
11
  osc_lib/api/utils.py,sha256=JDpM-vQUeEL_vYBYfj-WVM_mAhxA6KDmnTTYU9TleYY,3159
12
12
  osc_lib/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -42,10 +42,10 @@ osc_lib/tests/utils/test_utils.py,sha256=GvnsRhilCNLzoSH1a1EQr4FxU7JAm_NcQuan70t
42
42
  osc_lib/utils/__init__.py,sha256=tI8GVdOZcMU0I-08Y0awYW7sMzOykw2ja-l9RFrPeKc,27985
43
43
  osc_lib/utils/columns.py,sha256=Qt4wC9biUEJQ14PUi97odzSztIBY1ZOWD0YfYVmVDFY,3963
44
44
  osc_lib/utils/tags.py,sha256=-OTKm4Bhv6GZAzO-yTOXP10uiYurN1sK3Rf1yb07r0M,7971
45
- osc_lib-3.0.1.dist-info/AUTHORS,sha256=vo7hWhmcT_06HhgzRDcHrbk5DMqb2Cq2k7wEGIpghG4,6517
46
- osc_lib-3.0.1.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
47
- osc_lib-3.0.1.dist-info/METADATA,sha256=_El8XTQLSfzeg3PLhE3vbyuonr2Caj_XOWgEhckN1Z0,3603
48
- osc_lib-3.0.1.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
49
- osc_lib-3.0.1.dist-info/pbr.json,sha256=PZSReK1M89MKVjTZr-BnJ8KiJUUg88CAMSIlJkgH6pA,46
50
- osc_lib-3.0.1.dist-info/top_level.txt,sha256=2gBTdue3DjRADXu0aOKF83SmJiKaCwfZ9z6hzCrjYr4,8
51
- osc_lib-3.0.1.dist-info/RECORD,,
45
+ osc_lib-3.1.0.dist-info/AUTHORS,sha256=yVUdD_JEtMo1ijk-tg-cee2X-x-b5V-tQaXJKiWpWZU,6562
46
+ osc_lib-3.1.0.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
47
+ osc_lib-3.1.0.dist-info/METADATA,sha256=D7oEOOME7JvP5tXhW_B7KuCJn4NNh6eHYiZK-g0MzeA,3602
48
+ osc_lib-3.1.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
49
+ osc_lib-3.1.0.dist-info/pbr.json,sha256=-LLuv6AzZVJrDQP6jjhu1i1KkU1DTfZRLZgrpgDcZzI,46
50
+ osc_lib-3.1.0.dist-info/top_level.txt,sha256=2gBTdue3DjRADXu0aOKF83SmJiKaCwfZ9z6hzCrjYr4,8
51
+ osc_lib-3.1.0.dist-info/RECORD,,
osc_lib-3.1.0.dist-info/pbr.json ADDED
@@ -0,0 +1 @@
1
+ {"git_version": "f9bcdec", "is_release": true}
osc_lib-3.0.1.dist-info/pbr.json DELETED
@@ -1 +0,0 @@
1
- {"git_version": "73ecaa7", "is_release": true}