20 files changed, 79 insertions, 6 deletions

diff --git a/pies2overrides/MANIFEST b/pies2overrides/MANIFEST
index 7156ab1..661cd6a 100644
--- a/pies2overrides/MANIFEST
+++ b/pies2overrides/MANIFEST
@@ -1,3 +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/_thread.py b/pies2overrides/_thread.py
new file mode 100644
index 0000000..089dd41
--- /dev/null
+++ b/pies2overrides/_thread.py
@@ -0,0 +1,3 @@
+from __future__ import absolute_import
+
+from _thread import *
diff --git a/pies2overrides/builtins.py b/pies2overrides/builtins.py
new file mode 100644
index 0000000..c9cbd8d
--- /dev/null
+++ b/pies2overrides/builtins.py
@@ -0,0 +1,3 @@
+from __future__ import absolute_import
+
+from __builtin__ import *
diff --git a/pies2overrides/configparser.py b/pies2overrides/configparser.py
index b2da53a..4ae03e6 100644
--- a/pies2overrides/configparser.py
+++ b/pies2overrides/configparser.py
@@ -1 +1,3 @@
+from __future__ import absolute_import
+
 from ConfigParser import *
diff --git a/pies2overrides/copyreg.py b/pies2overrides/copyreg.py
new file mode 100644
index 0000000..71d2753
--- /dev/null
+++ b/pies2overrides/copyreg.py
@@ -0,0 +1,3 @@
+from __future__ import absolute_import
+
+from copy_reg import *
diff --git a/pies2overrides/dist/pies2overrides-1.0.0.tar.gz b/pies2overrides/dist/pies2overrides-1.0.0.tar.gz
deleted file mode 100644
index a3f449b..0000000
--- a/pies2overrides/dist/pies2overrides-1.0.0.tar.gz
+++ /dev/null
diff --git a/pies2overrides/html/__init__.py b/pies2overrides/html/__init__.py
new file mode 100644
index 0000000..60385f5
--- /dev/null
+++ b/pies2overrides/html/__init__.py
@@ -0,0 +1,2 @@
+
+from __future__ import absolute_import
diff --git a/pies2overrides/html/entities.py b/pies2overrides/html/entities.py
new file mode 100644
index 0000000..3716d78
--- /dev/null
+++ b/pies2overrides/html/entities.py
@@ -0,0 +1,3 @@
+from __future__ import absolute_import
+
+from htmlentitydefs import *
diff --git a/pies2overrides/html/parser.py b/pies2overrides/html/parser.py
new file mode 100644
index 0000000..b05cfe5
--- /dev/null
+++ b/pies2overrides/html/parser.py
@@ -0,0 +1,3 @@
+from __future__ import absolute_import
+
+from HTMLParser import *
diff --git a/pies2overrides/http/__init__.py b/pies2overrides/http/__init__.py
new file mode 100644
index 0000000..60385f5
--- /dev/null
+++ b/pies2overrides/http/__init__.py
@@ -0,0 +1,2 @@
+
+from __future__ import absolute_import
diff --git a/pies2overrides/http/client.py b/pies2overrides/http/client.py
new file mode 100644
index 0000000..cdae627
--- /dev/null
+++ b/pies2overrides/http/client.py
@@ -0,0 +1,3 @@
+from __future__ import absolute_import
+
+from httplib import *
diff --git a/pies2overrides/http/cookiejar.py b/pies2overrides/http/cookiejar.py
new file mode 100644
index 0000000..84db840
--- /dev/null
+++ b/pies2overrides/http/cookiejar.py
@@ -0,0 +1,3 @@
+from __future__ import absolute_import
+
+from cookielib import *
diff --git a/pies2overrides/http/cookies.py b/pies2overrides/http/cookies.py
new file mode 100644
index 0000000..bfe863d
--- /dev/null
+++ b/pies2overrides/http/cookies.py
@@ -0,0 +1,3 @@
+from __future__ import absolute_import
+
+from Cookie import *
diff --git a/pies2overrides/http/server.py b/pies2overrides/http/server.py
new file mode 100644
index 0000000..38a3336
--- /dev/null
+++ b/pies2overrides/http/server.py
@@ -0,0 +1,5 @@
+from __future__ import absolute_import
+
+from BaseHTTPServer import *
+from CGIHTTPServer import *
+from SimpleHTTPServer import *
diff --git a/pies2overrides/queue.py b/pies2overrides/queue.py
new file mode 100644
index 0000000..8cd58f3
--- /dev/null
+++ b/pies2overrides/queue.py
@@ -0,0 +1,3 @@
+from __future__ import absolute_import
+
+from Queue import *
diff --git a/pies2overrides/reprlib.py b/pies2overrides/reprlib.py
new file mode 100644
index 0000000..784ad6a
--- /dev/null
+++ b/pies2overrides/reprlib.py
@@ -0,0 +1,3 @@
+from __future__ import absolute_import
+
+from repr import *
diff --git a/pies2overrides/setup.py b/pies2overrides/setup.py
index d88ca3c..0f11b50 100644
--- a/pies2overrides/setup.py
+++ b/pies2overrides/setup.py
@@ -1,15 +1,23 @@
 #!/usr/bin/env python
 
+from __future__ import absolute_import
+
+import sys
 from distutils.core import setup
 
+install_requires = ['ipaddress']
+if sys.version_info[0] == 2 and sys.version_info[1] < 7:
+    install_requires += ['ordereddict', 'argparse']
+
 setup(name='pies2overrides',
-      version='1.0.0',
+      version='2.0.0',
       description='Defines override classes that should be included with pies only if running on Python2.',
       author='Timothy Crosley',
       author_email='timothy.crosley@gmail.com',
       url='https://github.com/timothycrosley/pies',
-      download_url='https://github.com/timothycrosley/pies/blob/master/pies2overrides/dist/pies2overrides-1.0.0.tar.gz?raw=true',
-      license="GNU GPLv2",
-      install_requires=['ordereddict', 'argparse'],
-      requires=['ordereddict', 'argparse'],
-      py_modules=['configparser'])
+      download_url='https://github.com/timothycrosley/pies/blob/master/pies2overrides/dist/pies2overrides-2.0.0.tar.gz?raw=true',
+      license="MIT",
+      install_requires=install_requires,
+      requires=install_requires,
+      py_modules=['configparser', 'builtins', '_thread', 'copyreg', 'queue', 'reprlib', 'socketserver'],
+      packages=['html', 'http', 'xmlrpc'])
diff --git a/pies2overrides/socketserver.py b/pies2overrides/socketserver.py
new file mode 100644
index 0000000..358e776
--- /dev/null
+++ b/pies2overrides/socketserver.py
@@ -0,0 +1,3 @@
+from __future__ import absolute_import
+
+from SocketServer import *
diff --git a/pies2overrides/xmlrpc/__init__.py b/pies2overrides/xmlrpc/__init__.py
new file mode 100644
index 0000000..60385f5
--- /dev/null
+++ b/pies2overrides/xmlrpc/__init__.py
@@ -0,0 +1,2 @@
+
+from __future__ import absolute_import
diff --git a/pies2overrides/xmlrpc/client.py b/pies2overrides/xmlrpc/client.py
new file mode 100644
index 0000000..73432e5
--- /dev/null
+++ b/pies2overrides/xmlrpc/client.py
@@ -0,0 +1,3 @@
+from __future__ import absolute_import
+
+from xmlrpclib import *