From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 27 Oct 2010 18:58:04 +0000 (+0000)
Subject: Merged revisions 85861 via svnmerge from
X-Git-Tag: v2.7.1rc1~110
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b27ddc72eaec4fe5855e04c370df26327078b1b0;p=python

Merged revisions 85861 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85861 | antoine.pitrou | 2010-10-27 20:52:48 +0200 (mer., 27 oct. 2010) | 3 lines

  Recode modules from latin-1 to utf-8
........
---

diff --git a/Lib/test/test_sax.py b/Lib/test/test_sax.py
index 11614ae4bf..2280058fac 100644
--- a/Lib/test/test_sax.py
+++ b/Lib/test/test_sax.py
@@ -1,4 +1,4 @@
-# regression test for SAX 2.0            -*- coding: iso-8859-1 -*-
+# regression test for SAX 2.0            -*- coding: utf-8 -*-
 # $Id$
 
 from xml.sax import make_parser, ContentHandler, \
@@ -109,7 +109,7 @@ class SaxutilsTest(unittest.TestCase):
                           "&lt;Donald Duck &amp; Co&gt;")
 
     def test_escape_extra(self):
-        self.assertEquals(escape("Hei på deg", {"å" : "&aring;"}),
+        self.assertEquals(escape("Hei på deg", {"å" : "&aring;"}),
                           "Hei p&aring; deg")
 
     # ===== unescape
@@ -121,7 +121,7 @@ class SaxutilsTest(unittest.TestCase):
                           "<Donald Duck & Co>")
 
     def test_unescape_extra(self):
-        self.assertEquals(unescape("Hei på deg", {"å" : "&aring;"}),
+        self.assertEquals(unescape("Hei på deg", {"å" : "&aring;"}),
                           "Hei p&aring; deg")
 
     def test_unescape_amp_extra(self):
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index ce8e8856ec..0452f477a0 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1,4 +1,3 @@
-# -*- coding: iso-8859-1 -*-
 """ Test script for the Unicode implementation.
 
 Written by Marc-Andre Lemburg (mal@lemburg.com).