Changeset 1218

Timestamp:

Jan 26, 2013, 5:42:20 PM (11 years ago)

Author:

hodgestar

Message:

Merge r1217 from trunk (fix text template tests that were failing on Windows).

Location:

branches/stable/0.7.x

Files:

• . (modified) (1 prop)
• genshi/template/tests/text.py (modified) (3 diffs)

branches/stable/0.7.x/genshi/template/tests/text.py

@@ -95 +95 @@
 
     def test_include(self):
-        file1 = open(os.path.join(self.dirname, 'tmpl1.txt'), 'w')
-        try:
-            file1.write("Included\n")
+        file1 = open(os.path.join(self.dirname, 'tmpl1.txt'), 'wb')
+        try:
+            file1.write(u"Included\n".encode("utf-8"))
         finally:
             file1.close()
 
-        file2 = open(os.path.join(self.dirname, 'tmpl2.txt'), 'w')
-        try:
-            file2.write("""----- Included data below this line -----
+        file2 = open(os.path.join(self.dirname, 'tmpl2.txt'), 'wb')
+        try:
+            file2.write(u"""----- Included data below this line -----
             #include tmpl1.txt
-            ----- Included data above this line -----""")
+            ----- Included data above this line -----""".encode("utf-8"))
         finally:
             file2.close()
@@ -220 +220 @@
 
     def test_include(self):
-        file1 = open(os.path.join(self.dirname, 'tmpl1.txt'), 'w')
-        try:
-            file1.write("Included")
+        file1 = open(os.path.join(self.dirname, 'tmpl1.txt'), 'wb')
+        try:
+            file1.write(u"Included".encode("utf-8"))
         finally:
             file1.close()
 
-        file2 = open(os.path.join(self.dirname, 'tmpl2.txt'), 'w')
-        try:
-            file2.write("""----- Included data below this line -----
+        file2 = open(os.path.join(self.dirname, 'tmpl2.txt'), 'wb')
+        try:
+            file2.write(u"""----- Included data below this line -----
 {% include tmpl1.txt %}
------ Included data above this line -----""")
+----- Included data above this line -----""".encode("utf-8"))
         finally:
             file2.close()
@@ -242 +242 @@
 
     def test_include_expr(self):
-         file1 = open(os.path.join(self.dirname, 'tmpl1.txt'), 'w')
+         file1 = open(os.path.join(self.dirname, 'tmpl1.txt'), 'wb')
          try:
-             file1.write("Included")
+             file1.write(u"Included".encode("utf-8"))
          finally:
              file1.close()
  
-         file2 = open(os.path.join(self.dirname, 'tmpl2.txt'), 'w')
+         file2 = open(os.path.join(self.dirname, 'tmpl2.txt'), 'wb')
          try:
-             file2.write("""----- Included data below this line -----
+             file2.write(u"""----- Included data below this line -----
     {% include ${'%s.txt' % ('tmpl1',)} %}
-    ----- Included data above this line -----""")
+    ----- Included data above this line -----""".encode("utf-8"))
          finally:
              file2.close()