From 7f63b20b819b83afef0ddadc2e210ddce32a2be3 Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Sat, 14 Mar 2015 20:39:46 -0400 Subject: Removed deprecated safe_mode. --- tests/safe_mode/html_then_blockquote.html | 6 --- tests/safe_mode/html_then_blockquote.txt | 6 --- tests/safe_mode/inline-html-advanced.html | 11 ----- tests/safe_mode/inline-html-advanced.txt | 14 ------- tests/safe_mode/inline-html-comments.html | 8 ---- tests/safe_mode/inline-html-comments.txt | 13 ------ tests/safe_mode/inline-html-simple.html | 46 -------------------- tests/safe_mode/inline-html-simple.txt | 70 ------------------------------- tests/safe_mode/link-targets.html | 2 - tests/safe_mode/link-targets.txt | 3 -- tests/safe_mode/remove.html | 35 ---------------- tests/safe_mode/remove.txt | 70 ------------------------------- tests/safe_mode/replace.html | 35 ---------------- tests/safe_mode/replace.txt | 70 ------------------------------- tests/safe_mode/script_tags.html | 20 --------- tests/safe_mode/script_tags.txt | 33 --------------- tests/safe_mode/unsafe_urls.html | 20 --------- tests/safe_mode/unsafe_urls.txt | 27 ------------ tests/test_apis.py | 36 +--------------- tests/test_legacy.py | 9 ---- 20 files changed, 2 insertions(+), 532 deletions(-) delete mode 100644 tests/safe_mode/html_then_blockquote.html delete mode 100644 tests/safe_mode/html_then_blockquote.txt delete mode 100644 tests/safe_mode/inline-html-advanced.html delete mode 100644 tests/safe_mode/inline-html-advanced.txt delete mode 100644 tests/safe_mode/inline-html-comments.html delete mode 100644 tests/safe_mode/inline-html-comments.txt delete mode 100644 tests/safe_mode/inline-html-simple.html delete mode 100644 tests/safe_mode/inline-html-simple.txt delete mode 100644 tests/safe_mode/link-targets.html delete mode 100644 tests/safe_mode/link-targets.txt delete mode 100644 tests/safe_mode/remove.html delete mode 100644 tests/safe_mode/remove.txt delete mode 100644 tests/safe_mode/replace.html delete mode 100644 tests/safe_mode/replace.txt delete mode 100644 tests/safe_mode/script_tags.html delete mode 100644 tests/safe_mode/script_tags.txt delete mode 100644 tests/safe_mode/unsafe_urls.html delete mode 100644 tests/safe_mode/unsafe_urls.txt (limited to 'tests') diff --git a/tests/safe_mode/html_then_blockquote.html b/tests/safe_mode/html_then_blockquote.html deleted file mode 100644 index 62d24e4..0000000 --- a/tests/safe_mode/html_then_blockquote.html +++ /dev/null @@ -1,6 +0,0 @@ -

to:

-

<td /><td style="text-align: center; white-space: nowrap;"><br />

-
-

3) You don't need to alter all localization files. - Adding the new labels to the en_US files will do it.

-
\ No newline at end of file diff --git a/tests/safe_mode/html_then_blockquote.txt b/tests/safe_mode/html_then_blockquote.txt deleted file mode 100644 index 544df67..0000000 --- a/tests/safe_mode/html_then_blockquote.txt +++ /dev/null @@ -1,6 +0,0 @@ -to: - -
- -> 3) You don't need to alter all localization files. -> Adding the new labels to the en_US files will do it. diff --git a/tests/safe_mode/inline-html-advanced.html b/tests/safe_mode/inline-html-advanced.html deleted file mode 100644 index e9dd2ec..0000000 --- a/tests/safe_mode/inline-html-advanced.html +++ /dev/null @@ -1,11 +0,0 @@ -

Simple block on one line:

-

<div>foo</div>

-

And nested without indentation:

-

<div> -<div> -<div> -foo -</div> -</div> -<div>bar</div> -</div>

\ No newline at end of file diff --git a/tests/safe_mode/inline-html-advanced.txt b/tests/safe_mode/inline-html-advanced.txt deleted file mode 100644 index 9d71ddc..0000000 --- a/tests/safe_mode/inline-html-advanced.txt +++ /dev/null @@ -1,14 +0,0 @@ -Simple block on one line: - -
foo
- -And nested without indentation: - -
-
-
-foo -
-
-
bar
-
diff --git a/tests/safe_mode/inline-html-comments.html b/tests/safe_mode/inline-html-comments.html deleted file mode 100644 index 0f1e417..0000000 --- a/tests/safe_mode/inline-html-comments.html +++ /dev/null @@ -1,8 +0,0 @@ -

Paragraph one.

-

<!-- This is a simple comment -->

-

<!-- - This is another comment. --->

-

Paragraph two.

-

<!-- one comment block -- -- with two comments -->

-

The end.

\ No newline at end of file diff --git a/tests/safe_mode/inline-html-comments.txt b/tests/safe_mode/inline-html-comments.txt deleted file mode 100644 index 41d830d..0000000 --- a/tests/safe_mode/inline-html-comments.txt +++ /dev/null @@ -1,13 +0,0 @@ -Paragraph one. - - - - - -Paragraph two. - - - -The end. diff --git a/tests/safe_mode/inline-html-simple.html b/tests/safe_mode/inline-html-simple.html deleted file mode 100644 index 1e5df17..0000000 --- a/tests/safe_mode/inline-html-simple.html +++ /dev/null @@ -1,46 +0,0 @@ -

Here's a simple block:

-

<div> - foo -</div>

-

This should be a code block, though:

-
<div>
-    foo
-</div>
-
-

As should this:

-
<div>foo</div>
-
-

Now, nested:

-

<div> - <div> - <div> - foo - </div> - </div> -</div>

-

This should just be an HTML comment:

-

<!-- Comment -->

-

Multiline:

-

<!-- -Blah -Blah --->

-

Code block:

-
<!-- Comment -->
-
-

Just plain comment, with trailing spaces on the line:

-

<!-- foo -->

-

Code:

-
<hr />
-
-

Hr's:

-

<hr>

-

<hr/>

-

<hr />

-

<hr>

-

<hr/>

-

<hr />

-

<hr class="foo" id="bar" />

-

<hr class="foo" id="bar"/>

-

<hr class="foo" id="bar" >

-

<some weird stuff>

\ No newline at end of file diff --git a/tests/safe_mode/inline-html-simple.txt b/tests/safe_mode/inline-html-simple.txt deleted file mode 100644 index 7210750..0000000 --- a/tests/safe_mode/inline-html-simple.txt +++ /dev/null @@ -1,70 +0,0 @@ -Here's a simple block: - -
- foo -
- -This should be a code block, though: - -
- foo -
- -As should this: - -
foo
- -Now, nested: - -
-
-
- foo -
-
-
- -This should just be an HTML comment: - - - -Multiline: - - - -Code block: - - - -Just plain comment, with trailing spaces on the line: - - - -Code: - -
- -Hr's: - -
- -
- -
- -
- -
- -
- -
- -
- -
- - diff --git a/tests/safe_mode/link-targets.html b/tests/safe_mode/link-targets.html deleted file mode 100644 index 768ae5b..0000000 --- a/tests/safe_mode/link-targets.html +++ /dev/null @@ -1,2 +0,0 @@ -

XSS -See http://security.stackexchange.com/q/30330/1261 for details.

\ No newline at end of file diff --git a/tests/safe_mode/link-targets.txt b/tests/safe_mode/link-targets.txt deleted file mode 100644 index 10eebda..0000000 --- a/tests/safe_mode/link-targets.txt +++ /dev/null @@ -1,3 +0,0 @@ -[XSS](javascript://%0Aalert%28'XSS'%29;) -See http://security.stackexchange.com/q/30330/1261 for details. - diff --git a/tests/safe_mode/remove.html b/tests/safe_mode/remove.html deleted file mode 100644 index d86b2b4..0000000 --- a/tests/safe_mode/remove.html +++ /dev/null @@ -1,35 +0,0 @@ -

Here's a simple block:

-

-

This should be a code block, though:

-
<div>
-    foo
-</div>
-
-

As should this:

-
<div>foo</div>
-
-

Now, nested:

-

-

This should just be an HTML comment:

-

-

Multiline:

-

-

Code block:

-
<!-- Comment -->
-
-

Just plain comment, with trailing spaces on the line:

-

-

Code:

-
<hr />
-
-

Hr's:

-

-

-

-

-

-

-

-

-

-

\ No newline at end of file diff --git a/tests/safe_mode/remove.txt b/tests/safe_mode/remove.txt deleted file mode 100644 index 7210750..0000000 --- a/tests/safe_mode/remove.txt +++ /dev/null @@ -1,70 +0,0 @@ -Here's a simple block: - -
- foo -
- -This should be a code block, though: - -
- foo -
- -As should this: - -
foo
- -Now, nested: - -
-
-
- foo -
-
-
- -This should just be an HTML comment: - - - -Multiline: - - - -Code block: - - - -Just plain comment, with trailing spaces on the line: - - - -Code: - -
- -Hr's: - -
- -
- -
- -
- -
- -
- -
- -
- -
- - diff --git a/tests/safe_mode/replace.html b/tests/safe_mode/replace.html deleted file mode 100644 index cb6bfb5..0000000 --- a/tests/safe_mode/replace.html +++ /dev/null @@ -1,35 +0,0 @@ -

Here's a simple block:

-

[HTML_REMOVED]

-

This should be a code block, though:

-
<div>
-    foo
-</div>
-
-

As should this:

-
<div>foo</div>
-
-

Now, nested:

-

[HTML_REMOVED]

-

This should just be an HTML comment:

-

[HTML_REMOVED]

-

Multiline:

-

[HTML_REMOVED]

-

Code block:

-
<!-- Comment -->
-
-

Just plain comment, with trailing spaces on the line:

-

[HTML_REMOVED]

-

Code:

-
<hr />
-
-

Hr's:

-

[HTML_REMOVED]

-

[HTML_REMOVED]

-

[HTML_REMOVED]

-

[HTML_REMOVED]

-

[HTML_REMOVED]

-

[HTML_REMOVED]

-

[HTML_REMOVED]

-

[HTML_REMOVED]

-

[HTML_REMOVED]

-

[HTML_REMOVED]

\ No newline at end of file diff --git a/tests/safe_mode/replace.txt b/tests/safe_mode/replace.txt deleted file mode 100644 index 7210750..0000000 --- a/tests/safe_mode/replace.txt +++ /dev/null @@ -1,70 +0,0 @@ -Here's a simple block: - -
- foo -
- -This should be a code block, though: - -
- foo -
- -As should this: - -
foo
- -Now, nested: - -
-
-
- foo -
-
-
- -This should just be an HTML comment: - - - -Multiline: - - - -Code block: - - - -Just plain comment, with trailing spaces on the line: - - - -Code: - -
- -Hr's: - -
- -
- -
- -
- -
- -
- -
- -
- -
- - diff --git a/tests/safe_mode/script_tags.html b/tests/safe_mode/script_tags.html deleted file mode 100644 index 6c1501b..0000000 --- a/tests/safe_mode/script_tags.html +++ /dev/null @@ -1,20 +0,0 @@ -

This should be stripped/escaped in safe_mode.

-

<script> -alert("Hello world!") -</script>

-

With blank lines.

-

<script>

-

alert("Hello world!")

-

</script>

-

Now with some weirdness

-

<script <!-- -alert("Hello world!") -</script <> `

-

Try another way.

-

<script <!-- -alert("Hello world!") -</script <>

-

This time with blank lines.

-

<script <!--

-

alert("Hello world!")

-

</script <>

\ No newline at end of file diff --git a/tests/safe_mode/script_tags.txt b/tests/safe_mode/script_tags.txt deleted file mode 100644 index 44041c2..0000000 --- a/tests/safe_mode/script_tags.txt +++ /dev/null @@ -1,33 +0,0 @@ -This should be stripped/escaped in safe_mode. - - - -With blank lines. - - - -Now with some weirdness - -`` - -This time with blank lines. - -', safe=False) - return root - - class StoreUnsafeHtml(markdown.extensions.Extension): - def extendMarkdown(self, md, md_globals): - md.treeprocessors.add('unsafe', Unsafe(md), '_end') - - return StoreUnsafeHtml() - class TestOrderedDict(unittest.TestCase): """ Test OrderedDict storage class. """ @@ -655,11 +628,6 @@ class TestCliOptionParsing(unittest.TestCase): self.default_options['encoding'] = 'utf-8' self.assertEqual(options, self.default_options) - def testSafeModeOption(self): - options, logging_level = parse_options(['-s', 'escape']) - self.default_options['safe_mode'] = 'escape' - self.assertEqual(options, self.default_options) - def testOutputFormatOption(self): options, logging_level = parse_options(['-o', 'html5']) self.default_options['output_format'] = 'html5' diff --git a/tests/test_legacy.py b/tests/test_legacy.py index 17c4282..ddc54bb 100644 --- a/tests/test_legacy.py +++ b/tests/test_legacy.py @@ -31,15 +31,6 @@ class TestOptions(LegacyTestCase): no_smart_emphasis = Kwargs(smart_emphasis=False) -class TestSafeMode(LegacyTestCase): - location = os.path.join(parent_test_dir, 'safe_mode') - default_kwargs = Kwargs(safe_mode='escape') - - remove = Kwargs(safe_mode='remove') - - replace = Kwargs(safe_mode='replace') - - class TestPhp(LegacyTestCase): """ Notes on "excluded" tests: -- cgit v1.2.3