Fixes needed for 2.0 release

6 files changed, 42 insertions, 16 deletions

diff --git a/MANIFEST b/MANIFEST
index 9551cfd..d3c1494 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,3 +1,12 @@
 # file GENERATED by distutils, do NOT edit
-pies.py
 setup.py
+pies/StringIO.py
+pies/__init__.py
+pies/collections.py
+pies/functools.py
+pies/imp.py
+pies/itertools.py
+pies/overrides.py
+pies/pickle.py
+pies/sys.py
+pies/version_info.py
diff --git a/README.md b/README.md
index 430585e..995a356 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-![isort](https://raw.github.com/timothycrosley/pies/develop/logo.png)
+![Pies](https://raw.github.com/timothycrosley/pies/develop/logo.png)
 ====================
-[![PyPi version](https://pypip.in/v/isort/badge.png)](https://crate.io/packages/isort/)
-[![PyPi downloads](https://pypip.in/d/isort/badge.png)](https://crate.io/packages/isort/)
+[![PyPi version](https://pypip.in/v/pies/badge.png)](https://crate.io/packages/pies/)
+[![PyPi downloads](https://pypip.in/d/pies/badge.png)](https://crate.io/packages/pies/)
 
 The simplest (and tastiest) way to write one program that runs on both Python 2.6+ and Python 3.
 
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
diff --git a/pies2overrides/MANIFEST b/pies2overrides/MANIFEST
index df37942..661cd6a 100644
--- a/pies2overrides/MANIFEST
+++ b/pies2overrides/MANIFEST
@@ -1,4 +1,19 @@
 # file GENERATED by distutils, do NOT edit
+_thread.py
 builtins.py
 configparser.py
+copyreg.py
+queue.py
+reprlib.py
 setup.py
+socketserver.py
+html/__init__.py
+html/entities.py
+html/parser.py
+http/__init__.py
+http/client.py
+http/cookiejar.py
+http/cookies.py
+http/server.py
+xmlrpc/__init__.py
+xmlrpc/client.py
diff --git a/pies2overrides/setup.py b/pies2overrides/setup.py
index abef0dd..0f11b50 100644
--- a/pies2overrides/setup.py
+++ b/pies2overrides/setup.py
@@ -6,7 +6,7 @@ import sys
 from distutils.core import setup
 
 install_requires = ['ipaddress']
-if sys.version < '2.7':
+if sys.version_info[0] == 2 and sys.version_info[1] < 7:
     install_requires += ['ordereddict', 'argparse']
 
 setup(name='pies2overrides',
@@ -19,4 +19,5 @@ setup(name='pies2overrides',
       license="MIT",
       install_requires=install_requires,
       requires=install_requires,
-      py_modules=['configparser', 'builtins'])
+      py_modules=['configparser', 'builtins', '_thread', 'copyreg', 'queue', 'reprlib', 'socketserver'],
+      packages=['html', 'http', 'xmlrpc'])
diff --git a/setup.py b/setup.py
index 3f03dfc..747d9e5 100644
--- a/setup.py
+++ b/setup.py
@@ -6,12 +6,12 @@ import sys
 from distutils.core import setup
 
 install_requires = []
-if sys.version < '3':
+if sys.version_info[0] < 3:
     install_requires += ['pies2overrides']
-elif sys.version < '3.2':
+elif sys.version_info[1] < 2:
     install_requires += ['argparse']
 
-if sys.version < '3.4':
+if sys.version_info[0] < 3 or sys.version_info[1] < 4:
     install_requires += ['enum34']
 
 setup(name='pies',
@@ -24,4 +24,4 @@ setup(name='pies',
       license="MIT",
       install_requires=install_requires,
       requires=install_requires,
-      py_modules=['pies'])
+      packages=['pies'])