From: <mi...@us...> - 2013-04-18 07:36:28
|
Revision: 7648 http://sourceforge.net/p/docutils/code/7648 Author: milde Date: 2013-04-18 07:36:22 +0000 (Thu, 18 Apr 2013) Log Message: ----------- Fix [ 228 ], part II. Try local import of docutils components (reader, writer, parser, language module) before global search. Modified Paths: -------------- trunk/docutils/HISTORY.txt trunk/docutils/docutils/languages/__init__.py trunk/docutils/docutils/parsers/rst/languages/__init__.py trunk/docutils/docutils/readers/__init__.py trunk/docutils/docutils/writers/__init__.py Modified: trunk/docutils/HISTORY.txt =================================================================== --- trunk/docutils/HISTORY.txt 2013-04-18 06:42:45 UTC (rev 7647) +++ trunk/docutils/HISTORY.txt 2013-04-18 07:36:22 UTC (rev 7648) @@ -20,16 +20,13 @@ - Apply [ 2714873 ] Fix for the overwritting of document attributes. - Support embedded aliases within hyperlink references. + - Fix [ 228 ] try local import of docutils components (reader, writer, parser, + language module) before global search. * docutils/nodes.py - 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/languages/__init__.py =================================================================== --- trunk/docutils/docutils/languages/__init__.py 2013-04-18 06:42:45 UTC (rev 7647) +++ trunk/docutils/docutils/languages/__init__.py 2013-04-18 07:36:22 UTC (rev 7648) @@ -31,10 +31,10 @@ if tag in _languages: return _languages[tag] try: - module = __import__(tag, globals(), locals(), level=0) + module = __import__(tag, globals(), locals(), level=1) except ImportError: try: - module = __import__(tag, globals(), locals(), level=1) + module = __import__(tag, globals(), locals(), level=0) except ImportError: continue _languages[tag] = module Modified: trunk/docutils/docutils/parsers/rst/languages/__init__.py =================================================================== --- trunk/docutils/docutils/parsers/rst/languages/__init__.py 2013-04-18 06:42:45 UTC (rev 7647) +++ trunk/docutils/docutils/parsers/rst/languages/__init__.py 2013-04-18 07:36:22 UTC (rev 7648) @@ -26,10 +26,10 @@ if tag in _languages: return _languages[tag] try: - module = __import__(tag, globals(), locals(), level=0) + module = __import__(tag, globals(), locals(), level=1) except ImportError: try: - module = __import__(tag, globals(), locals(), level=1) + module = __import__(tag, globals(), locals(), level=0) except ImportError: continue _languages[tag] = module Modified: trunk/docutils/docutils/readers/__init__.py =================================================================== --- trunk/docutils/docutils/readers/__init__.py 2013-04-18 06:42:45 UTC (rev 7647) +++ trunk/docutils/docutils/readers/__init__.py 2013-04-18 07:36:22 UTC (rev 7648) @@ -107,7 +107,7 @@ if reader_name in _reader_aliases: reader_name = _reader_aliases[reader_name] try: + module = __import__(reader_name, globals(), locals(), level=1) + except ImportError: module = __import__(reader_name, globals(), locals(), level=0) - except ImportError: - module = __import__(reader_name, globals(), locals(), level=1) return module.Reader Modified: trunk/docutils/docutils/writers/__init__.py =================================================================== --- trunk/docutils/docutils/writers/__init__.py 2013-04-18 06:42:45 UTC (rev 7647) +++ trunk/docutils/docutils/writers/__init__.py 2013-04-18 07:36:22 UTC (rev 7648) @@ -134,7 +134,7 @@ if writer_name in _writer_aliases: writer_name = _writer_aliases[writer_name] try: + module = __import__(writer_name, globals(), locals(), level=1) + except ImportError: module = __import__(writer_name, globals(), locals(), level=0) - except ImportError: - module = __import__(writer_name, globals(), locals(), level=1) return module.Writer This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |