X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/0ed55708c990f67143d50dd07b25f3ce8f36e9de..6a2a1ba8ab5cad50af8dc0b1ec0387e4e4f41f4b:/librarian/xmlutils.py diff --git a/librarian/xmlutils.py b/librarian/xmlutils.py index 9768623..ae3512a 100644 --- a/librarian/xmlutils.py +++ b/librarian/xmlutils.py @@ -12,8 +12,9 @@ class Xmill(object): Used instead of XSLT which is difficult and cumbersome. """ - def __init__(self, options=None): + def __init__(self, options=None, state=None): self._options = [] + self.state = state or {} if options: self._options.append(options) self.text_filters = [] @@ -40,7 +41,6 @@ class Xmill(object): output = flt(output) return output - def generate(self, document): """Generate text from node using handlers defined in class.""" output = self._handle_element(document) @@ -60,18 +60,17 @@ class Xmill(object): """ self._options.append(opts) - def _handle_for_element(self, element): ns = None tagname = None -# from nose.tools import set_trace + # from nose.tools import set_trace if element.tag[0] == '{': for nshort, nhref in element.nsmap.items(): try: if element.tag.index('{%s}' % nhref) == 0: ns = nshort - tagname = element.tag[len('{%s}' % nhref):] + tagname = element.tag[len('{%s}' % nhref):] break except ValueError: pass @@ -95,18 +94,22 @@ class Xmill(object): while True: sibling = element.getnext() - if sibling is not None: return sibling # found a new branch to dig into + if sibling is not None: + return sibling # found a new branch to dig into element = element.getparent() - if element is None: return None # end of tree + if element is None: + return None # end of tree def _handle_element(self, element): - if isinstance(element, etree._Comment): return None - + 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 + options_scopes = len(self._options) try: - options_scopes = len(self._options) - if handler is None: pre = [self.filter_text(element.text)] post = [self.filter_text(element.tail)] @@ -127,18 +130,20 @@ class Xmill(object): finally: # clean up option scopes if necessary self._options = self._options[0:options_scopes] + return out def tag_open_close(name_, classes_=None, **attrs): u"""Creates tag beginning and end. - + >>> tag_open_close("a", "klass", x=u"ą<") (u'', u'') """ if classes_: - if isinstance(classes_, (tuple, list)): classes_ = ' '.join(classes_) + if isinstance(classes_, (tuple, list)): + classes_ = ' '.join(classes_) attrs['class'] = classes_ e = etree.Element(name_) @@ -148,6 +153,7 @@ def tag_open_close(name_, classes_=None, **attrs): 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 @@ -162,13 +168,16 @@ def tagged(name, classes=None, **attrs): set to `classes' and other attributes according to keyword paramters """ if classes: - if isinstance(classes, (tuple,list)): classes = ' '.join(classes) + if isinstance(classes, (tuple, list)): + classes = ' '.join(classes) attrs['class'] = classes - a = ''.join([' %s="%s"' % (k,v) for (k,v) in attrs.items()]) + a = ''.join([' %s="%s"' % (k, v) for (k, v) in attrs.items()]) + def _decor(f): def _wrap(self, element): r = f(self, element) - if r is None: return + if r is None: + return prepend = "<%s%s>" % (name, a) append = "" % name @@ -193,6 +202,7 @@ def ifoption(**options): return _handler return _decor + def flatten(l, ltypes=(list, tuple)): """flatten function from BasicPropery/BasicTypes package """