python-openstackclient 6.6.0__py3-none-any.whl → 6.6.1__py3-none-any.whl

openstackclient/api/api.py

@@ -12,11 +12,10 @@
 #
 
 """Base API Library"""
-
 from keystoneauth1 import exceptions as ks_exceptions
 from keystoneauth1 import session as ks_session
 from osc_lib import exceptions
-import simplejson as json
+import requests
 
 from openstackclient.i18n import _
 
@@ -118,7 +117,7 @@ class BaseAPI(KeystoneSession):
         # Should this move into _requests()?
         try:
             return ret.json()
-        except json.JSONDecodeError:
+        except requests.JSONDecodeError:
             return ret
 
     def delete(self, url, session=None, **params):
@@ -169,7 +168,7 @@ class BaseAPI(KeystoneSession):
             )
         try:
             return ret.json()
-        except json.JSONDecodeError:
+        except requests.JSONDecodeError:
             return ret
 
     # Layered actions built on top of the basic action methods do not

{python_openstackclient-6.6.0.dist-info → python_openstackclient-6.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-openstackclient
-Version: 6.6.0
+Version: 6.6.1
 Summary: OpenStack Command-line Client
 Home-page: https://docs.openstack.org/python-openstackclient/latest/
 Author: OpenStack
@@ -29,6 +29,7 @@ Requires-Dist: pbr (!=2.1.0,>=2.0.0)
 Requires-Dist: python-cinderclient (>=3.3.0)
 Requires-Dist: python-keystoneclient (>=3.22.0)
 Requires-Dist: python-novaclient (>=18.1.0)
+Requires-Dist: requests (>=2.14.2)
 Requires-Dist: stevedore (>=2.0.1)
 
 ========================

{python_openstackclient-6.6.0.dist-info → python_openstackclient-6.6.1.dist-info}/RECORD

@@ -2,7 +2,7 @@ openstackclient/__init__.py,sha256=80udUgNTRDOEPgCARVgk6BCV0sXWpg1VP9N408GVXiA,7
 openstackclient/i18n.py,sha256=daSSioNcZ4XxHuw22wSyf6WSz_g8D1tf6d36ghvO6Bw,791
 openstackclient/shell.py,sha256=BYqdTgiq6VVHiPSc1uT0i00-iWGoh0zsfY1Xm7Q1D6E,5695
 openstackclient/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openstackclient/api/api.py,sha256=75eBSbk-31FX0SsdqUiJqidfuFdmGSWF80wxsWxeYqo,9762
+openstackclient/api/api.py,sha256=CuzS6UfP-PktA3Za3KGGrSHZH7S9iKmraJVftN67B4Q,9759
 openstackclient/api/compute_v2.py,sha256=yFBy3lCrirNIpmmck0Pgwsrb1PEKZoZQSibZ3V0u3cw,16261
 openstackclient/api/image_v1.py,sha256=7uirFcJzDWeTXIeW41tgkwAmLM5plwIb12AUMXOnDzE,2595
 openstackclient/api/image_v2.py,sha256=GSM09toS6rcLzbtyhKl_FvQ7UeWJ3EcvSNBdVIk9ryA,2602
@@ -479,11 +479,11 @@ openstackclient/volume/v3/volume_group.py,sha256=OQ8ToL0SCCnOFfyOgx-bFNt2N0ZNCkR
 openstackclient/volume/v3/volume_group_snapshot.py,sha256=sm7B3MSiNYw4eCzoZv8Ko4Y0q_TZ0wVEpqdVblLswEY,6916
 openstackclient/volume/v3/volume_group_type.py,sha256=ZDQ_MF7CTLj67TvL0rbjo3JVtKdt1czL9jD-nJS1y40,12508
 openstackclient/volume/v3/volume_message.py,sha256=V-9EKmZESCRDZ4mbXihwOTUTYKk5SZZwri_H2GSBn0s,4937
-python_openstackclient-6.6.0.dist-info/AUTHORS,sha256=gc7kKvi86ykx3MAS_xdxf7veisBYJ2gLp0dhXOko0jg,21117
-python_openstackclient-6.6.0.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
-python_openstackclient-6.6.0.dist-info/METADATA,sha256=7qwOZ_Kmalv2z9MMlWK2WZJ9pYYImmWTk3YVcL7RqbI,6539
-python_openstackclient-6.6.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-python_openstackclient-6.6.0.dist-info/entry_points.txt,sha256=eT2sSGcTdC--3CWRz5UV0VMG9wKlR_tCaC7CPN6QPjM,52569
-python_openstackclient-6.6.0.dist-info/pbr.json,sha256=3LkiXSa7Q6Uu8-OwNFR_NEzPe_y3H-NzE97iJ_j69S0,47
-python_openstackclient-6.6.0.dist-info/top_level.txt,sha256=htg7z9oZgysRuVUHn-m1Bk6XLGOeV65nMbZX9H8qhs0,16
-python_openstackclient-6.6.0.dist-info/RECORD,,
+python_openstackclient-6.6.1.dist-info/AUTHORS,sha256=gc7kKvi86ykx3MAS_xdxf7veisBYJ2gLp0dhXOko0jg,21117
+python_openstackclient-6.6.1.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
+python_openstackclient-6.6.1.dist-info/METADATA,sha256=htv1P2lmHoIw1UTgI2pUyIih2YYvS-FH80_D-JhYiWY,6574
+python_openstackclient-6.6.1.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
+python_openstackclient-6.6.1.dist-info/entry_points.txt,sha256=eT2sSGcTdC--3CWRz5UV0VMG9wKlR_tCaC7CPN6QPjM,52569
+python_openstackclient-6.6.1.dist-info/pbr.json,sha256=rLJ-sQOAfFOi2iEbcEnDjxBX6y5ruv5Y15Yb5nNJrYk,47
+python_openstackclient-6.6.1.dist-info/top_level.txt,sha256=htg7z9oZgysRuVUHn-m1Bk6XLGOeV65nMbZX9H8qhs0,16
+python_openstackclient-6.6.1.dist-info/RECORD,,

python_openstackclient-6.6.1.dist-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "685b7506", "is_release": true}

python_openstackclient-6.6.0.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "2f9a5237", "is_release": true}