summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/util.py
diff options
context:
space:
mode:
authorJason Kirtland <jek@discorporate.us>2008-07-15 19:53:17 +0000
committerJason Kirtland <jek@discorporate.us>2008-07-15 19:53:17 +0000
commit4f56fd23bcd6c0adc11138fa50249095c7d4dd73 (patch)
tree0b9dbb1be1eadcc9f01befb20c7abe06da8fbdff /lib/sqlalchemy/util.py
parent4eb747b61f0c1b1c25bdee3856d7195d10a0c227 (diff)
downloadsqlalchemy-4f56fd23bcd6c0adc11138fa50249095c7d4dd73.tar.gz
- Always use native itemgetter & attrgetter
Diffstat (limited to 'lib/sqlalchemy/util.py')
-rw-r--r--lib/sqlalchemy/util.py20
1 files changed, 4 insertions, 16 deletions
diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index 1eacca19a..a389ccca4 100644
--- a/lib/sqlalchemy/util.py
+++ b/lib/sqlalchemy/util.py
@@ -27,19 +27,6 @@ try:
except ImportError:
import pickle
-
-try:
- from operator import attrgetter
-except ImportError:
- def attrgetter(attribute):
- return lambda value: getattr(value, attribute)
-
-try:
- from operator import itemgetter
-except ImportError:
- def itemgetter(attribute):
- return lambda value: value[attribute]
-
if sys.version_info >= (2, 5):
class PopulateDict(dict):
"""a dict which populates missing values via a creation function.
@@ -602,8 +589,9 @@ class OrderedProperties(object):
def clear(self):
self._data.clear()
+
class OrderedDict(dict):
- """A Dictionary that returns keys/values/items in the order they were added."""
+ """A dict that returns keys/values/items in the order they were added."""
def __init__(self, ____sequence=None, **kwargs):
self._list = []
@@ -616,10 +604,10 @@ class OrderedDict(dict):
def clear(self):
self._list = []
dict.clear(self)
-
+
def sort(self, fn=None):
self._list.sort(fn)
-
+
def update(self, ____sequence=None, **kwargs):
if ____sequence is not None:
if hasattr(____sequence, 'keys'):