Fixes needed for 2.0 release

1 files changed, 7 insertions, 6 deletions

diff --git a/pies/overrides.py b/pies/overrides.py
index decb8c8..6c6157c 100644
--- a/pies/overrides.py
+++ b/pies/overrides.py
@@ -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