Remove OrderedDict implementation as RowProxy is returned
http://docs.sqlalchemy.org/en/rel_0_9/core/connections.html?highlight=rowproxy#sqlalchemy.engine.RowProxy
This commit is contained in:
parent
eff6925af9
commit
0726dd9cf3
@ -1,9 +1,5 @@
|
||||
import logging
|
||||
from itertools import count
|
||||
try:
|
||||
from collections import OrderedDict
|
||||
except ImportError:
|
||||
from ordereddict import OrderedDict # Python < 2.7 drop-in
|
||||
|
||||
from sqlalchemy.sql import and_, expression
|
||||
from sqlalchemy.schema import Column, Index
|
||||
@ -288,7 +284,7 @@ class Table(object):
|
||||
rp = self.database.executable.execute(query)
|
||||
data = rp.fetchone()
|
||||
if data is not None:
|
||||
return OrderedDict(zip(rp.keys(), data))
|
||||
return data
|
||||
|
||||
def _args_to_order_by(self, order_by):
|
||||
if order_by[0] == '-':
|
||||
|
||||
@ -1,9 +1,5 @@
|
||||
from datetime import datetime, timedelta
|
||||
from inspect import isgenerator
|
||||
try:
|
||||
from collections import OrderedDict
|
||||
except ImportError:
|
||||
from ordereddict import OrderedDict # Python < 2.7 drop-in
|
||||
|
||||
from sqlalchemy import Integer, UnicodeText, Float, DateTime, Boolean, types, Table, event
|
||||
|
||||
@ -50,7 +46,7 @@ class ResultIter(object):
|
||||
else:
|
||||
# stop here
|
||||
raise StopIteration
|
||||
return OrderedDict(zip(self.keys, row))
|
||||
return row
|
||||
|
||||
next = __next__
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user