ugly fix (error reporting)

[librarian.git] / librarian / xmlutils.py

diff --git a/librarian/xmlutils.py b/librarian/xmlutils.py
index 37a719b..bbcc884 100644 (file)
--- a/librarian/xmlutils.py
+++ b/librarian/xmlutils.py
@@ -12,21 +12,35 @@ class Xmill(object):
     Used instead of XSLT which is difficult and cumbersome.
 
     """
     Used instead of XSLT which is difficult and cumbersome.
 
     """

-    def __init__(self, options=None):
+    def __init__(self, options=None, state=None):

         self._options = []
         self._options = []

+        self.state = state or {}

         if options:
             self._options.append(options)
         self.text_filters = []
         if options:
             self._options.append(options)
         self.text_filters = []

+        self.escaped_text_filters = []

 
     def register_text_filter(self, fun):
         self.text_filters.append(fun)
 
 
     def register_text_filter(self, fun):
         self.text_filters.append(fun)
 

+    def register_escaped_text_filter(self, fun):
+        self.escaped_text_filters.append(fun)
+

     def filter_text(self, text):
         for flt in self.text_filters:
             if text is None:
                 return None
     def filter_text(self, text):
         for flt in self.text_filters:
             if text is None:
                 return None

-            text = flt(text)
-        return text
+            else:
+                text = flt(text)
+        # TODO: just work on the tree and let lxml handle escaping.
+        e = etree.Element("x")
+        e.text = text
+        # This whole mixing text with ML is so wrong.
+        output = etree.tostring(e, encoding=unicode)[3:-4]
+        for flt in self.escaped_text_filters:
+            output = flt(output)
+        return output
+

 
     def generate(self, document):
         """Generate text from node using handlers defined in class."""
 
     def generate(self, document):
         """Generate text from node using handlers defined in class."""


@@ -39,7 +53,7 @@ class Xmill(object):
         """
         # Here we can see how a decision not to return the modified map
         # leads to a need for a hack.
         """
         # Here we can see how a decision not to return the modified map
         # leads to a need for a hack.

-        return reduce(lambda a, b: a.update(b) or a, self._options, defaultdict(lambda: False))
+        return reduce(lambda a, b: a.update(b) or a, self._options, defaultdict(lambda: None))

 
     @options.setter
     def options(self, opts):
 
     @options.setter
     def options(self, opts):


@@ -90,6 +104,7 @@ class Xmill(object):
         if isinstance(element, etree._Comment): return None
         
         handler = self._handle_for_element(element)
         if isinstance(element, etree._Comment): return None
         
         handler = self._handle_for_element(element)

+        if self.state.get('mute') and not getattr(handler, 'unmuter', False): return None

         # How many scopes
         try:
             options_scopes = len(self._options)
         # How many scopes
         try:
             options_scopes = len(self._options)


@@ -114,19 +129,34 @@ class Xmill(object):
         finally:
             # clean up option scopes if necessary
             self._options = self._options[0:options_scopes]
         finally:
             # clean up option scopes if necessary
             self._options = self._options[0:options_scopes]

+            

         return out
 
 
         return out
 
 

-def tag(name, classes=None, **attrs):
+def tag_open_close(name_, classes_=None, **attrs):
+    u"""Creates tag beginning and end.
+    
+    >>> tag_open_close("a", "klass", x=u"ą<")
+    (u'<a x="\\u0105&lt;" class="klass">', u'</a>')
+
+    """
+    if classes_:
+        if isinstance(classes_, (tuple, list)): classes_ = ' '.join(classes_)
+        attrs['class'] = classes_
+
+    e = etree.Element(name_)
+    e.text = " "
+    for k, v in attrs.items():
+        e.attrib[k] = v
+    pre, post = etree.tostring(e, encoding=unicode).split(u"> <")
+    return pre + u">", u"<" + post
+
+def tag(name_, classes_=None, **attrs):

     """Returns a handler which wraps node contents in tag `name', with class attribute
     set to `classes' and other attributes according to keyword paramters
     """
     """Returns a handler which wraps node contents in tag `name', with class attribute
     set to `classes' and other attributes according to keyword paramters
     """

-    if classes:
-        if isinstance(classes, (tuple, list)): classes = ' '.join(classes)
-        attrs['class'] = classes
-    a = ''.join([' %s="%s"' % (k,v) for (k,v) in attrs.items()])

     def _hnd(self, element):
     def _hnd(self, element):

-        return "<%s%s>" % (name, a), "</%s>" % name
+        return tag_open_close(name_, classes_, **attrs)

     return _hnd
 
 
     return _hnd