Context() object can't be used from Trac

[cboos]

The latest Trac markup sandbox ​[trac 3612] and latest Markup [197] fails with this error:

Traceback (most recent call last):
  File "C:\Workspace\install\lib\python\trac\devel\Lib\site-packages\trac\web\main.py", line 344, in dispatch_request
    dispatcher.dispatch(req)
  File "C:\Workspace\install\lib\python\trac\devel\Lib\site-packages\trac\web\main.py", line 233, in dispatch
    content_type, data)
  File "C:\Workspace\install\lib\python\trac\devel\Lib\site-packages\trac\web\chrome.py", line 372, in render_response
    return stream.render(method, doctype=doctype)
  File "markup\core.py", line 92, in render
  File "markup\output.py", line 205, in __call__
  File "markup\output.py", line 498, in next
  File "markup\output.py", line 443, in __call__
  File "markup\core.py", line 149, in _ensure
  File "c:\workspace\src\trac\markup\trunk\markup\filters.py", line 147, in __call__
    for kind, data, pos in stream:
  File "c:\workspace\src\trac\markup\trunk\markup\template.py", line 920, in _flatten
    for kind, data, pos in stream:
  File "c:\workspace\src\trac\markup\trunk\markup\template.py", line 938, in _match
    match_templates = ctxt._match_templates
AttributeError: 'Context' object has no attribute '_match_templates'

The following change fixes it:

markup/template.py

@@ -103 +103 @@
         self.frames = deque([data])
         self.pop = self.frames.popleft
         self.push = self.frames.appendleft
+        self._match_templates = []
 
     def __repr__(self):
         return repr(self.frames)
@@ -852 +853 @@
             assert isinstance(ctxt, Context)
         else:
             ctxt = Context(**kwargs)
-            ctxt._match_templates = []
 
         stream = self.stream
         for filter_ in [self._eval, self._match, self._flatten] + self.filters:

[cmlenz]

I think this actually needs to be fixed in the Trac branch, admittedly caused by a backwards incompatible change in Markup in [191]. I'll look into that.

[cmlenz]

Okay, I've fixed up the Trac-with-Markup branch, but also applied your patch in [199]. Seemed like a good idea in any case. Thanks!