From ef87d6ed94780fe00250a551031023aeb2898365 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 2 May 2007 19:09:54 +0000 Subject: Rip out all the u"..." literals and calls to unicode(). --- Lib/sqlite3/test/userfunctions.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Lib/sqlite3/test/userfunctions.py') diff --git a/Lib/sqlite3/test/userfunctions.py b/Lib/sqlite3/test/userfunctions.py index a7cdcaecf1..a2f2574e7c 100644 --- a/Lib/sqlite3/test/userfunctions.py +++ b/Lib/sqlite3/test/userfunctions.py @@ -28,7 +28,7 @@ import sqlite3 as sqlite def func_returntext(): return "foo" def func_returnunicode(): - return u"bar" + return "bar" def func_returnint(): return 42 def func_returnfloat(): @@ -41,7 +41,7 @@ def func_raiseexception(): 5/0 def func_isstring(v): - return type(v) is unicode + return type(v) is str def func_isint(v): return type(v) is int def func_isfloat(v): @@ -100,7 +100,7 @@ class AggrCheckType: self.val = None def step(self, whichType, val): - theType = {"str": unicode, "int": int, "float": float, "None": type(None), "blob": buffer} + theType = {"str": str, "int": int, "float": float, "None": type(None), "blob": buffer} self.val = int(theType[whichType] is type(val)) def finalize(self): @@ -160,15 +160,15 @@ class FunctionTests(unittest.TestCase): cur = self.con.cursor() cur.execute("select returntext()") val = cur.fetchone()[0] - self.failUnlessEqual(type(val), unicode) + self.failUnlessEqual(type(val), str) self.failUnlessEqual(val, "foo") def CheckFuncReturnUnicode(self): cur = self.con.cursor() cur.execute("select returnunicode()") val = cur.fetchone()[0] - self.failUnlessEqual(type(val), unicode) - self.failUnlessEqual(val, u"bar") + self.failUnlessEqual(type(val), str) + self.failUnlessEqual(val, "bar") def CheckFuncReturnInt(self): cur = self.con.cursor() -- cgit v1.2.1