diff options
| author | grubert <grubert@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2019-07-23 10:20:37 +0000 |
|---|---|---|
| committer | grubert <grubert@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2019-07-23 10:20:37 +0000 |
| commit | 5720d8e72b40d8dbc60edc5c04d9d4dca54ecfbb (patch) | |
| tree | b5e39ab461f73d5a4b54d47718f95c701cf576d6 | |
| parent | dbb89f5cdd54d48dab22fb83ab36f3848c8fc87a (diff) | |
| download | docutils-5720d8e72b40d8dbc60edc5c04d9d4dca54ecfbb.tar.gz | |
Fix 366: circular import when docutils nodes is iported before docutils.utils
git-svn-id: http://svn.code.sf.net/p/docutils/code/branches/rel-0.15@8293 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
| -rw-r--r-- | docutils/HISTORY.txt | 7 | ||||
| -rw-r--r-- | docutils/docutils/nodes.py | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/docutils/HISTORY.txt b/docutils/HISTORY.txt index 3159c3a8f..fa69490bc 100644 --- a/docutils/HISTORY.txt +++ b/docutils/HISTORY.txt @@ -16,6 +16,13 @@ Changes Since 0.15 ================== +branches/rel-0.15 +----------------- + +* docutils/nodes.py + + - Fix 366: circular import when docutils nodes is iported before docutils.utils + by putting ``import docutils.utils`` into astext. Release 0.15 (2019-07-20) ========================= diff --git a/docutils/docutils/nodes.py b/docutils/docutils/nodes.py index dcaa667bd..62ea9996c 100644 --- a/docutils/docutils/nodes.py +++ b/docutils/docutils/nodes.py @@ -29,7 +29,8 @@ import warnings import types import unicodedata -import docutils.utils +# 2019-07-23 Fix bugs#366 move import docutils.utils into function astext +# import docutils.utils # ============================== # Functional Node Base Classes @@ -364,6 +365,7 @@ class Text(Node, reprunicode): return domroot.createTextNode(unicode(self)) def astext(self): + import docutils.utils return reprunicode(docutils.utils.unescape(self)) # Note about __unicode__: The implementation of __unicode__ here, |