summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormilde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2013-04-17 14:17:37 +0000
committermilde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2013-04-17 14:17:37 +0000
commit0fb16cadb043097d21c6a882e7ff5cb21e88bf8f (patch)
tree466fbd5ebfb9ea67bf5bbabddabb552895ab2861
parent886107c3e54ea52e5b8c7b117427010c78ce602d (diff)
downloaddocutils-0fb16cadb043097d21c6a882e7ff5cb21e88bf8f.tar.gz
Fix [ 228 ] search docutils components first locally then globally.
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@7646 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
-rw-r--r--HISTORY.txt5
-rw-r--r--docutils/parsers/__init__.py4
2 files changed, 7 insertions, 2 deletions
diff --git a/HISTORY.txt b/HISTORY.txt
index 2f460d666..1e70a2269 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -25,6 +25,11 @@ Changes Since 0.10
- Fix [ 3601607 ] node.__repr__() must return `str` instance.
+* docutils/parsers/rst/__init__.py
+
+ - Fix [ 228 ] search docutils components (reader, writer, parser)
+ first locally then globally.
+
* docutils/parsers/rst/directives/__init__.py
- Fix [ 3606028 ] ``assert`` is skipped with ``python -O``.
diff --git a/docutils/parsers/__init__.py b/docutils/parsers/__init__.py
index d7b8068e3..06198acee 100644
--- a/docutils/parsers/__init__.py
+++ b/docutils/parsers/__init__.py
@@ -47,7 +47,7 @@ def get_parser_class(parser_name):
if parser_name in _parser_aliases:
parser_name = _parser_aliases[parser_name]
try:
- module = __import__(parser_name, globals(), locals(), level=0)
- except ImportError:
module = __import__(parser_name, globals(), locals(), level=1)
+ except ImportError:
+ module = __import__(parser_name, globals(), locals(), level=0)
return module.Parser