# HG changeset patch # User cmlenz # Date 1258059492 0 # Node ID 37fb3988647a27ee988e8506c37d75084183d4b3 # Parent e098d29c4de1d6465a16ca828d3197245190346b Make the output tests skip the encoding step. diff --git a/genshi/core.py b/genshi/core.py --- a/genshi/core.py +++ b/genshi/core.py @@ -663,7 +663,7 @@ return hash(self.uri) def __repr__(self): - return 'Namespace(%s)' % stringrepr(self.uri) + return '%s(%s)' % (type(self).__name__, stringrepr(self.uri)) def __str__(self): return self.uri.encode('utf-8') @@ -724,4 +724,4 @@ return (self.lstrip('{'),) def __repr__(self): - return 'QName(%s)' % stringrepr(self.lstrip('{')) + return '%s(%s)' % (type(self).__name__, stringrepr(self.lstrip('{'))) diff --git a/genshi/tests/core.py b/genshi/tests/core.py --- a/genshi/tests/core.py +++ b/genshi/tests/core.py @@ -57,7 +57,7 @@ pickle.dump(xml, buf, 2) buf.seek(0) xml = pickle.load(buf) - self.assertEquals('
  • Foo
    • ', xml.render()) + self.assertEquals('
  • Foo
    • ', xml.render(encoding=None)) class MarkupTestCase(unittest.TestCase): diff --git a/genshi/tests/output.py b/genshi/tests/output.py --- a/genshi/tests/output.py +++ b/genshi/tests/output.py @@ -25,7 +25,7 @@ def test_with_xml_decl(self): stream = Stream([(Stream.XML_DECL, ('1.0', None, -1), (None, -1, -1))]) - output = stream.render(XMLSerializer, doctype='xhtml') + output = stream.render(XMLSerializer, doctype='xhtml', encoding=None) self.assertEqual('\n' '\n', @@ -44,7 +44,7 @@ stream = Stream([(Stream.DOCTYPE, ('html', '-//W3C//DTD HTML 4.01//EN', None), (None, -1, -1))]) - output = stream.render(XMLSerializer) + output = stream.render(XMLSerializer, encoding=None) self.assertEqual('\n', output) @@ -54,7 +54,7 @@ ('html', None, 'http://www.w3.org/TR/html4/strict.dtd'), (None, -1, -1)) ]) - output = stream.render(XMLSerializer) + output = stream.render(XMLSerializer, encoding=None) self.assertEqual('\n', output) @@ -62,12 +62,13 @@ def test_doctype_in_stream_no_pubid_or_sysid(self): stream = Stream([(Stream.DOCTYPE, ('html', None, None), (None, -1, -1))]) - output = stream.render(XMLSerializer) + output = stream.render(XMLSerializer, encoding=None) self.assertEqual('\n', output) def test_serializer_doctype(self): stream = Stream([]) - output = stream.render(XMLSerializer, doctype=DocType.HTML_STRICT) + output = stream.render(XMLSerializer, doctype=DocType.HTML_STRICT, + encoding=None) self.assertEqual('\n', @@ -77,7 +78,8 @@ stream = Stream([ (Stream.DOCTYPE, ('html', None, None), (None, -1, -1)) ]) - output = stream.render(XMLSerializer, doctype=DocType.HTML_STRICT) + output = stream.render(XMLSerializer, doctype=DocType.HTML_STRICT, + encoding=None) self.assertEqual('\n', @@ -85,12 +87,12 @@ def test_comment(self): stream = Stream([(Stream.COMMENT, 'foo bar', (None, -1, -1))]) - output = stream.render(XMLSerializer) + output = stream.render(XMLSerializer, encoding=None) self.assertEqual('', output) def test_processing_instruction(self): stream = Stream([(Stream.PI, ('python', 'x = 2'), (None, -1, -1))]) - output = stream.render(XMLSerializer) + output = stream.render(XMLSerializer, encoding=None) self.assertEqual('', output) def test_nested_default_namespaces(self): @@ -111,7 +113,7 @@ (Stream.END, QName('http://example.org/}div'), (None, -1, -1)), (Stream.END_NS, '', (None, -1, -1)) ]) - output = stream.render(XMLSerializer) + output = stream.render(XMLSerializer, encoding=None) self.assertEqual("""

    @@ -135,7 +137,7 @@ (Stream.END, QName('http://example.org/}div'), (None, -1, -1)), (Stream.END_NS, 'x', (None, -1, -1)) ]) - output = stream.render(XMLSerializer) + output = stream.render(XMLSerializer, encoding=None) self.assertEqual(""" @@ -157,7 +159,7 @@ (Stream.TEXT, '\n ', (None, -1, -1)), (Stream.END, QName('div'), (None, -1, -1)), ]) - output = stream.render(XMLSerializer) + output = stream.render(XMLSerializer, encoding=None) self.assertEqual("""

    @@ -179,7 +181,7 @@ (Stream.TEXT, '\n ', (None, -1, -1)), (Stream.END, QName('div'), (None, -1, -1)), ]) - output = stream.render(XMLSerializer) + output = stream.render(XMLSerializer, encoding=None) self.assertEqual("""

    @@ -197,7 +199,7 @@ """ - output = XML(text).render(XMLSerializer) + output = XML(text).render(XMLSerializer, encoding=None) self.assertEqual(text, output) @@ -205,7 +207,7 @@ def test_xml_decl_dropped(self): stream = Stream([(Stream.XML_DECL, ('1.0', None, -1), (None, -1, -1))]) - output = stream.render(XHTMLSerializer, doctype='xhtml') + output = stream.render(XHTMLSerializer, doctype='xhtml', encoding=None) self.assertEqual('\n', @@ -214,7 +216,7 @@ def test_xml_decl_included(self): stream = Stream([(Stream.XML_DECL, ('1.0', None, -1), (None, -1, -1))]) output = stream.render(XHTMLSerializer, doctype='xhtml', - drop_xml_decl=False) + drop_xml_decl=False, encoding=None) self.assertEqual('\n' 'English text

    ' - output = XML(text).render(XHTMLSerializer) + output = XML(text).render(XHTMLSerializer, encoding=None) self.assertEqual('

    English text

    ', output) def test_xml_lang_nodup(self): text = '

    English text

    ' - output = XML(text).render(XHTMLSerializer) + output = XML(text).render(XHTMLSerializer, encoding=None) self.assertEqual('

    English text

    ', output) def test_textarea_whitespace(self): content = '\nHey there. \n\n I am indented.\n' stream = XML('' % content) - output = stream.render(XHTMLSerializer) + output = stream.render(XHTMLSerializer, encoding=None) self.assertEqual('' % content, output) def test_pre_whitespace(self): content = '\nHey there. \n\n I am indented.\n' stream = XML('
    %s
    ' % content) - output = stream.render(XHTMLSerializer) + output = stream.render(XHTMLSerializer, encoding=None) self.assertEqual('
    %s
    ' % content, output) def test_xml_space(self): text = ' Do not mess \n\n with me ' - output = XML(text).render(XHTMLSerializer) + output = XML(text).render(XHTMLSerializer, encoding=None) self.assertEqual(' Do not mess \n\n with me ', output) def test_empty_script(self): text = """ """, output) @@ -261,28 +263,28 @@ text = """""" - output = XML(text).render(XHTMLSerializer) + output = XML(text).render(XHTMLSerializer, encoding=None) self.assertEqual(text, output) def test_script_escaping_with_namespace(self): text = """""" - output = XML(text).render(XHTMLSerializer) + output = XML(text).render(XHTMLSerializer, encoding=None) self.assertEqual(text, output) def test_style_escaping(self): text = """""" - output = XML(text).render(XHTMLSerializer) + output = XML(text).render(XHTMLSerializer, encoding=None) self.assertEqual(text, output) def test_style_escaping_with_namespace(self): text = """""" - output = XML(text).render(XHTMLSerializer) + output = XML(text).render(XHTMLSerializer, encoding=None) self.assertEqual(text, output) def test_embedded_svg(self): @@ -295,14 +297,14 @@ """ - output = XML(text).render(XHTMLSerializer) + output = XML(text).render(XHTMLSerializer, encoding=None) self.assertEqual(text, output) def test_xhtml_namespace_prefix(self): text = """
    Hello
    """ - output = XML(text).render(XHTMLSerializer) + output = XML(text).render(XHTMLSerializer, encoding=None) self.assertEqual(text, output) def test_nested_default_namespaces(self): @@ -323,7 +325,7 @@ (Stream.END, QName('div'), (None, -1, -1)), (Stream.END_NS, '', (None, -1, -1)) ]) - output = stream.render(XHTMLSerializer) + output = stream.render(XHTMLSerializer, encoding=None) self.assertEqual("""

    @@ -347,7 +349,7 @@ (Stream.END, QName('div'), (None, -1, -1)), (Stream.END_NS, 'x', (None, -1, -1)) ]) - output = stream.render(XHTMLSerializer) + output = stream.render(XHTMLSerializer, encoding=None) self.assertEqual("""

    @@ -355,7 +357,8 @@ def test_html5_doctype(self): stream = HTML('') - output = stream.render(XHTMLSerializer, doctype=DocType.HTML5) + output = stream.render(XHTMLSerializer, doctype=DocType.HTML5, + encoding=None) self.assertEqual('\n', output) @@ -363,39 +366,39 @@ def test_xml_lang(self): text = '

    English text

    ' - output = XML(text).render(HTMLSerializer) + output = XML(text).render(HTMLSerializer, encoding=None) self.assertEqual('

    English text

    ', output) def test_xml_lang_nodup(self): text = '

    English text

    ' - output = XML(text).render(HTMLSerializer) + output = XML(text).render(HTMLSerializer, encoding=None) self.assertEqual('

    English text

    ', output) def test_textarea_whitespace(self): content = '\nHey there. \n\n I am indented.\n' stream = XML('' % content) - output = stream.render(HTMLSerializer) + output = stream.render(HTMLSerializer, encoding=None) self.assertEqual('' % content, output) def test_pre_whitespace(self): content = '\nHey there. \n\n I am indented.\n' stream = XML('
    %s
    ' % content) - output = stream.render(HTMLSerializer) + output = stream.render(HTMLSerializer, encoding=None) self.assertEqual('
    %s
    ' % content, output) def test_xml_space(self): text = ' Do not mess \n\n with me ' - output = XML(text).render(HTMLSerializer) + output = XML(text).render(HTMLSerializer, encoding=None) self.assertEqual(' Do not mess \n\n with me ', output) def test_empty_script(self): text = '', output) def test_script_escaping(self): text = '' - output = XML(text).render(HTMLSerializer) + output = XML(text).render(HTMLSerializer, encoding=None) self.assertEqual('', output) @@ -403,14 +406,14 @@ text = """""" - output = XML(text).render(HTMLSerializer) + output = XML(text).render(HTMLSerializer, encoding=None) self.assertEqual("""""", output) def test_style_escaping(self): text = '' - output = XML(text).render(HTMLSerializer) + output = XML(text).render(HTMLSerializer, encoding=None) self.assertEqual('', output) @@ -418,14 +421,15 @@ text = """""" - output = XML(text).render(HTMLSerializer) + output = XML(text).render(HTMLSerializer, encoding=None) self.assertEqual("""""", output) def test_html5_doctype(self): stream = HTML('') - output = stream.render(HTMLSerializer, doctype=DocType.HTML5) + output = stream.render(HTMLSerializer, doctype=DocType.HTML5, + encoding=None) self.assertEqual('\n', output)