[Docutils-checkins] SF.net SVN: docutils:[7640] trunk/docutils

[<mi...@us...>]

Revision: 7640
          http://sourceforge.net/p/docutils/code/7640
Author:   milde
Date:     2013-03-25 20:57:52 +0000 (Mon, 25 Mar 2013)
Log Message:
-----------
Always import our local copy of roman.py (report Larry Hastings).

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/docutils/parsers/rst/states.py

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2013-03-23 14:20:49 UTC (rev 7639)
+++ trunk/docutils/HISTORY.txt	2013-03-25 20:57:52 UTC (rev 7640)
@@ -36,6 +36,7 @@
 * docutils/parsers/rst/states.py
 
   - Fix [ 157 ] Line block parsing doesn't like system message.
+  - Always import our local copy of roman.py (report Larry Hastings).
 
 * docutils/transforms/references.py
 

Modified: trunk/docutils/docutils/parsers/rst/states.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/states.py	2013-03-23 14:20:49 UTC (rev 7639)
+++ trunk/docutils/docutils/parsers/rst/states.py	2013-03-25 20:57:52 UTC (rev 7640)
@@ -105,10 +105,6 @@
 
 import sys
 import re
-try:
-    import roman
-except ImportError:
-    import docutils.utils.roman as roman
 from types import FunctionType, MethodType
 
 from docutils import nodes, statemachine, utils
@@ -120,7 +116,7 @@
 from docutils.parsers.rst import directives, languages, tableparser, roles
 from docutils.parsers.rst.languages import en as _fallback_language_module
 from docutils.utils import escape2null, unescape, column_width
-from docutils.utils import punctuation_chars, urischemes
+from docutils.utils import punctuation_chars, roman, urischemes
 
 class MarkupError(DataError): pass
 class UnknownInterpretedRoleError(DataError): pass

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.