wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fall back to ValueError if JSONDecodeError is not available (#38276) (#38423)

Browse source 
(cherry picked from commit e05cad785e)
This commit is contained in:
Nathaniel Case 2018-04-11 09:01:47 -04:00 committed by GitHub
parent 23e57fe095
commit 8b8455523d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/executor/task_executor.py
View file

@ -895,7 +895,8 @@ class TaskExecutor:
else:
try:
result = json.loads(to_text(stderr, errors='surrogate_then_replace'))
except json.decoder.JSONDecodeError:
except getattr(json.decoder, 'JSONDecodeError', ValueError):
# JSONDecodeError only available on Python 3.5+
result = {'error': to_text(stderr, errors='surrogate_then_replace')}
if 'messages' in result:

3
lib/ansible/plugins/connection/persistent.py
View file

@ -115,7 +115,8 @@ class Connection(ConnectionBase):
else:
try:
result = json.loads(to_text(stderr, errors='surrogate_then_replace'))
except json.decoder.JSONDecodeError:
except getattr(json.decoder, 'JSONDecodeError', ValueError):
# JSONDecodeError only available on Python 3.5+
result = {'error': to_text(stderr, errors='surrogate_then_replace')}
if 'messages' in result: