Merge branch 'master' into code_futurized

Author: HelioGuilherme66

doc/buildhtml.py

@@ -29,13 +29,16 @@
 import os.path
 import copy
 from fnmatch import fnmatch
-import docutils
-from docutils import ApplicationError
-from docutils import core, frontend, utils
-from docutils.utils.error_reporting import ErrorOutput, ErrorString
-from docutils.parsers import rst
-from docutils.readers import standalone, pep
-from docutils.writers import html4css1, pep_html
+try:
+    import docutils
+    from docutils import ApplicationError
+    from docutils import core, frontend, utils
+    from docutils.error_reporting import ErrorOutput, ErrorString
+    from docutils.parsers import rst
+    from docutils.readers import standalone, pep
+    from docutils.writers import html4css1, pep_html
+except ImportError:
+  raise ImportError('Importing `docutils` failed. Install it with `pip install docutils`.')
 
 
 usage = '%prog [options] [<directory> ...]'

setup.py

@@ -37,7 +37,6 @@
                             'decorator >= 3.3.2',
                             'selenium >= 2.32.0',
                             'robotframework >= 2.6.0',
-                            'docutils >= 0.8.1',
                             'future >= 0.15.2'
                          ],
       py_modules=['ez_setup'],
@@ -49,7 +48,6 @@
                     'decorator',
                     'selenium',
                     'robotframework',
-                    'docutils',
                     'future'
                     ]
       )