From fbc4f290adb331d913cc1302eab760361711268c Mon Sep 17 00:00:00 2001
From: milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>
Date: Tue, 20 Dec 2011 16:39:10 +0000
Subject: [PATCH] Fix [ 2971827 ] and [ 3442827 ]

extras/roman.py moved to docutils/utils/roman.py

git-svn-id: https://docutils.svn.sourceforge.net/svnroot/docutils/trunk/docutils@7268 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 HISTORY.txt                         |  5 +++++
 docutils/parsers/rst/states.py      |  5 ++++-
 {extras => docutils/utils}/roman.py |  0
 docutils/writers/manpage.py         |  5 ++++-
 setup.py                            | 28 ----------------------------
 5 files changed, 13 insertions(+), 30 deletions(-)
 rename {extras => docutils/utils}/roman.py (100%)

diff --git a/HISTORY.txt b/HISTORY.txt
index 19baff2b9..34cac4d6c 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -26,6 +26,11 @@ Changes Since 0.8.1
 
 .. _Pygments: http://pygments.org/
 
+* setup.py
+
+  - Fix [ 2971827 ] and [ 3442827 ]
+    extras/roman.py moved to docutils/utils/roman.py
+
 * docutils/io.py
 
   - Fix [ 3395948 ] (Work around encoding problems in Py3k).
diff --git a/docutils/parsers/rst/states.py b/docutils/parsers/rst/states.py
index 8bb1558f1..f671ad1d6 100644
--- a/docutils/parsers/rst/states.py
+++ b/docutils/parsers/rst/states.py
@@ -105,7 +105,10 @@ __docformat__ = 'reStructuredText'
 
 import sys
 import re
-import roman
+try:
+    import roman
+except ImportError:
+    import docutils.utils.roman as roman
 from types import FunctionType, MethodType
 
 from docutils import nodes, statemachine, utils, urischemes
diff --git a/extras/roman.py b/docutils/utils/roman.py
similarity index 100%
rename from extras/roman.py
rename to docutils/utils/roman.py
diff --git a/docutils/writers/manpage.py b/docutils/writers/manpage.py
index 53bcaf3b3..a7d2e3ec3 100644
--- a/docutils/writers/manpage.py
+++ b/docutils/writers/manpage.py
@@ -48,7 +48,10 @@ import re
 
 import docutils
 from docutils import nodes, writers, languages
-import roman
+try:
+    import roman
+except ImportError:
+    import docutils.utils.roman as roman
 
 FIELD_LIST_INDENT = 7
 DEFINITION_LIST_INDENT = 7
diff --git a/setup.py b/setup.py
index 1719f3b45..aa12eba07 100755
--- a/setup.py
+++ b/setup.py
@@ -88,9 +88,6 @@ build.sub_commands.append(('build_data', lambda *a: True))
 
 def do_setup():
     kwargs = package_data.copy()
-    extras = get_extras()
-    if extras:
-        kwargs['py_modules'] = extras
     kwargs['classifiers'] = classifiers
     # Install data files properly.
     kwargs['cmdclass'] = {'build_data': build_data,
@@ -124,7 +121,6 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60
     'license': 'public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)',
     'platforms': 'OS-independent',
     'package_dir': {'docutils': 'docutils',
-                    '': 'extras',
                     'docutils.tools': 'tools'},
     'packages': ['docutils',
                  'docutils.languages',
@@ -156,8 +152,6 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60
                      ['docutils/writers/latex2e/default.tex',
                       'docutils/writers/latex2e/titlepage.tex',
                       'docutils/writers/latex2e/xelatex.tex',]),
-                    # ('docutils/writers/newlatex2e',
-                    #  ['docutils/writers/newlatex2e/base.tex']),
                     ('docutils/writers/pep_html',
                      ['docutils/writers/pep_html/pep.css',
                       'docutils/writers/pep_html/template.txt']),
@@ -170,7 +164,6 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60
     'scripts' : ['tools/rst2html.py',
                  'tools/rst2s5.py',
                  'tools/rst2latex.py',
-                 # 'tools/rst2newlatex.py',
                  'tools/rst2xetex.py',
                  'tools/rst2man.py',
                  'tools/rst2xml.py',
@@ -222,26 +215,5 @@ classifiers = [
 """Trove classifiers for the Distutils "register" command;
 Python 2.3 and up."""
 
-extra_modules = [('roman', '1.4', ['toRoman', 'fromRoman',
-                                   'InvalidRomanNumeralError'])]
-"""Third-party modules to install if they're not already present.
-List of (module name, minimum __version__ string, [attribute names])."""
-
-def get_extras():
-    extras = []
-    for module_name, version, attributes in extra_modules:
-        try:
-            module = __import__(module_name)
-            if version and module.__version__ < version:
-                raise ValueError
-            for attribute in attributes or []:
-                getattr(module, attribute)
-            print ('"%s" module already present; ignoring extras/%s.py.'
-                   % (module_name, module_name))
-        except (ImportError, AttributeError, ValueError):
-            extras.append(module_name)
-    return extras
-
-
 if __name__ == '__main__' :
     do_setup()
-- 
2.11.4.GIT