From 900c559385a176b2d7bc13acff8191527bdd9075 Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Tue, 17 Jul 2012 17:38:44 -0400 Subject: [PATCH] Move mwpfh.parser.utils to mwpfh.utils; fix import structure. --- mwparserfromhell/nodes/extras/parameter.py | 2 +- mwparserfromhell/nodes/template.py | 2 +- mwparserfromhell/{parser => }/utils.py | 2 +- mwparserfromhell/wikicode.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename mwparserfromhell/{parser => }/utils.py (97%) diff --git a/mwparserfromhell/nodes/extras/parameter.py b/mwparserfromhell/nodes/extras/parameter.py index 8a53a98..45051d9 100644 --- a/mwparserfromhell/nodes/extras/parameter.py +++ b/mwparserfromhell/nodes/extras/parameter.py @@ -20,8 +20,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from mwparserfromhell.parser.utils import parse_anything from mwparserfromhell.string_mixin import StringMixIn +from mwparserfromhell.utils import parse_anything __all__ = ["Parameter"] diff --git a/mwparserfromhell/nodes/template.py b/mwparserfromhell/nodes/template.py index 8e01d7a..9da2295 100644 --- a/mwparserfromhell/nodes/template.py +++ b/mwparserfromhell/nodes/template.py @@ -22,7 +22,7 @@ from mwparserfromhell.nodes import Node from mwparserfromhell.nodes.extras import Parameter -from mwparserfromhell.parser.utils import parse_anything +from mwparserfromhell.utils import parse_anything __all__ = ["Template"] diff --git a/mwparserfromhell/parser/utils.py b/mwparserfromhell/utils.py similarity index 97% rename from mwparserfromhell/parser/utils.py rename to mwparserfromhell/utils.py index b345e5c..52878cc 100644 --- a/mwparserfromhell/parser/utils.py +++ b/mwparserfromhell/utils.py @@ -22,9 +22,9 @@ import mwparserfromhell from mwparserfromhell.nodes import Node -from mwparserfromhell.wikicode import Wikicode def parse_anything(value): + Wikicode = mwparserfromhell.wikicode.Wikicode if isinstance(value, Wikicode): return value if isinstance(value, Node): diff --git a/mwparserfromhell/wikicode.py b/mwparserfromhell/wikicode.py index 38bb737..5f81e23 100644 --- a/mwparserfromhell/wikicode.py +++ b/mwparserfromhell/wikicode.py @@ -23,8 +23,8 @@ import re from mwparserfromhell.nodes import HTMLEntity, Node, Template, Text -from mwparserfromhell.parser.utils import parse_anything from mwparserfromhell.string_mixin import StringMixIn +from mwparserfromhell.utils import parse_anything __all__ = ["Wikicode"]