Merged revisions 69617 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69617 | benjamin.peterson | 2009-02-14 10:51:03 -0600 (Sat, 14 Feb 2009) | 1 line

  we're no longer using CVS, so this doesn't have to be binary
........

1 files changed, 37 insertions, 38 deletions

diff --git a/Lib/test/test_pep263.py b/Lib/test/test_pep263.py
index 17abbd8..106b3ab 100644
--- a/Lib/test/test_pep263.py
+++ b/Lib/test/test_pep263.py
@@ -1,38 +1,37 @@
-#! -*- coding: koi8-r -*-

-# This file is marked as binary in the CVS, to prevent MacCVS from recoding it.

-

-import unittest

-from test import support

-

-class PEP263Test(unittest.TestCase):

-

-    def test_pep263(self):

-        self.assertEqual(

-            "ðÉÔÏÎ".encode("utf-8"),

-            b'\xd0\x9f\xd0\xb8\xd1\x82\xd0\xbe\xd0\xbd'

-        )

-        self.assertEqual(

-            "\ð".encode("utf-8"),

-            b'\\\xd0\x9f'

-        )

-

-    def test_compilestring(self):

-        # see #1882

-        c = compile(b"\n# coding: utf-8\nu = '\xc3\xb3'\n", "dummy", "exec")

-        d = {}

-        exec(c, d)

-        self.assertEqual(d['u'], '\xf3')

-

-    def test_issue2301(self):

-        try:

-            compile(b"# coding: cp932\nprint '\x94\x4e'", "dummy", "exec")

-        except SyntaxError as v:

-            self.assertEquals(v.text, "print '\u5e74'")

-        else:

-            self.fail()

-

-def test_main():

-    support.run_unittest(PEP263Test)

-

-if __name__=="__main__":

-    test_main()

+#! -*- coding: koi8-r -*-
+
+import unittest
+from test import support
+
+class PEP263Test(unittest.TestCase):
+
+    def test_pep263(self):
+        self.assertEqual(
+            "ðÉÔÏÎ".encode("utf-8"),
+            b'\xd0\x9f\xd0\xb8\xd1\x82\xd0\xbe\xd0\xbd'
+        )
+        self.assertEqual(
+            "\ð".encode("utf-8"),
+            b'\\\xd0\x9f'
+        )
+
+    def test_compilestring(self):
+        # see #1882
+        c = compile(b"\n# coding: utf-8\nu = '\xc3\xb3'\n", "dummy", "exec")
+        d = {}
+        exec(c, d)
+        self.assertEqual(d['u'], '\xf3')
+
+    def test_issue2301(self):
+        try:
+            compile(b"# coding: cp932\nprint '\x94\x4e'", "dummy", "exec")
+        except SyntaxError as v:
+            self.assertEquals(v.text, "print '\u5e74'")
+        else:
+            self.fail()
+
+def test_main():
+    support.run_unittest(PEP263Test)
+
+if __name__=="__main__":
+    test_main()