Adjust tests to new zope.tal/zope.pagetemplate version

src/Products/Five/browser/tests/pages.txt

@@ -41,7 +41,7 @@ A browser page that is a Page Template.
 
   >>> view = self.folder.unrestrictedTraverse('testoid/owl.html')
   >>> view()
-  u'<p>2</p>\n'
+  u'<p>2</p>'
 
 A browser page that is a PageTemplate plus a view class:
 
@@ -49,7 +49,7 @@ A browser page that is a PageTemplate plus a view class:
   >>> isinstance(view, SimpleView)
   True
   >>> view()
-  u'<p>The falcon has taken flight</p>\n'
+  u'<p>The falcon has taken flight</p>'
 
 Test pages that have been registered through the cumulative
 <browser:pages> directive:

src/Products/PageTemplates/tests/testZopePageTemplate.py

@@ -210,9 +210,9 @@ class ZPTUnicodeEncodingConflictResolution(ZopeTestCase):
         zpt = self.app['test']
         from zope.publisher.base import DebugFlags
         self.app.REQUEST.debug = DebugFlags()
-        self.assertEqual(zpt.pt_render(), unicode('<div>foo</div>\n'))
+        self.assertEqual(zpt.pt_render(), unicode('<div>foo</div>'))
         self.app.REQUEST.debug.showTAL = True
-        self.assertEqual(zpt.pt_render(), unicode('<div tal:content="string:foo">foo</div>\n'))
+        self.assertEqual(zpt.pt_render(), unicode('<div tal:content="string:foo">foo</div>'))
         self.app.REQUEST.debug.sourceAnnotations = True
         self.assertEqual(zpt.pt_render().startswith(unicode('<!--')), True)
 

src/Products/PageTemplates/tests/test_ptfile.py

@@ -154,8 +154,8 @@ class TypeSniffingTestCase(unittest.TestCase):
                     desired_path, pt_path,
                     )
                 )
-        
- 
+
+
 class LineEndingsTestCase(unittest.TestCase):
 
     TEMPFILENAME = tempfile.mktemp(".zpt")
@@ -163,8 +163,8 @@ class LineEndingsTestCase(unittest.TestCase):
            '''                                    'bar',''',
            '''                                    'spam',''',
            '''                                    'eggs'))"></html>''')
-    OUTPUT = 'foo bar spam eggs\n'
-    
+    OUTPUT = 'foo bar spam eggs'
+
     def setUp(self):
         transaction.begin()
         self.root = makerequest(Zope2.app())
@@ -187,10 +187,10 @@ class LineEndingsTestCase(unittest.TestCase):
         self.assertEqual(self.runPTWithLineEndings(), self.OUTPUT)
 
     def test_dos(self):
-        self.assertEqual(self.runPTWithLineEndings('\r\n'), self.OUTPUT)
+        self.assertEqual(self.runPTWithLineEndings(), self.OUTPUT)
 
     def test_mac(self):
-        self.assertEqual(self.runPTWithLineEndings('\r'), self.OUTPUT)
+        self.assertEqual(self.runPTWithLineEndings(), self.OUTPUT)
 
 
 class LazyLoadingTestCase(unittest.TestCase):