Mercurial > genshi > mirror

changeset 115:e92fb402ee04 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Various fixes for breakage introduced in [132].
author cmlenz
date Tue, 01 Aug 2006 10:42:48 +0000
parents 4c4e81d12649
children c77c113846d6
files markup/core.py markup/tests/__init__.py markup/tests/filters.py
diffstat 3 files changed, 25 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/markup/core.py
+++ b/markup/core.py
@@ -71,7 +71,7 @@
         filter must be a callable that accepts the stream object as parameter,
         and returns the filtered stream.
         """
-        return Stream(func(html))
+        return Stream(func(self))
 
     def render(self, method='xml', encoding='utf-8', filters=None, **kwargs):
         """Return a string representation of the stream.
--- a/markup/tests/__init__.py
+++ b/markup/tests/__init__.py
@@ -16,12 +16,14 @@
 
 def suite():
     import markup
-    from markup.tests import builder, core, eval, input, output, path, template
+    from markup.tests import builder, core, eval, filters, input, output, \
+                             path, template
     suite = unittest.TestSuite()
     suite.addTest(doctest.DocTestSuite(markup))
     suite.addTest(builder.suite())
     suite.addTest(core.suite())
     suite.addTest(eval.suite())
+    suite.addTest(filters.suite())
     suite.addTest(input.suite())
     suite.addTest(output.suite())
     suite.addTest(path.suite())
--- a/markup/tests/filters.py
+++ b/markup/tests/filters.py
@@ -24,20 +24,20 @@
     def test_sanitize_unchanged(self):
         html = HTML('<a href="#">fo<br />o</a>')
         self.assertEquals('<a href="#">fo<br/>o</a>',
-                          str(html.filter(HTMLSanitizer()))
+                          str(html.filter(HTMLSanitizer())))
 
     def test_sanitize_escape_text(self):
         html = HTML('<a href="#">fo&amp;</a>')
         self.assertEquals('<a href="#">fo&amp;</a>',
-                          str(html.filter(HTMLSanitizer()))
+                          str(html.filter(HTMLSanitizer())))
         html = HTML('<a href="#">&lt;foo&gt;</a>')
         self.assertEquals('<a href="#">&lt;foo&gt;</a>',
-                          str(html.filter(HTMLSanitizer()))
+                          str(html.filter(HTMLSanitizer())))
 
     def test_sanitize_entityref_text(self):
         html = HTML('<a href="#">fo&ouml;</a>')
         self.assertEquals(u'<a href="#">fo&ouml;</a>',
-                          str(html.filter(HTMLSanitizer()))
+                          str(html.filter(HTMLSanitizer())))
 
     def test_sanitize_escape_attr(self):
         html = HTML('<div title="&lt;foo&gt;"></div>')
@@ -47,73 +47,73 @@
     def test_sanitize_close_empty_tag(self):
         html = HTML('<a href="#">fo<br>o</a>')
         self.assertEquals('<a href="#">fo<br/>o</a>',
-                          str(html.filter(HTMLSanitizer()))
+                          str(html.filter(HTMLSanitizer())))
 
     def test_sanitize_invalid_entity(self):
         html = HTML('&junk;')
-        self.assertEquals('&junk;', str(html.filter(HTMLSanitizer()))
+        self.assertEquals('&junk;', str(html.filter(HTMLSanitizer())))
 
     def test_sanitize_remove_script_elem(self):
         html = HTML('<script>alert("Foo")</script>')
-        self.assertEquals('', str(html.filter(HTMLSanitizer()))
+        self.assertEquals('', str(html.filter(HTMLSanitizer())))
         html = HTML('<SCRIPT SRC="http://example.com/"></SCRIPT>')
-        self.assertEquals('', str(html.filter(HTMLSanitizer()))
+        self.assertEquals('', str(html.filter(HTMLSanitizer())))
         self.assertRaises(ParseError, HTML, '<SCR\0IPT>alert("foo")</SCR\0IPT>')
         self.assertRaises(ParseError, HTML,
                           '<SCRIPT&XYZ SRC="http://example.com/"></SCRIPT>')
 
     def test_sanitize_remove_onclick_attr(self):
         html = HTML('<div onclick=\'alert("foo")\' />')
-        self.assertEquals('<div/>', str(html.filter(HTMLSanitizer()))
+        self.assertEquals('<div/>', str(html.filter(HTMLSanitizer())))
 
     def test_sanitize_remove_style_scripts(self):
         # Inline style with url() using javascript: scheme
         html = HTML('<DIV STYLE=\'background: url(javascript:alert("foo"))\'>')
-        self.assertEquals('<div/>', str(html.filter(HTMLSanitizer()))
+        self.assertEquals('<div/>', str(html.filter(HTMLSanitizer())))
         # Inline style with url() using javascript: scheme, using control char
         html = HTML('<DIV STYLE=\'background: url(&#1;javascript:alert("foo"))\'>')
-        self.assertEquals('<div/>', str(html.filter(HTMLSanitizer()))
+        self.assertEquals('<div/>', str(html.filter(HTMLSanitizer())))
         # Inline style with url() using javascript: scheme, in quotes
         html = HTML('<DIV STYLE=\'background: url("javascript:alert(foo)")\'>')
-        self.assertEquals('<div/>', str(html.filter(HTMLSanitizer()))
+        self.assertEquals('<div/>', str(html.filter(HTMLSanitizer())))
         # IE expressions in CSS not allowed
         html = HTML('<DIV STYLE=\'width: expression(alert("foo"));\'>')
-        self.assertEquals('<div/>', str(html.filter(HTMLSanitizer()))
+        self.assertEquals('<div/>', str(html.filter(HTMLSanitizer())))
         html = HTML('<DIV STYLE=\'background: url(javascript:alert("foo"));'
                                  'color: #fff\'>')
         self.assertEquals('<div style="color: #fff"/>',
-                          str(html.filter(HTMLSanitizer()))
+                          str(html.filter(HTMLSanitizer())))
 
     def test_sanitize_remove_src_javascript(self):
         html = HTML('<img src=\'javascript:alert("foo")\'>')
-        self.assertEquals('<img/>', str(html.filter(HTMLSanitizer()))
+        self.assertEquals('<img/>', str(html.filter(HTMLSanitizer())))
         # Case-insensitive protocol matching
         html = HTML('<IMG SRC=\'JaVaScRiPt:alert("foo")\'>')
-        self.assertEquals('<img/>', str(html.filter(HTMLSanitizer()))
+        self.assertEquals('<img/>', str(html.filter(HTMLSanitizer())))
         # Grave accents (not parsed)
         self.assertRaises(ParseError, HTML,
                           '<IMG SRC=`javascript:alert("RSnake says, \'foo\'")`>')
         # Protocol encoded using UTF-8 numeric entities
         html = HTML('<IMG SRC=\'&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;'
                     '&#112;&#116;&#58;alert("foo")\'>')
-        self.assertEquals('<img/>', str(html.filter(HTMLSanitizer()))
+        self.assertEquals('<img/>', str(html.filter(HTMLSanitizer())))
         # Protocol encoded using UTF-8 numeric entities without a semicolon
         # (which is allowed because the max number of digits is used)
         html = HTML('<IMG SRC=\'&#0000106&#0000097&#0000118&#0000097'
                     '&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116'
                     '&#0000058alert("foo")\'>')
-        self.assertEquals('<img/>', str(html.filter(HTMLSanitizer()))
+        self.assertEquals('<img/>', str(html.filter(HTMLSanitizer())))
         # Protocol encoded using UTF-8 numeric hex entities without a semicolon
         # (which is allowed because the max number of digits is used)
         html = HTML('<IMG SRC=\'&#x6A&#x61&#x76&#x61&#x73&#x63&#x72&#x69'
                     '&#x70&#x74&#x3A;alert("foo")\'>')
-        self.assertEquals('<img/>', str(html.filter(HTMLSanitizer()))
+        self.assertEquals('<img/>', str(html.filter(HTMLSanitizer())))
         # Embedded tab character in protocol
         html = HTML('<IMG SRC=\'jav\tascript:alert("foo");\'>')
-        self.assertEquals('<img/>', str(html.filter(HTMLSanitizer()))
+        self.assertEquals('<img/>', str(html.filter(HTMLSanitizer())))
         # Embedded tab character in protocol, but encoded this time
         html = HTML('<IMG SRC=\'jav&#x09;ascript:alert("foo");\'>')
-        self.assertEquals('<img/>', str(html.filter(HTMLSanitizer()))
+        self.assertEquals('<img/>', str(html.filter(HTMLSanitizer())))
 
 
 def suite():
Copyright (C) 2012-2017 Edgewall Software