Improve coding style for imports

peter17 · Jul 12, 2011 · 6b0586a · 6b0586a
1 parent 8c3e0b1
commit 6b0586a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/html.py b/html.py
@@ -19,6 +19,7 @@ def render_body(node):
            'render_title2': render_title2,
            'render_body': render_body}
 
+from mediawiki_parser import wikitextParser
+
 def make_parser():
-    from mediawiki_parser.wikitextParser import make_parser
-    return make_parser(toolset)
+    return wikitextParser.make_parser(toolset)
diff --git a/raw.py b/raw.py
@@ -19,6 +19,7 @@ def render_body(node):
            'render_title2': render_title2,
            'render_body': render_body}
 
+from mediawiki_parser import wikitextParser
+
 def make_parser():
-    from mediawiki_parser.wikitextParser import make_parser
-    return make_parser(toolset)
+    return wikitextParser.make_parser(toolset)
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -14,8 +14,8 @@ def _grammar(self, method_name):
         method_name -- If truthy, the attribute of the full grammar to return
 
         """
-        from raw import make_parser
-        parser = make_parser()
+        from mediawiki_parser import raw
+        parser = raw.make_parser()
         return getattr(parser, method_name) if method_name else parser
 
     def parsed_equal_string(self, source, result, method_name):

diff --git a/text.py b/text.py
@@ -18,6 +18,7 @@ def render_body(node):
            'render_title2': render_title2,
            'render_body': render_body}
 
+from mediawiki_parser import wikitextParser
+
 def make_parser():
-    from mediawiki_parser.wikitextParser import make_parser
-    return make_parser(toolset)
+    return wikitextParser.make_parser(toolset)