Author: guido.van.rossum
Date: Tue Jul 17 01:10:57 2007
New Revision: 56405
Modified:
python/branches/py3k-struni/Lib/distutils/command/bdist_msi.py
python/branches/py3k-struni/Lib/encodings/punycode.py
python/branches/py3k-struni/Lib/getopt.py
python/branches/py3k-struni/Lib/lib-tk/Tix.py
python/branches/py3k-struni/Lib/msilib/__init__.py
python/branches/py3k-struni/Lib/test/test_csv.py
Log:
Change a bunch of file encodings from Latin-1 to UTF-8.
Remove the encoding from Tix.py (it doesn't seem to need one).
Note: we still have to keep the "coding: utf-8" declaration
for files that aren't pure ASCII, as the default per PEP 3120
hasn't been implemented yet.
Modified: python/branches/py3k-struni/Lib/distutils/command/bdist_msi.py
==============================================================================
--- python/branches/py3k-struni/Lib/distutils/command/bdist_msi.py
(original)
+++ python/branches/py3k-struni/Lib/distutils/command/bdist_msi.py Tue Jul
17 01:10:57 2007
@@ -1,5 +1,5 @@
-# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2005, 2006 Martin v. L�wis
+# -*- coding: utf-8 -*-
+# Copyright (C) 2005, 2006 Martin v. Löwis
# Licensed to PSF under a Contributor Agreement.
# The bdist_wininst command proper
# based on bdist_wininst
Modified: python/branches/py3k-struni/Lib/encodings/punycode.py
==============================================================================
--- python/branches/py3k-struni/Lib/encodings/punycode.py (original)
+++ python/branches/py3k-struni/Lib/encodings/punycode.py Tue Jul 17
01:10:57 2007
@@ -1,7 +1,7 @@
-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
""" Codec for the Punicode encoding, as specified in RFC 3492
-Written by Martin v. L�wis.
+Written by Martin v. Löwis.
"""
import codecs
Modified: python/branches/py3k-struni/Lib/getopt.py
==============================================================================
--- python/branches/py3k-struni/Lib/getopt.py (original)
+++ python/branches/py3k-struni/Lib/getopt.py Tue Jul 17 01:10:57 2007
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
"""Parser for command line options.
This module helps scripts to parse the command line arguments in
@@ -20,7 +20,7 @@
# Gerrit Holl <[EMAIL PROTECTED]> moved the string-based exceptions
# to class-based exceptions.
#
-# Peter �strand <[EMAIL PROTECTED]> added gnu_getopt().
+# Peter Ã
strand <[EMAIL PROTECTED]> added gnu_getopt().
#
# TODO for gnu_getopt():
#
Modified: python/branches/py3k-struni/Lib/lib-tk/Tix.py
==============================================================================
--- python/branches/py3k-struni/Lib/lib-tk/Tix.py (original)
+++ python/branches/py3k-struni/Lib/lib-tk/Tix.py Tue Jul 17 01:10:57 2007
@@ -1,4 +1,4 @@
-# -*-mode: python; fill-column: 75; tab-width: 8; coding: iso-latin-1-unix -*-
+# -*-mode: python; fill-column: 75; tab-width: 8 -*-
#
# $Id$
#
Modified: python/branches/py3k-struni/Lib/msilib/__init__.py
==============================================================================
--- python/branches/py3k-struni/Lib/msilib/__init__.py (original)
+++ python/branches/py3k-struni/Lib/msilib/__init__.py Tue Jul 17 01:10:57 2007
@@ -1,5 +1,5 @@
-# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2005 Martin v. L�wis
+# -*- coding: utf-8 -*-
+# Copyright (C) 2005 Martin v. Löwis
# Licensed to PSF under a Contributor Agreement.
from _msi import *
import os, string, re
Modified: python/branches/py3k-struni/Lib/test/test_csv.py
==============================================================================
--- python/branches/py3k-struni/Lib/test/test_csv.py (original)
+++ python/branches/py3k-struni/Lib/test/test_csv.py Tue Jul 17 01:10:57 2007
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
# Copyright (C) 2001,2002 Python Software Foundation
# csv package unit tests
@@ -974,16 +974,16 @@
## class TestUnicode(unittest.TestCase):
## def test_unicode_read(self):
## import codecs
-## f = codecs.EncodedFile(StringIO("Martin von L�wis,"
-## "Marc Andr� Lemburg,"
+## f = codecs.EncodedFile(StringIO("Martin von Löwis,"
+## "Marc André Lemburg,"
## "Guido van Rossum,"
-## "Fran�ois Pinard\r\n"),
+## "François Pinard\r\n"),
## data_encoding='iso-8859-1')
## reader = csv.reader(f)
-## self.assertEqual(list(reader), [[u"Martin von L�wis",
-## u"Marc Andr� Lemburg",
-## u"Guido van Rossum",
-## u"Fran�ois Pinardn"]])
+## self.assertEqual(list(reader), [["Martin von Löwis",
+## "Marc André Lemburg",
+## "Guido van Rossum",
+## "François Pinardn"]])
def test_main():
mod = sys.modules[__name__]
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
