diff options
| author | Martin v. L?wis <martin@v.loewis.de> | 2012-06-03 12:00:48 +0200 |
|---|---|---|
| committer | Martin v. L?wis <martin@v.loewis.de> | 2012-06-03 12:00:48 +0200 |
| commit | 183bc7b78cb50c73b3142710b3b8fbafde4a3833 (patch) | |
| tree | 8a29bbfd852dccb5f14340c8d1c6309cf8fdfb72 /Lib/sqlite3/test/factory.py | |
| parent | 15670dc71126aabce6daca6c8d32f55ea146cc11 (diff) | |
| parent | 9fe4e3d311149c5f07073f7c55509fcfd7dde47e (diff) | |
| download | cpython-183bc7b78cb50c73b3142710b3b8fbafde4a3833.tar.gz | |
Merge 3.2: issue #14937.
Diffstat (limited to 'Lib/sqlite3/test/factory.py')
| -rw-r--r-- | Lib/sqlite3/test/factory.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/sqlite3/test/factory.py b/Lib/sqlite3/test/factory.py index 7f6f3473f3..9e833aedc5 100644 --- a/Lib/sqlite3/test/factory.py +++ b/Lib/sqlite3/test/factory.py @@ -1,4 +1,4 @@ -#-*- coding: ISO-8859-1 -*- +#-*- coding: iso-8859-1 -*- # pysqlite2/test/factory.py: tests for the various factories in pysqlite # # Copyright (C) 2005-2007 Gerhard Häring <gh@ghaering.de> @@ -178,6 +178,8 @@ class TextFactoryTests(unittest.TestCase): self.assertTrue(row[0].endswith("reich"), "column must contain original data") def CheckOptimizedUnicode(self): + # In py3k, str objects are always returned when text_factory + # is OptimizedUnicode self.con.text_factory = sqlite.OptimizedUnicode austria = "Österreich" germany = "Deutchland" |