Skip to content

Commit 6942cfb

Browse files
author
Shiyue Cheng
committed
Small fix for if logic in simulation mode
1 parent f8fcaf6 commit 6942cfb

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

meraki/rest_session.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,7 @@ def get(self, metadata, url, params=None):
132132
metadata['url'] = url
133133
metadata['params'] = params
134134
response = self.request(metadata, 'GET', url, params=params)
135-
text = response.text.strip()
136-
return response.json() if response and text else None
135+
return response.json() if response and response.text.strip() else None
137136

138137
def get_pages(self, metadata, url, params=None, total_pages=-1, direction='next'):
139138
if type(total_pages) == str and total_pages.lower() == 'all':
@@ -193,16 +192,14 @@ def post(self, metadata, url, json=None):
193192
metadata['url'] = url
194193
metadata['json'] = json
195194
response = self.request(metadata, 'POST', url, json=json)
196-
text = response.text.strip()
197-
return response.json() if response and text else None
195+
return response.json() if response and response.text.strip() else None
198196

199197
def put(self, metadata, url, json=None):
200198
metadata['method'] = 'PUT'
201199
metadata['url'] = url
202200
metadata['json'] = json
203201
response = self.request(metadata, 'PUT', url, json=json)
204-
text = response.text.strip()
205-
return response.json() if response and text else None
202+
return response.json() if response and response.text.strip() else None
206203

207204
def delete(self, metadata, url):
208205
metadata['method'] = 'DELETE'

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
setup(
1212
name='meraki',
13-
version='0.70.3',
13+
version='0.70.4',
1414
packages=find_packages(),
1515
include_package_data=True,
1616
install_requires=['requests'],

0 commit comments

Comments
 (0)