From deab1e54ff1695cdbe87f8db3d2c382d8e78330f Mon Sep 17 00:00:00 2001 From: Erlend Egeberg Aasland Date: Thu, 7 Jan 2021 01:36:35 +0100 Subject: [PATCH] bpo-42847: Normalise Lib/sqlite3/test/* file encodings (GH-24147) Convert from ISO-8859-1 to UTF-8. --- Lib/sqlite3/test/dbapi.py | 3 +-- Lib/sqlite3/test/factory.py | 11 +++++------ Lib/sqlite3/test/hooks.py | 5 ++--- Lib/sqlite3/test/regression.py | 3 +-- Lib/sqlite3/test/transactions.py | 3 +-- Lib/sqlite3/test/types.py | 11 +++++------ 6 files changed, 15 insertions(+), 21 deletions(-) diff --git a/Lib/sqlite3/test/dbapi.py b/Lib/sqlite3/test/dbapi.py index 7985cd3fcf9142..68a30622395325 100644 --- a/Lib/sqlite3/test/dbapi.py +++ b/Lib/sqlite3/test/dbapi.py @@ -1,7 +1,6 @@ -#-*- coding: iso-8859-1 -*- # pysqlite2/test/dbapi.py: tests for DB-API compliance # -# Copyright (C) 2004-2010 Gerhard Häring +# Copyright (C) 2004-2010 Gerhard Häring # # This file is part of pysqlite. # diff --git a/Lib/sqlite3/test/factory.py b/Lib/sqlite3/test/factory.py index 9eebb7beef18a7..876428497542f8 100644 --- a/Lib/sqlite3/test/factory.py +++ b/Lib/sqlite3/test/factory.py @@ -1,7 +1,6 @@ -#-*- coding: iso-8859-1 -*- # pysqlite2/test/factory.py: tests for the various factories in pysqlite # -# Copyright (C) 2005-2007 Gerhard Häring +# Copyright (C) 2005-2007 Gerhard Häring # # This file is part of pysqlite. # @@ -235,20 +234,20 @@ def setUp(self): self.con = sqlite.connect(":memory:") def test_unicode(self): - austria = "Österreich" + austria = "Österreich" row = self.con.execute("select ?", (austria,)).fetchone() self.assertEqual(type(row[0]), str, "type of row[0] must be unicode") def test_string(self): self.con.text_factory = bytes - austria = "Österreich" + austria = "Österreich" row = self.con.execute("select ?", (austria,)).fetchone() self.assertEqual(type(row[0]), bytes, "type of row[0] must be bytes") self.assertEqual(row[0], austria.encode("utf-8"), "column must equal original data in UTF-8") def test_custom(self): self.con.text_factory = lambda x: str(x, "utf-8", "ignore") - austria = "Österreich" + austria = "Österreich" row = self.con.execute("select ?", (austria,)).fetchone() self.assertEqual(type(row[0]), str, "type of row[0] must be unicode") self.assertTrue(row[0].endswith("reich"), "column must contain original data") @@ -258,7 +257,7 @@ def test_optimized_unicode(self): with self.assertWarns(DeprecationWarning) as cm: self.con.text_factory = sqlite.OptimizedUnicode self.assertIn("factory.py", cm.filename) - austria = "Österreich" + austria = "Österreich" germany = "Deutchland" a_row = self.con.execute("select ?", (austria,)).fetchone() d_row = self.con.execute("select ?", (germany,)).fetchone() diff --git a/Lib/sqlite3/test/hooks.py b/Lib/sqlite3/test/hooks.py index 4250888377c83e..a219e8911f7063 100644 --- a/Lib/sqlite3/test/hooks.py +++ b/Lib/sqlite3/test/hooks.py @@ -1,7 +1,6 @@ -#-*- coding: iso-8859-1 -*- # pysqlite2/test/hooks.py: tests for various SQLite-specific hooks # -# Copyright (C) 2006-2007 Gerhard Häring +# Copyright (C) 2006-2007 Gerhard Häring # # This file is part of pysqlite. # @@ -42,7 +41,7 @@ def test_create_collation_not_callable(self): def test_create_collation_not_ascii(self): con = sqlite.connect(":memory:") with self.assertRaises(sqlite.ProgrammingError): - con.create_collation("collä", lambda x, y: (x > y) - (x < y)) + con.create_collation("collä", lambda x, y: (x > y) - (x < y)) def test_create_collation_bad_upper(self): class BadUpperStr(str): diff --git a/Lib/sqlite3/test/regression.py b/Lib/sqlite3/test/regression.py index 1312424cfab964..c8e0b27564ad10 100644 --- a/Lib/sqlite3/test/regression.py +++ b/Lib/sqlite3/test/regression.py @@ -1,7 +1,6 @@ -#-*- coding: iso-8859-1 -*- # pysqlite2/test/regression.py: pysqlite regression tests # -# Copyright (C) 2006-2010 Gerhard Häring +# Copyright (C) 2006-2010 Gerhard Häring # # This file is part of pysqlite. # diff --git a/Lib/sqlite3/test/transactions.py b/Lib/sqlite3/test/transactions.py index 3b47ff174a0ad6..80284902a1a6e9 100644 --- a/Lib/sqlite3/test/transactions.py +++ b/Lib/sqlite3/test/transactions.py @@ -1,7 +1,6 @@ -#-*- coding: iso-8859-1 -*- # pysqlite2/test/transactions.py: tests transactions # -# Copyright (C) 2005-2007 Gerhard Häring +# Copyright (C) 2005-2007 Gerhard Häring # # This file is part of pysqlite. # diff --git a/Lib/sqlite3/test/types.py b/Lib/sqlite3/test/types.py index df8aad989a8048..92ec6349f8bd2c 100644 --- a/Lib/sqlite3/test/types.py +++ b/Lib/sqlite3/test/types.py @@ -1,7 +1,6 @@ -#-*- coding: iso-8859-1 -*- # pysqlite2/test/types.py: tests for type conversion and detection # -# Copyright (C) 2005 Gerhard Häring +# Copyright (C) 2005 Gerhard Häring # # This file is part of pysqlite. # @@ -41,10 +40,10 @@ def tearDown(self): self.con.close() def test_string(self): - self.cur.execute("insert into test(s) values (?)", ("Österreich",)) + self.cur.execute("insert into test(s) values (?)", ("Österreich",)) self.cur.execute("select s from test") row = self.cur.fetchone() - self.assertEqual(row[0], "Österreich") + self.assertEqual(row[0], "Österreich") def test_small_int(self): self.cur.execute("insert into test(i) values (?)", (42,)) @@ -75,9 +74,9 @@ def test_blob(self): self.assertEqual(row[0], sample) def test_unicode_execute(self): - self.cur.execute("select 'Österreich'") + self.cur.execute("select 'Österreich'") row = self.cur.fetchone() - self.assertEqual(row[0], "Österreich") + self.assertEqual(row[0], "Österreich") class DeclTypesTests(unittest.TestCase): class Foo: