Allow creating more than one instance of the parser, to avoid memoïza…

…tion problems
peter17 · Jul 12, 2011 · 8c3e0b1 · erikrose · Jul 12, 2011 · erikrose
1 parent bfa9bf6
commit 8c3e0b1
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 14 deletions.
diff --git a/html.py b/html.py
@@ -14,10 +14,11 @@ def render_paragraph(node):
 def render_body(node):
     node.value = '<body>\n%s</body>' % node.leaf()
 
-from mediawiki_parser.wikitextParser import make_parser
-
 toolset = {'render_raw_text': render_raw_text,
            'render_paragraph': render_paragraph,
            'render_title2': render_title2,
            'render_body': render_body}
-parser = make_parser(toolset)
+
+def make_parser():
+    from mediawiki_parser.wikitextParser import make_parser
+    return make_parser(toolset)
diff --git a/parser.py b/parser.py
@@ -1,11 +1,12 @@
 # -*- coding: utf8 -*-
 
 # get the parser
-#from pijnu import makeParser
-#mediawikiGrammar = file("mediawiki.pijnu").read()
-#mediawikiParser = makeParser(mediawikiGrammar)
+from pijnu import makeParser
+mediawikiGrammar = file("mediawiki.pijnu").read()
+makeParser(mediawikiGrammar)
 
-from html import parser
+from html import make_parser
+parser = make_parser()
 
 # import the source in a utf-8 string
 import codecs

diff --git a/raw.py b/raw.py
@@ -14,10 +14,11 @@ def render_paragraph(node):
 def render_body(node):
     pass
 
-from mediawiki_parser.wikitextParser import make_parser
-
 toolset = {'render_raw_text': render_raw_text,
            'render_paragraph': render_paragraph,
            'render_title2': render_title2,
            'render_body': render_body}
-parser = make_parser(toolset)
+
+def make_parser():
+    from mediawiki_parser.wikitextParser import make_parser
+    return make_parser(toolset)
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -2,14 +2,20 @@
 from unittest import TestCase
 
 
+def setup_module():
+    from pijnu import makeParser
+    mediawikiGrammar = file("mediawiki.pijnu").read()
+    mediawikiParser = makeParser(mediawikiGrammar)
+
 class ParserTestCase(TestCase):
     def _grammar(self, method_name):
         """Return a full or partial grammar.
 
         method_name -- If truthy, the attribute of the full grammar to return
 
         """
-        from raw import parser
+        from raw import make_parser
+        parser = 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
@@ -13,10 +13,11 @@ def render_paragraph(node):
 def render_body(node):
     pass
 
-from mediawiki_parser.wikitextParser import make_parser
-
 toolset = {'render_raw_text': render_raw_text,
            'render_paragraph': render_paragraph,
            'render_title2': render_title2,
            'render_body': render_body}
-parser = make_parser(toolset)
+
+def make_parser():
+    from mediawiki_parser.wikitextParser import make_parser
+    return make_parser(toolset)