[TurboGears] New genshi preserves newline conventions so we need to modify the unittest data so data and expectat

Toshio くらとみ toshio at fedoraproject.org
Fri Apr 12 06:06:46 UTC 2013


commit 66c3b68f55247d20969d8e1d9517eb52c90e065d
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Apr 11 23:05:57 2013 -0700

    New genshi preserves newline conventions so we need to modify the
    unittest data so data and expectations match

 TurboGears.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/TurboGears.spec b/TurboGears.spec
index 6b63818..05e2389 100644
--- a/TurboGears.spec
+++ b/TurboGears.spec
@@ -46,6 +46,7 @@ BuildRequires: python-tw-forms
 BuildRequires: python-nose
 BuildRequires: python-webtest
 BuildRequires: python-dateutil
+BuildRequires: dos2unix
 
 %if 0%{?fedora} || 0%{?rhel} > 5
 Requires:       python-cherrypy2
@@ -121,6 +122,11 @@ TurboGears is easy to use for a wide range of web applications.
 %endif
 %patch101 -p1 -b .pkgresources
 
+# Genshi 0.7 preserves carriage return and newline conventions from the template.
+# The TurboGears unittests need to match the \r\n convention in the template with
+# the \n convention in the test script.
+dos2unix turbogears/tests/genshi_{new,old}_text_format.txt
+
 cp -p %{SOURCE1} .
 
 %build


More information about the scm-commits mailing list