Handle Python 3 keys/values iterators

Browse Source
This commit is contained in:
Stefan Wehrmeyer 2013-12-18 03:30:19 +01:00
parent 88c0c1a15f
commit 23e484cbed
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dataset/persistence/database.py
View File

@ -103,8 +103,9 @@ class Database(object):
>>> print db.tables >>> print db.tables
set([u'user', u'action']) set([u'user', u'action'])
""" """
return list(set(self.metadata.tables.keys() + return list(
self._tables.keys())) set(self.metadata.tables.keys()) | set(self._tables.keys())
)
def create_table(self, table_name, primary_id='id', primary_type='Integer'): def create_table(self, table_name, primary_id='id', primary_type='Integer'):
""" """

2
dataset/persistence/table.py
View File

@ -354,7 +354,7 @@ class Table(object):
Returns the number of rows in the table. Returns the number of rows in the table.
""" """
d = self.database.query(self.table.count()).next() d = self.database.query(self.table.count()).next()
return d.values().pop() return list(d.values()).pop()
def distinct(self, *columns, **_filter): def distinct(self, *columns, **_filter):
""" """