gian/resync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reorder for py3 first

Browse Source
This commit is contained in:
Simeon Warner 2017-01-27 20:35:43 -05:00
parent 9c09624543
commit 5928c2ef9e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
resync/sitemap.py
View File

@ -117,20 +117,20 @@ class Sitemap(object):
if (fh is None):
xml_buf = io.StringIO()
fh = xml_buf
if (sys.version_info < (2, 7)):
tree.write(fh, encoding='UTF-8')
elif (sys.version_info < (3, 0)):
if (sys.version_info >= (3, 0)):
tree.write(
fh,
encoding='unicode',
xml_declaration=True,
method='xml')
elif (sys.version_info >= (2, 7)):
tree.write(
fh,
encoding='UTF-8',
xml_declaration=True,
method='xml')
else:
tree.write(
fh,
encoding="unicode",
xml_declaration=True,
method='xml')
else: # python2.6
tree.write(fh, encoding='UTF-8')
if (xml_buf is not None):
return(xml_buf.getvalue())
@ -282,7 +282,7 @@ class Sitemap(object):
without any XML declaration.
"""
e = self.resource_etree_element(resource)
if (sys.version_info > (3, 0)):
if (sys.version_info >= (3, 0)):
# python3.x
return(tostring(e, encoding='unicode', method='xml'))
elif (sys.version_info >= (2, 7)):