Changeset 187 for trunk/markup/input.py

Timestamp:

Aug 15, 2006, 12:12:03 PM (17 years ago)

Author:

cmlenz

Message:

Simplifed CoalesceFilter (now a function)

File:

• trunk/markup/input.py (modified) (3 diffs)

trunk/markup/input.py

@@ -113 +113 @@
                     msg += ', in ' + self.filename
                 raise ParseError(msg, self.filename, e.lineno, e.offset)
-        return Stream(_generate()).filter(CoalesceFilter())
+        return Stream(_generate()).filter(_coalesce)
 
     def __iter__(self):
@@ -246 +246 @@
                     msg += ', in %s' % self.filename
                 raise ParseError(msg, self.filename, e.lineno, e.offset)
-        return Stream(_generate()).filter(CoalesceFilter())
+        return Stream(_generate()).filter(_coalesce)
 
     def __iter__(self):
@@ -308 +308 @@
     return Stream(list(HTMLParser(StringIO(text))))
 
-
-class CoalesceFilter(object):
+def _coalesce(stream):
     """Coalesces adjacent TEXT events into a single event."""
-
-    def __call__(self, stream, ctxt=None):
-        textbuf = []
-        textpos = None
-        for kind, data, pos in chain(stream, [(None, None, None)]):
-            if kind is TEXT:
-                textbuf.append(data)
-                if textpos is None:
-                    textpos = pos
-            else:
-                if textbuf:
-                    yield TEXT, u''.join(textbuf), textpos
-                    del textbuf[:]
-                    textpos = None
-                if kind:
-                    yield kind, data, pos
+    textbuf = []
+    textpos = None
+    for kind, data, pos in chain(stream, [(None, None, None)]):
+        if kind is TEXT:
+            textbuf.append(data)
+            if textpos is None:
+                textpos = pos
+        else:
+            if textbuf:
+                yield TEXT, u''.join(textbuf), textpos
+                del textbuf[:]
+                textpos = None
+            if kind:
+                yield kind, data, pos