Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
6b622beb
Commit
6b622beb
authored
Aug 11, 2012
by
Dietmar Schinnerl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added filtering of non-JSON lines.
parent
fbdddc7c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
6 deletions
+15
-6
lib/ansible/utils.py
+15
-6
No files found.
lib/ansible/utils.py
View file @
6b622beb
...
...
@@ -120,7 +120,7 @@ def json_loads(data):
def
parse_json
(
raw_data
):
''' this version for module return data only '''
data
=
filter_leading_
garbage
(
raw_data
)
data
=
filter_leading_
non_json_lines
(
raw_data
)
try
:
return
json
.
loads
(
data
)
...
...
@@ -420,11 +420,20 @@ def last_non_blank_line(lines):
return
""
# we shouldn't come here (no lines?) but let's pretend nothing happend
# We can't return all lines here because calling code expects only one
# line. And since we don't know which line to return we return an empty
# line.
def
line_needs_filtering
(
line
):
return
line
.
startswith
(
'#'
)
or
(
len
(
line
)
==
0
)
def
filter_leading_garbage
(
lines
):
return
lines
def
is_valid_json_line
(
line
):
return
line
.
startswith
(
'='
)
or
line
.
startswith
(
'{'
)
or
line
.
startswith
(
'['
)
def
filter_leading_non_json_lines
(
lines
):
''' we need to filter anything which starts not with '{', '[', ', '=' or is an empty line.
But we filter only leading lines since multiline JSON is valid. '''
filtered_lines
=
''
no_more_filtering
=
False
for
line
in
lines
.
splitlines
():
if
(
no_more_filtering
or
is_valid_json_line
(
line
)):
no_more_filtering
=
True
filtered_lines
+=
line
+
'
\n
'
return
filtered_lines
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment