[Sqlalchemy-commits] sqlalchemy: cleanup
Brought to you by:
zzzeek
From: <co...@sq...> - 2013-04-28 01:03:40
|
details: http://hg.sqlalchemy.org/sqlalchemy/sqlalchemy/rev/00fc856cc9fc changeset: 9405:00fc856cc9fc user: Mike Bayer <mi...@zz...> date: Sat Apr 27 21:01:54 2013 -0400 description: cleanup diffstat: lib/sqlalchemy/util/compat.py | 66 +++++++++++++----------------------------- 1 files changed, 21 insertions(+), 45 deletions(-) diffs (109 lines): diff -r d76f85eec471 -r 00fc856cc9fc lib/sqlalchemy/util/compat.py --- a/lib/sqlalchemy/util/compat.py Sat Apr 27 20:58:13 2013 -0400 +++ b/lib/sqlalchemy/util/compat.py Sat Apr 27 21:01:54 2013 -0400 @@ -22,11 +22,8 @@ cpython = not pypy and not jython # TODO: something better for this ? -if sys.version_info < (2, 6): - def next(iter): - return iter.__next__() -else: - next = next +next = next + if py3k: import pickle else: @@ -35,8 +32,6 @@ except ImportError: import pickle - - if py3k: from inspect import getfullargspec as inspect_getfullargspec from urllib.parse import quote_plus, unquote_plus, parse_qsl @@ -45,6 +40,21 @@ text_type = str int_types = int, iterbytes = iter + + def b(s): + return s.encode("latin-1") + + if py32: + callable = callable + else: + def callable(fn): + return hasattr(fn, '__call__') + + def cmp(a, b): + return (a > b) - (a < b) + + from functools import reduce + else: from inspect import getargspec as inspect_getfullargspec from urllib import quote_plus, unquote_plus @@ -56,31 +66,13 @@ def iterbytes(buf): return (ord(byte) for byte in buf) -if py3k: - # they're bringing it back in 3.2. brilliant ! - def callable(fn): - return hasattr(fn, '__call__') + def b(s): + return s - def cmp(a, b): - return (a > b) - (a < b) - - from functools import reduce -else: callable = callable cmp = cmp reduce = reduce -try: - from collections import namedtuple -except ImportError: - def namedtuple(typename, fieldnames): - def __new__(cls, *values): - tup = tuple.__new__(cls, values) - for i, fname in enumerate(fieldnames): - setattr(tup, fname, tup[i]) - return tup - tuptype = type(typename, (tuple, ), {'__new__': __new__}) - return tuptype try: from weakref import WeakSet @@ -110,24 +102,8 @@ else: time_func = time.time - -if sys.version_info >= (2, 6): - from operator import attrgetter as dottedgetter -else: - def dottedgetter(attr): - def g(obj): - for name in attr.split("."): - obj = getattr(obj, name) - return obj - return g - -# Adapted from six.py -if py3k: - def b(s): - return s.encode("latin-1") -else: - def b(s): - return s +from collections import namedtuple +from operator import attrgetter as dottedgetter if py3k: |