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

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

Revision: 7646
          http://sourceforge.net/p/docutils/code/7646
Author:   milde
Date:     2013-04-17 14:17:37 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
Fix [ 228 ] search docutils components first locally then globally.

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

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2013-04-08 17:35:15 UTC (rev 7645)
+++ trunk/docutils/HISTORY.txt	2013-04-17 14:17:37 UTC (rev 7646)
@@ -25,6 +25,11 @@
 
   - 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``.

Modified: trunk/docutils/docutils/parsers/__init__.py
===================================================================
--- trunk/docutils/docutils/parsers/__init__.py	2013-04-08 17:35:15 UTC (rev 7645)
+++ trunk/docutils/docutils/parsers/__init__.py	2013-04-17 14:17:37 UTC (rev 7646)
@@ -47,7 +47,7 @@
     if parser_name in _parser_aliases:
         parser_name = _parser_aliases[parser_name]
     try:
+        module = __import__(parser_name, globals(), locals(), level=1)
+    except ImportError:
         module = __import__(parser_name, globals(), locals(), level=0)
-    except ImportError:
-        module = __import__(parser_name, globals(), locals(), level=1)
     return module.Parser

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