diff options
author | Timothy Crosley <timothy.crosley@gmail.com> | 2013-11-14 00:55:42 -0500 |
---|---|---|
committer | Timothy Crosley <timothy.crosley@gmail.com> | 2013-11-14 00:55:42 -0500 |
commit | 8fa420256f9c05c3e9e67c1b2c4d761e3fefc76c (patch) | |
tree | e393622bcacb26d890df49afcf6ebbc0d32c2e9f /pies | |
parent | ba6d10fed43ec9a8a8eec0646e27212a62d81b51 (diff) | |
parent | 2a01c3a440d02f20693b7508f3a780d1275fab1f (diff) | |
download | pies-8fa420256f9c05c3e9e67c1b2c4d761e3fefc76c.tar.gz |
Merge tag '2.0.0' into develop
2.0.0
Diffstat (limited to 'pies')
-rw-r--r-- | pies/overrides.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pies/overrides.py b/pies/overrides.py index e78da80..6c6157c 100644 --- a/pies/overrides.py +++ b/pies/overrides.py @@ -26,7 +26,7 @@ from numbers import Integral from .version_info import PY2, PY3, VERSION -__version__ = "1.0.3" +__version__ = "2.0.0" native_dict = dict native_round = round @@ -69,12 +69,13 @@ if PY3: urllib.unquote = parse.unquote urllib.unquote_plus = parse.unquote_plus urllib.urlencode = parse.urlencode - execute = getattr('builtins', 'exec') - if VERSION < '3.2': + execute = getattr(builtins, 'exec') + if VERSION[1] < 2: def callable(entity): return hasattr(entity, '__call__') + common.append('callable') - __all__ = common + ['OrderedDict', 'urllib', 'callable'] + __all__ = common + ['OrderedDict', 'urllib'] else: from itertools import ifilter as filter from itertools import imap as map @@ -163,13 +164,13 @@ else: return AttributeError("'dict' object has no attribute 'has_key'") def items(self): - return dict_items(self, 'iteritems') + return dict_items(self) def keys(self): - return dict_keys(self, 'iterkeys') + return dict_keys(self) def values(self): - return dict_values(self, 'itervalues') + return dict_values(self) def round(number, ndigits=None): return_int = False |