summaryrefslogtreecommitdiff
path: root/src/zope/pagetemplate/tests/test_ptfile.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/zope/pagetemplate/tests/test_ptfile.py')
-rw-r--r--src/zope/pagetemplate/tests/test_ptfile.py113
1 files changed, 57 insertions, 56 deletions
diff --git a/src/zope/pagetemplate/tests/test_ptfile.py b/src/zope/pagetemplate/tests/test_ptfile.py
index 4bf9ac9..f7a0457 100644
--- a/src/zope/pagetemplate/tests/test_ptfile.py
+++ b/src/zope/pagetemplate/tests/test_ptfile.py
@@ -17,6 +17,7 @@ import os
import tempfile
import unittest
+import six
from zope.pagetemplate.pagetemplatefile import PageTemplateFile
@@ -42,78 +43,78 @@ class TypeSniffingTestCase(unittest.TestCase):
def test_sniffer_xml_ascii(self):
self.check_content_type(
- "<?xml version='1.0' encoding='ascii'?><doc/>",
+ b"<?xml version='1.0' encoding='ascii'?><doc/>",
"text/xml")
self.check_content_type(
- "<?xml\tversion='1.0' encoding='ascii'?><doc/>",
+ b"<?xml\tversion='1.0' encoding='ascii'?><doc/>",
"text/xml")
def test_sniffer_xml_utf8(self):
# w/out byte order mark
self.check_content_type(
- "<?xml version='1.0' encoding='utf-8'?><doc/>",
+ b"<?xml version='1.0' encoding='utf-8'?><doc/>",
"text/xml")
self.check_content_type(
- "<?xml\tversion='1.0' encoding='utf-8'?><doc/>",
+ b"<?xml\tversion='1.0' encoding='utf-8'?><doc/>",
"text/xml")
# with byte order mark
self.check_content_type(
- "\xef\xbb\xbf<?xml version='1.0' encoding='utf-8'?><doc/>",
+ b"\xef\xbb\xbf<?xml version='1.0' encoding='utf-8'?><doc/>",
"text/xml")
self.check_content_type(
- "\xef\xbb\xbf<?xml\tversion='1.0' encoding='utf-8'?><doc/>",
+ b"\xef\xbb\xbf<?xml\tversion='1.0' encoding='utf-8'?><doc/>",
"text/xml")
def test_sniffer_xml_utf16_be(self):
# w/out byte order mark
self.check_content_type(
- "\0<\0?\0x\0m\0l\0 \0v\0e\0r\0s\0i\0o\0n\0=\0'\01\0.\0000\0'"
- "\0 \0e\0n\0c\0o\0d\0i\0n\0g\0=\0'\0u\0t\0f\0-\08\0'\0?\0>"
- "\0<\0d\0o\0c\0/\0>",
+ b"\0<\0?\0x\0m\0l\0 \0v\0e\0r\0s\0i\0o\0n\0=\0'\01\0.\0000\0'"
+ b"\0 \0e\0n\0c\0o\0d\0i\0n\0g\0=\0'\0u\0t\0f\0-\08\0'\0?\0>"
+ b"\0<\0d\0o\0c\0/\0>",
"text/xml")
self.check_content_type(
- "\0<\0?\0x\0m\0l\0\t\0v\0e\0r\0s\0i\0o\0n\0=\0'\01\0.\0000\0'"
- "\0 \0e\0n\0c\0o\0d\0i\0n\0g\0=\0'\0u\0t\0f\0-\08\0'\0?\0>"
- "\0<\0d\0o\0c\0/\0>",
+ b"\0<\0?\0x\0m\0l\0\t\0v\0e\0r\0s\0i\0o\0n\0=\0'\01\0.\0000\0'"
+ b"\0 \0e\0n\0c\0o\0d\0i\0n\0g\0=\0'\0u\0t\0f\0-\08\0'\0?\0>"
+ b"\0<\0d\0o\0c\0/\0>",
"text/xml")
# with byte order mark
self.check_content_type(
- "\xfe\xff"
- "\0<\0?\0x\0m\0l\0 \0v\0e\0r\0s\0i\0o\0n\0=\0'\01\0.\0000\0'"
- "\0 \0e\0n\0c\0o\0d\0i\0n\0g\0=\0'\0u\0t\0f\0-\08\0'\0?\0>"
- "\0<\0d\0o\0c\0/\0>",
+ b"\xfe\xff"
+ b"\0<\0?\0x\0m\0l\0 \0v\0e\0r\0s\0i\0o\0n\0=\0'\01\0.\0000\0'"
+ b"\0 \0e\0n\0c\0o\0d\0i\0n\0g\0=\0'\0u\0t\0f\0-\08\0'\0?\0>"
+ b"\0<\0d\0o\0c\0/\0>",
"text/xml")
self.check_content_type(
- "\xfe\xff"
- "\0<\0?\0x\0m\0l\0\t\0v\0e\0r\0s\0i\0o\0n\0=\0'\01\0.\0000\0'"
- "\0 \0e\0n\0c\0o\0d\0i\0n\0g\0=\0'\0u\0t\0f\0-\08\0'\0?\0>"
- "\0<\0d\0o\0c\0/\0>",
+ b"\xfe\xff"
+ b"\0<\0?\0x\0m\0l\0\t\0v\0e\0r\0s\0i\0o\0n\0=\0'\01\0.\0000\0'"
+ b"\0 \0e\0n\0c\0o\0d\0i\0n\0g\0=\0'\0u\0t\0f\0-\08\0'\0?\0>"
+ b"\0<\0d\0o\0c\0/\0>",
"text/xml")
def test_sniffer_xml_utf16_le(self):
# w/out byte order mark
self.check_content_type(
- "<\0?\0x\0m\0l\0 \0v\0e\0r\0s\0i\0o\0n\0=\0'\01\0.\0000\0'\0"
- " \0e\0n\0c\0o\0d\0i\0n\0g\0=\0'\0u\0t\0f\0-\08\0'\0?\0>\0"
- "<\0d\0o\0c\0/\0>\n",
+ b"<\0?\0x\0m\0l\0 \0v\0e\0r\0s\0i\0o\0n\0=\0'\01\0.\0000\0'\0"
+ b" \0e\0n\0c\0o\0d\0i\0n\0g\0=\0'\0u\0t\0f\0-\08\0'\0?\0>\0"
+ b"<\0d\0o\0c\0/\0>\n",
"text/xml")
self.check_content_type(
- "<\0?\0x\0m\0l\0\t\0v\0e\0r\0s\0i\0o\0n\0=\0'\01\0.\0000\0'\0"
- " \0e\0n\0c\0o\0d\0i\0n\0g\0=\0'\0u\0t\0f\0-\08\0'\0?\0>\0"
- "<\0d\0o\0c\0/\0>\0",
+ b"<\0?\0x\0m\0l\0\t\0v\0e\0r\0s\0i\0o\0n\0=\0'\01\0.\0000\0'\0"
+ b" \0e\0n\0c\0o\0d\0i\0n\0g\0=\0'\0u\0t\0f\0-\08\0'\0?\0>\0"
+ b"<\0d\0o\0c\0/\0>\0",
"text/xml")
# with byte order mark
self.check_content_type(
- "\xff\xfe"
- "<\0?\0x\0m\0l\0 \0v\0e\0r\0s\0i\0o\0n\0=\0'\01\0.\0000\0'\0"
- " \0e\0n\0c\0o\0d\0i\0n\0g\0=\0'\0u\0t\0f\0-\08\0'\0?\0>\0"
- "<\0d\0o\0c\0/\0>\0",
+ b"\xff\xfe"
+ b"<\0?\0x\0m\0l\0 \0v\0e\0r\0s\0i\0o\0n\0=\0'\01\0.\0000\0'\0"
+ b" \0e\0n\0c\0o\0d\0i\0n\0g\0=\0'\0u\0t\0f\0-\08\0'\0?\0>\0"
+ b"<\0d\0o\0c\0/\0>\0",
"text/xml")
self.check_content_type(
- "\xff\xfe"
- "<\0?\0x\0m\0l\0\t\0v\0e\0r\0s\0i\0o\0n\0=\0'\01\0.\0000\0'\0"
- " \0e\0n\0c\0o\0d\0i\0n\0g\0=\0'\0u\0t\0f\0-\08\0'\0?\0>\0"
- "<\0d\0o\0c\0/\0>\0",
+ b"\xff\xfe"
+ b"<\0?\0x\0m\0l\0\t\0v\0e\0r\0s\0i\0o\0n\0=\0'\01\0.\0000\0'\0"
+ b" \0e\0n\0c\0o\0d\0i\0n\0g\0=\0'\0u\0t\0f\0-\08\0'\0?\0>\0"
+ b"<\0d\0o\0c\0/\0>\0",
"text/xml")
HTML_PUBLIC_ID = "-//W3C//DTD HTML 4.01 Transitional//EN"
@@ -121,11 +122,11 @@ class TypeSniffingTestCase(unittest.TestCase):
def test_sniffer_html_ascii(self):
self.check_content_type(
- "<!DOCTYPE html [ SYSTEM '%s' ]><html></html>"
- % self.HTML_SYSTEM_ID,
+ ("<!DOCTYPE html [ SYSTEM '%s' ]><html></html>"
+ % self.HTML_SYSTEM_ID).encode("utf-8"),
"text/html")
self.check_content_type(
- "<html><head><title>sample document</title></head></html>",
+ b"<html><head><title>sample document</title></head></html>",
"text/html")
# TODO: This reflects a case that simply isn't handled by the
@@ -137,43 +138,43 @@ class TypeSniffingTestCase(unittest.TestCase):
def test_html_default_encoding(self):
pt = self.get_pt(
- "<html><head><title>"
+ b"<html><head><title>"
# 'Test' in russian (utf-8)
- "\xd0\xa2\xd0\xb5\xd1\x81\xd1\x82"
- "</title></head></html>")
+ b"\xd0\xa2\xd0\xb5\xd1\x81\xd1\x82"
+ b"</title></head></html>")
rendered = pt()
- self.failUnless(isinstance(rendered, unicode))
- self.failUnlessEqual(rendered.strip(),
+ self.assertTrue(isinstance(rendered, six.text_type))
+ self.assertEqual(rendered.strip(),
u"<html><head><title>"
u"\u0422\u0435\u0441\u0442"
u"</title></head></html>")
def test_html_encoding_by_meta(self):
pt = self.get_pt(
- "<html><head><title>"
+ b"<html><head><title>"
# 'Test' in russian (windows-1251)
- "\xd2\xe5\xf1\xf2"
- '</title><meta http-equiv="Content-Type"'
- ' content="text/html; charset=windows-1251">'
- "</head></html>")
+ b"\xd2\xe5\xf1\xf2"
+ b'</title><meta http-equiv="Content-Type"'
+ b' content="text/html; charset=windows-1251">'
+ b"</head></html>")
rendered = pt()
- self.failUnless(isinstance(rendered, unicode))
- self.failUnlessEqual(rendered.strip(),
+ self.assertTrue(isinstance(rendered, six.text_type))
+ self.assertEqual(rendered.strip(),
u"<html><head><title>"
u"\u0422\u0435\u0441\u0442"
u"</title></head></html>")
def test_xhtml(self):
pt = self.get_pt(
- "<html><head><title>"
+ b"<html><head><title>"
# 'Test' in russian (windows-1251)
- "\xd2\xe5\xf1\xf2"
- '</title><meta http-equiv="Content-Type"'
- ' content="text/html; charset=windows-1251"/>'
- "</head></html>")
+ b"\xd2\xe5\xf1\xf2"
+ b'</title><meta http-equiv="Content-Type"'
+ b' content="text/html; charset=windows-1251"/>'
+ b"</head></html>")
rendered = pt()
- self.failUnless(isinstance(rendered, unicode))
- self.failUnlessEqual(rendered.strip(),
+ self.assertTrue(isinstance(rendered, six.text_type))
+ self.assertEqual(rendered.strip(),
u"<html><head><title>"
u"\u0422\u0435\u0441\u0442"
u"</title></head></html>")
View Lorry Controller Status