evin/secretary
3
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix regexs to be compatible with Python2.6.

Browse source
This commit is contained in:
Christopher Ramírez 2014-07-19 21:59:47 -06:00
parent 42d48731f2
commit 9561666355
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
secretary.py
View file

@ -199,11 +199,11 @@ class Renderer(object):
field_content = field.childNodes[0].data.strip() field_content = field.childNodes[0].data.strip()
if not re.findall(r'^{[{|%].*[%|}]}$', field_content, re.DOTALL): if not re.findall(r'(?is)^{[{|%].*[%|}]}$', field_content):
# Field does not contains jinja template tags # Field does not contains jinja template tags
continue continue
is_block_tag = re.findall(r'^{%[^{}]*%}$', field_content, re.DOTALL) is_block_tag = re.findall(r'(?is)^{%[^{}]*%}$', field_content)
self.inc_node_fields_count(field.parentNode, self.inc_node_fields_count(field.parentNode,
'block' if is_block_tag else 'variable') 'block' if is_block_tag else 'variable')
@ -214,11 +214,11 @@ class Renderer(object):
field_content = field.childNodes[0].data.strip() field_content = field.childNodes[0].data.strip()
if not re.findall(r'^{[{|%].*[%|}]}$', field_content, re.DOTALL): if not re.findall(r'(?is)^{[{|%].*[%|}]}$', field_content):
# Field does not contains jinja template tags # Field does not contains jinja template tags
continue continue
is_block_tag = re.findall(r'^{%[^{}]*%}$', field_content, re.DOTALL) is_block_tag = re.findall(r'(?is)^{%[^{}]*%}$', field_content)
discard = field discard = field
field_reference = field.getAttribute('text:description').strip().lower() field_reference = field.getAttribute('text:description').strip().lower()
@ -270,25 +270,25 @@ class Renderer(object):
def _unescape_entities(self, xml_text): def _unescape_entities(self, xml_text):
# unescape XML entities gt and lt # unescape XML entities gt and lt
unescape_rules = { unescape_rules = {
r'({[{|%].*)(>)(.*[%|}]})': r'\1>\3', r'(?is)({[{|%].*)(>)(.*[%|}]})': r'\1>\3',
r'({[{|%].*)(&lt;)(.*[%|}]})': r'\1<\3', r'(?is)({[{|%].*)(&lt;)(.*[%|}]})': r'\1<\3',
r'({[{|%].*)(<.?text:s.?>)(.*[%|}]})': r'\1 \3', r'(?is)({[{|%].*)(<.?text:s.?>)(.*[%|}]})': r'\1 \3',
} }
for p, r in unescape_rules.items(): for p, r in unescape_rules.items():
xml_text = re.sub(p, r, xml_text, flags=re.IGNORECASE or re.DOTALL) xml_text = re.sub(p, r, xml_text)
return xml_text return xml_text
def _encode_escape_chars(self, xml_text): def _encode_escape_chars(self, xml_text):
encode_rules = { encode_rules = {
'(<text:(?:[ahp]|ruby-base|span|meta|meta-field)>.*)(\n)(.*</text:(?:[ahp]|ruby-base|span|meta|meta-field)>)': r'\1<text:line-break/>\3', '(?i)(<text:(?:[ahp]|ruby-base|span|meta|meta-field)>.*)(\n)(.*</text:(?:[ahp]|ruby-base|span|meta|meta-field)>)': r'\1<text:line-break/>\3',
'(<text:(?:[ahp]|ruby-base|span|meta|meta-field)>.*)(\u0009)(.*</text:(?:[ahp]|ruby-base|span|meta|meta-field)>)': r'\1<text:tab>\3', '(?i)(<text:(?:[ahp]|ruby-base|span|meta|meta-field)>.*)(\u0009)(.*</text:(?:[ahp]|ruby-base|span|meta|meta-field)>)': r'\1<text:tab>\3',
'[\u0009|\u000d|\u000a]': r'<text:s/>' '(?i)[\u0009|\u000d|\u000a]': r'<text:s/>'
} }
for p, r in encode_rules.items(): for p, r in encode_rules.items():
xml_text = re.sub(p, r, xml_text, flags=re.IGNORECASE) xml_text = re.sub(p, r, xml_text)
return xml_text return xml_text