diff options
| author | Guido van Rossum <guido@python.org> | 2006-08-17 22:37:44 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2006-08-17 22:37:44 (GMT) |
| commit | 3b843ccf69023f17a2388124f7b7aae47977c53b (patch) | |
| tree | d282ee0e1346d68623a1650569a94f7e6631d937 /Lib/sqlite3 | |
| parent | 512ab9f8d34e450d5ee35e264dc29004b08d7b73 (diff) | |
| download | cpython-3b843ccf69023f17a2388124f7b7aae47977c53b.zip cpython-3b843ccf69023f17a2388124f7b7aae47977c53b.tar.gz cpython-3b843ccf69023f17a2388124f7b7aae47977c53b.tar.bz2 | |
Make unit tests pass: replace apply() and adapt to different attribute message.
Diffstat (limited to 'Lib/sqlite3')
| -rw-r--r-- | Lib/sqlite3/dbapi2.py | 6 | ||||
| -rw-r--r-- | Lib/sqlite3/test/userfunctions.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Lib/sqlite3/dbapi2.py b/Lib/sqlite3/dbapi2.py index 665dbb2..9b7d56d 100644 --- a/Lib/sqlite3/dbapi2.py +++ b/Lib/sqlite3/dbapi2.py @@ -39,13 +39,13 @@ Time = datetime.time 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(".")]) diff --git a/Lib/sqlite3/test/userfunctions.py b/Lib/sqlite3/test/userfunctions.py index 31bf289..e455fb6 100644 --- a/Lib/sqlite3/test/userfunctions.py +++ b/Lib/sqlite3/test/userfunctions.py @@ -280,7 +280,7 @@ class AggregateTests(unittest.TestCase): 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() |