From 0726dd9cf3ed917d2a142a2100ff39983c30fc5a Mon Sep 17 00:00:00 2001 From: Stefan Wehrmeyer Date: Sat, 25 Jan 2014 21:22:11 +0100 Subject: [PATCH] Remove OrderedDict implementation as RowProxy is returned http://docs.sqlalchemy.org/en/rel_0_9/core/connections.html?highlight=rowproxy#sqlalchemy.engine.RowProxy --- dataset/persistence/table.py | 6 +----- dataset/persistence/util.py | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dataset/persistence/table.py b/dataset/persistence/table.py index 83cd4ee..29c45d1 100644 --- a/dataset/persistence/table.py +++ b/dataset/persistence/table.py @@ -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] == '-': diff --git a/dataset/persistence/util.py b/dataset/persistence/util.py index 3439c3f..5197aaf 100644 --- a/dataset/persistence/util.py +++ b/dataset/persistence/util.py @@ -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__