diff options
| author | milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2013-03-25 20:57:52 +0000 |
|---|---|---|
| committer | milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2013-03-25 20:57:52 +0000 |
| commit | 36ea2e265fb747ff83c33ce2aa133b4941832272 (patch) | |
| tree | 533554f327952dc81ea203d621b3e24b75ea68ce | |
| parent | 24d3488aaf2b1d088e2db919f6bc69042b1a42e4 (diff) | |
| download | docutils-36ea2e265fb747ff83c33ce2aa133b4941832272.tar.gz | |
Always import our local copy of roman.py (report Larry Hastings).
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@7640 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
| -rw-r--r-- | docutils/HISTORY.txt | 1 | ||||
| -rw-r--r-- | docutils/docutils/parsers/rst/states.py | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/docutils/HISTORY.txt b/docutils/HISTORY.txt index 33df75179..2f460d666 100644 --- a/docutils/HISTORY.txt +++ b/docutils/HISTORY.txt @@ -36,6 +36,7 @@ Changes Since 0.10 * 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 diff --git a/docutils/docutils/parsers/rst/states.py b/docutils/docutils/parsers/rst/states.py index a148ddae2..4619d343e 100644 --- a/docutils/docutils/parsers/rst/states.py +++ b/docutils/docutils/parsers/rst/states.py @@ -105,10 +105,6 @@ __docformat__ = 'reStructuredText' 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 @@ import docutils.parsers.rst 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 |