Merge branch 'master' into dan_stateless

1 files changed, 0 insertions, 44 deletions

diff --git a/external_libs/python/enum34-1.0.4/setup.py b/external_libs/python/enum34-1.0.4/setup.py
deleted file mode 100644
index 4cb9c691..00000000
--- a/external_libs/python/enum34-1.0.4/setup.py
+++ /dev/null
@@ -1,44 +0,0 @@
-import os
-import sys
-from distutils.core import setup
-
-if sys.version_info[:2] < (2, 7):
-    required = ['ordereddict']
-else:
-    required = []
-
-long_desc = open('enum/doc/enum.rst').read()
-
-setup( name='enum34',
-       version='1.0.4',
-       url='https://pypi.python.org/pypi/enum34',
-       packages=['enum'],
-       package_data={
-           'enum' : [
-               'LICENSE',
-               'README',
-               'doc/enum.rst',
-               'doc/enum.pdf',
-               'test_enum.py',
-               ]
-           },
-       license='BSD License',
-       description='Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4',
-       long_description=long_desc,
-       provides=['enum'],
-       install_requires=required,
-       author='Ethan Furman',
-       author_email='ethan@stoneleaf.us',
-       classifiers=[
-            'Development Status :: 5 - Production/Stable',
-            'Intended Audience :: Developers',
-            'License :: OSI Approved :: BSD License',
-            'Programming Language :: Python',
-            'Topic :: Software Development',
-            'Programming Language :: Python :: 2.4',
-            'Programming Language :: Python :: 2.5',
-            'Programming Language :: Python :: 2.6',
-            'Programming Language :: Python :: 2.7',
-            'Programming Language :: Python :: 3',
-            ],
-    )