openstack/swift
Code Issues Proposed changes

Merge "Fixed DB test cases on PyPy"

Browse Source
This commit is contained in:
Jenkins 2013-12-04 04:19:58 +00:00 committed by Gerrit Code Review
commit 47c65386dd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swift/common/db.py
View File

@ -100,7 +100,7 @@ class GreenDBConnection(sqlite3.Connection):
timeout = BROKER_TIMEOUT
self.timeout = timeout
self.db_file = database
sqlite3.Connection.__init__(self, database, 0, *args, **kwargs)
super(GreenDBConnection, self).__init__(database, 0, *args, **kwargs)
def cursor(self, cls=None):
if cls is None:
@ -119,7 +119,7 @@ class GreenDBCursor(sqlite3.Cursor):
def __init__(self, *args, **kwargs):
self.timeout = args[0].timeout
self.db_file = args[0].db_file
sqlite3.Cursor.__init__(self, *args, **kwargs)
super(GreenDBCursor, self).__init__(*args, **kwargs)
def execute(self, *args, **kwargs):
return _db_timeout(