Revert "Merge pull request html5lib#177 from msabramo/require_ordereddict_for_py26"

gsnedders · gsnedders · commit 165bf4c5b1e3 · 2015-04-29T23:54:20.000+01:00
This reverts commit 3b3c103, reversing changes made to 7cce65b. Revert this till html5lib#179 is sorted.
diff --git a/setup.py b/setup.py
@@ -1,7 +1,4 @@
-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
+from distutils.core import setup
 import os
 import codecs
 
@@ -26,12 +23,6 @@
                            if os.path.isdir(os.path.join('html5lib', name)) and
                            not name.startswith('.') and name != 'tests']
 
-install_requires = ['six']
-try:
-    from collections import OrderedDict
-except ImportError:
-    install_requires.append('ordereddict')
-
 current_dir = os.path.dirname(__file__)
 with codecs.open(os.path.join(current_dir, 'README.rst'), 'r', 'utf8') as readme_file:
     with codecs.open(os.path.join(current_dir, 'CHANGES.rst'), 'r', 'utf8') as changes_file:
@@ -47,5 +38,7 @@
       maintainer='James Graham',
       maintainer_email='james@hoppipolla.co.uk',
       packages=packages,
-      install_requires=install_requires,
+      install_requires=[
+          'six',
+      ],
       )
