Author: guido.van.rossum
Date: Fri Aug 18 00:37:44 2006
New Revision: 51346
Modified:
python/branches/p3yk/Lib/sqlite3/dbapi2.py
python/branches/p3yk/Lib/sqlite3/test/userfunctions.py
Log:
Make unit tests pass: replace apply() and adapt to different attribute message.
Modified: python/branches/p3yk/Lib/sqlite3/dbapi2.py
==============================================================================
--- python/branches/p3yk/Lib/sqlite3/dbapi2.py (original)
+++ python/branches/p3yk/Lib/sqlite3/dbapi2.py Fri Aug 18 00:37:44 2006
@@ -39,13 +39,13 @@
Timestamp = datetime.datetime
def DateFromTicks(ticks):
- return apply(Date, time.localtime(ticks)[:3])
+ return Date(*time.localtime(ticks)[:3])
def TimeFromTicks(ticks):
- return apply(Time, time.localtime(ticks)[3:6])
+ return Time(*time.localtime(ticks)[3:6])
def TimestampFromTicks(ticks):
- return apply(Timestamp, time.localtime(ticks)[:6])
+ return Timestamp(*time.localtime(ticks)[:6])
version_info = tuple([int(x) for x in version.split(".")])
sqlite_version_info = tuple([int(x) for x in sqlite_version.split(".")])
Modified: python/branches/p3yk/Lib/sqlite3/test/userfunctions.py
==============================================================================
--- python/branches/p3yk/Lib/sqlite3/test/userfunctions.py (original)
+++ python/branches/p3yk/Lib/sqlite3/test/userfunctions.py Fri Aug 18
00:37:44 2006
@@ -280,7 +280,7 @@
cur.execute("select nostep(t) from test")
self.fail("should have raised an AttributeError")
except AttributeError, e:
- self.failUnlessEqual(e.args[0], "AggrNoStep instance has no
attribute 'step'")
+ self.failUnlessEqual(e.args[0], "'AggrNoStep' object has no
attribute 'step'")
def CheckAggrNoFinalize(self):
cur = self.con.cursor()
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
