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

Revert "Sorting escape rules to ensure an apply order."

Browse source 
This reverts commit 4067b17a59.
This commit is contained in:
Christopher Ramírez 2014-07-20 17:00:54 -06:00
parent a10a4b0af4
commit 8f1bde4035
1 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
secretary.py
View file

@ -22,7 +22,6 @@ import re
import sys import sys
import logging import logging
import zipfile import zipfile
from collections import OrderedDict
from xml.dom.minidom import parseString from xml.dom.minidom import parseString
from jinja2 import Environment, Undefined from jinja2 import Environment, Undefined
@ -286,9 +285,6 @@ 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
if sys.version_info >= (2, 7):
unescape_rules = OrderedDict()
unescape_rules = { unescape_rules = {
r'(?is)({[{|%].*)(>)(.*[%|}]})': r'\1>\3', r'(?is)({[{|%].*)(>)(.*[%|}]})': r'\1>\3',
r'(?is)({[{|%].*)(&lt;)(.*[%|}]})': r'\1<\3', r'(?is)({[{|%].*)(&lt;)(.*[%|}]})': r'\1<\3',
@ -301,9 +297,6 @@ class Renderer(object):
return xml_text return xml_text
def _encode_escape_chars(self, xml_text): def _encode_escape_chars(self, xml_text):
if sys.version_info >= (2, 7):
encode_rules = OrderedDict()
encode_rules = { encode_rules = {
'(?i)(<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',
'(?i)(<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',