Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Make unit tests pass: replace apply() and adapt to different attribute message.

This commit is contained in:
Guido van Rossum 2006-08-17 22:37:44 +00:00
parent 512ab9f8d3
commit 3b843ccf69
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/sqlite3/dbapi2.py
View File

@ -39,13 +39,13 @@ Time = datetime.time
Timestamp = datetime.datetime Timestamp = datetime.datetime
def DateFromTicks(ticks): def DateFromTicks(ticks):
return apply(Date, time.localtime(ticks)[:3]) return Date(*time.localtime(ticks)[:3])
def TimeFromTicks(ticks): def TimeFromTicks(ticks):
return apply(Time, time.localtime(ticks)[3:6]) return Time(*time.localtime(ticks)[3:6])
def TimestampFromTicks(ticks): 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(".")]) version_info = tuple([int(x) for x in version.split(".")])
sqlite_version_info = tuple([int(x) for x in sqlite_version.split(".")]) sqlite_version_info = tuple([int(x) for x in sqlite_version.split(".")])

2
Lib/sqlite3/test/userfunctions.py
View File

@ -280,7 +280,7 @@ class AggregateTests(unittest.TestCase):
cur.execute("select nostep(t) from test") cur.execute("select nostep(t) from test")
self.fail("should have raised an AttributeError") self.fail("should have raised an AttributeError")
except AttributeError, e: 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): def CheckAggrNoFinalize(self):
cur = self.con.cursor() cur = self.con.cursor()