Skip to content

Benchmark script / more consistent string concatenation syntax #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Benchmark script / more consistent string concatenation syntax #31

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cfbe4e4
escaping of text nodes to prevent XSS
Jul 11, 2017
262c314
small beauty fix, use tuples for text types
Jul 11, 2017
ef4efcf
added a test for xss - fails because we passed a non-json string. let…
Jul 11, 2017
092d6e5
added additional tests, catched a json.loads exception where the user…
Jul 11, 2017
d58ed8a
added testcase without escaping
Jul 11, 2017
63d707f
documentation
Jul 11, 2017
2b78216
Merge branch 'master' of https://github.com/softvar/json2html
Aug 21, 2017
9cc63b4
trying to create less string instances in convert_object
Aug 21, 2017
3aa4937
cleaning up some code - string concatenations with + are discouraged …
Aug 21, 2017
f77070f
nicer syntax
Aug 21, 2017
e19412f
fixed test issues
Aug 21, 2017
905e8e4
typo
Aug 21, 2017
537c3e6
a bit more compact
Aug 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
added testcase without escaping
  • Loading branch information
Michel Müller committed Jul 11, 2017
commit d58ed8a068bbd45d2607b9b066fa631ffacfbc8d
4 changes: 4 additions & 0 deletions test/run_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,10 @@ def test_xss(self):
json2html.convert("<script></script>"),
u"&lt;script&gt;&lt;/script&gt;"
)
self.assertEqual(
json2html.convert("<script></script>", escape=False),
u"<script></script>"
)

def test_all(self):
for test_definition in self.test_json:
Expand Down