summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/distutils/command/bdist_msi.py4
-rw-r--r--Lib/encodings/punycode.py4
-rw-r--r--Lib/getopt.py4
-rwxr-xr-xLib/lib-tk/Tix.py2
-rw-r--r--Lib/msilib/__init__.py4
-rw-r--r--Lib/test/test_csv.py16
6 files changed, 17 insertions, 17 deletions
diff --git a/Lib/distutils/command/bdist_msi.py b/Lib/distutils/command/bdist_msi.py
index f31bded..012d06e 100644
--- a/Lib/distutils/command/bdist_msi.py
+++ b/Lib/distutils/command/bdist_msi.py
@@ -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
diff --git a/Lib/encodings/punycode.py b/Lib/encodings/punycode.py
index 4c22fe5..f650f6c 100644
--- a/Lib/encodings/punycode.py
+++ b/Lib/encodings/punycode.py
@@ -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
diff --git a/Lib/getopt.py b/Lib/getopt.py
index 4882fdc..93777b4 100644
--- a/Lib/getopt.py
+++ b/Lib/getopt.py
@@ -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 @@ option involved with the exception.
# Gerrit Holl <gerrit@nl.linux.org> moved the string-based exceptions
# to class-based exceptions.
#
-# Peter Åstrand <astrand@lysator.liu.se> added gnu_getopt().
+# Peter Åstrand <astrand@lysator.liu.se> added gnu_getopt().
#
# TODO for gnu_getopt():
#
diff --git a/Lib/lib-tk/Tix.py b/Lib/lib-tk/Tix.py
index 970e7ae..a91b003 100755
--- a/Lib/lib-tk/Tix.py
+++ b/Lib/lib-tk/Tix.py
@@ -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$
#
diff --git a/Lib/msilib/__init__.py b/Lib/msilib/__init__.py
index ad3bf62..e2ea814 100644
--- a/Lib/msilib/__init__.py
+++ b/Lib/msilib/__init__.py
@@ -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
diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py
index d655bf0..e623a02 100644
--- a/Lib/test/test_csv.py
+++ b/Lib/test/test_csv.py
@@ -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 @@ else:
## 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__]