From 8835ca313a9f677d3e412961b155e241e889d1f0 Mon Sep 17 00:00:00 2001
From: Ben Kurtovic <ben.kurtovic@gmail.com>
Date: Sat, 6 Feb 2016 02:16:27 -0600
Subject: [PATCH] Don't preserve context when popping template key stack (fixes
 #142, hopefully).

---
 mwparserfromhell/parser/ctokenizer/tok_parse.c |  6 +++---
 mwparserfromhell/parser/tokenizer.py           | 13 +++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/mwparserfromhell/parser/ctokenizer/tok_parse.c b/mwparserfromhell/parser/ctokenizer/tok_parse.c
index 521640d..6402c75 100644
--- a/mwparserfromhell/parser/ctokenizer/tok_parse.c
+++ b/mwparserfromhell/parser/ctokenizer/tok_parse.c
@@ -249,7 +249,7 @@ static int Tokenizer_handle_template_param(Tokenizer* self)
     else if (self->topstack->context & LC_TEMPLATE_PARAM_VALUE)
         self->topstack->context ^= LC_TEMPLATE_PARAM_VALUE;
     if (self->topstack->context & LC_TEMPLATE_PARAM_KEY) {
-        stack = Tokenizer_pop_keeping_context(self);
+        stack = Tokenizer_pop(self);
         if (!stack)
             return -1;
         if (Tokenizer_emit_all(self, stack)) {
@@ -274,7 +274,7 @@ static int Tokenizer_handle_template_param_value(Tokenizer* self)
 {
     PyObject *stack;
 
-    stack = Tokenizer_pop_keeping_context(self);
+    stack = Tokenizer_pop(self);
     if (!stack)
         return -1;
     if (Tokenizer_emit_all(self, stack)) {
@@ -301,7 +301,7 @@ static PyObject* Tokenizer_handle_template_end(Tokenizer* self)
             return Tokenizer_fail_route(self);
     }
     else if (self->topstack->context & LC_TEMPLATE_PARAM_KEY) {
-        stack = Tokenizer_pop_keeping_context(self);
+        stack = Tokenizer_pop(self);
         if (!stack)
             return NULL;
         if (Tokenizer_emit_all(self, stack)) {
diff --git a/mwparserfromhell/parser/tokenizer.py b/mwparserfromhell/parser/tokenizer.py
index dddb6bc..562caf5 100644
--- a/mwparserfromhell/parser/tokenizer.py
+++ b/mwparserfromhell/parser/tokenizer.py
@@ -264,14 +264,14 @@ class Tokenizer(object):
         elif self._context & contexts.TEMPLATE_PARAM_VALUE:
             self._context ^= contexts.TEMPLATE_PARAM_VALUE
         else:
-            self._emit_all(self._pop(keep_context=True))
+            self._emit_all(self._pop())
         self._context |= contexts.TEMPLATE_PARAM_KEY
         self._emit(tokens.TemplateParamSeparator())
         self._push(self._context)
 
     def _handle_template_param_value(self):
         """Handle a template parameter's value at the head of the string."""
-        self._emit_all(self._pop(keep_context=True))
+        self._emit_all(self._pop())
         self._context ^= contexts.TEMPLATE_PARAM_KEY
         self._context |= contexts.TEMPLATE_PARAM_VALUE
         self._emit(tokens.TemplateParamEquals())
@@ -282,7 +282,7 @@ class Tokenizer(object):
             if not self._context & (contexts.HAS_TEXT | contexts.HAS_TEMPLATE):
                 self._fail_route()
         elif self._context & contexts.TEMPLATE_PARAM_KEY:
-            self._emit_all(self._pop(keep_context=True))
+            self._emit_all(self._pop())
         self._head += 1
         return self._pop()
 
@@ -1338,9 +1338,10 @@ class Tokenizer(object):
                 if result is not None:
                     return result
             elif self._read(-1) in ("\n", self.START) and this in ("#", "*", ";", ":"):
-                    self._handle_list()
-            elif self._read(-1) in ("\n", self.START) and this == next == self._read(2) == self._read(3) == "-":
-                    self._handle_hr()
+                self._handle_list()
+            elif self._read(-1) in ("\n", self.START) and (
+                    this == next == self._read(2) == self._read(3) == "-"):
+                self._handle_hr()
             elif this in ("\n", ":") and self._context & contexts.DL_TERM:
                 self._handle_dl_term()
                 if this == "\n":