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

Fix iteritems() call in python3.

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

12
secretary.py
View file

@ -275,7 +275,7 @@ class Renderer(object):
r'({[{|%].*)(<.?text:s.?>)(.*[%|}]})': r'\1 \3', r'({[{|%].*)(<.?text:s.?>)(.*[%|}]})': r'\1 \3',
} }
for p, r in unescape_rules.iteritems(): 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, flags=re.IGNORECASE or re.DOTALL)
return xml_text return xml_text
@ -287,7 +287,7 @@ class Renderer(object):
'[\u0009|\u000d|\u000a]': r'<text:s/>' '[\u0009|\u000d|\u000a]': r'<text:s/>'
} }
for p, r in encode_rules.iteritems(): 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, flags=re.IGNORECASE)
return xml_text return xml_text
@ -434,12 +434,12 @@ class Renderer(object):
style_node.setAttribute('style:parent-style-name', 'Standard') style_node.setAttribute('style:parent-style-name', 'Standard')
if attributes: if attributes:
for k, v in attributes.iteritems(): for k, v in attributes.items():
style_node.setAttribute('style:%s' % k, v) style_node.setAttribute('style:%s' % k, v)
if style_properties: if style_properties:
style_prop = self.content.createElement('style:text-properties') style_prop = self.content.createElement('style:text-properties')
for k, v in style_properties.iteritems(): for k, v in style_properties.items():
style_prop.setAttribute('%s' % k, v) style_prop.setAttribute('%s' % k, v)
style_node.appendChild(style_prop) style_node.appendChild(style_prop)
@ -482,12 +482,12 @@ class Renderer(object):
# Add style-attributes defined in transform_map # Add style-attributes defined in transform_map
if 'style_attributes' in transform_map[tag]: if 'style_attributes' in transform_map[tag]:
for k, v in transform_map[tag]['style_attributes'].iteritems(): for k, v in transform_map[tag]['style_attributes'].items():
odt_node.setAttribute('text:%s' % k, v) odt_node.setAttribute('text:%s' % k, v)
# Add defined attributes # Add defined attributes
if 'attributes' in transform_map[tag]: if 'attributes' in transform_map[tag]:
for k, v in transform_map[tag]['attributes'].iteritems(): for k, v in transform_map[tag]['attributes'].items():
odt_node.setAttribute(k, v) odt_node.setAttribute(k, v)
# copy original href attribute in <a> tag # copy original href attribute in <a> tag