Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix recentfiles.py to work for both py2/py3

Browse Source
This commit is contained in:
Josip 2014-04-05 01:45:36 +02:00
parent 26ab379584
commit d2066537c7
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gramps/gen/recentfiles.py
View File

@ -184,23 +184,27 @@ class RecentFiles(object):
"""
Saves the current Gramps RecentFiles collection to the associated file.
"""
with io.open(os.path.expanduser(GRAMPS_FILENAME), 'w', encoding='utf8') as xml_file:
if use_lock:
fcntl.lockf(xml_file,fcntl.LOCK_EX)
xml_file.write("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")
xml_file.write('<RecentFiles>\n')
index = 0
for item in self.gramps_recent_files:
index += 1
if index > MAX_GRAMPS_ITEMS:
break
xml_file.write(' <RecentItem>\n')
xml_file.write(' <Path><![CDATA[%s]]></Path>\n' % item.get_path())
xml_file.write(' <Name><![CDATA[%s]]></Name>\n' % item.get_name())
xml_file.write(' <Timestamp>%d</Timestamp>\n' % item.get_time())
xml_file.write(' </RecentItem>\n')
xml_file.write('</RecentFiles>\n')
# all advisory locks on a file are released on close
if sys.version_info[0] < 3:
xml_file = open(os.path.expanduser(GRAMPS_FILENAME), 'w')
else:
xml_file = open(os.path.expanduser(GRAMPS_FILENAME), 'w', encoding='utf8')
if use_lock:
fcntl.lockf(xml_file,fcntl.LOCK_EX)
xml_file.write("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")
xml_file.write('<RecentFiles>\n')
index = 0
for item in self.gramps_recent_files:
index += 1
if index > MAX_GRAMPS_ITEMS:
break
xml_file.write(' <RecentItem>\n')
xml_file.write(' <Path><![CDATA[%s]]></Path>\n' % item.get_path())
xml_file.write(' <Name><![CDATA[%s]]></Name>\n' % item.get_name())
xml_file.write(' <Timestamp>%d</Timestamp>\n' % item.get_time())
xml_file.write(' </RecentItem>\n')
xml_file.write('</RecentFiles>\n')
xml_file.close()
# all advisory locks on a file are released on close
#-------------------------------------------------------------------------
#
@ -222,7 +226,7 @@ class RecentParser(object):
try:
# Python3's expat wants bytes, Python2's wants a string.
fmode = "r" if sys.version_info[0] < 3 else "rb"
with io.open(fname, fmode) as xml_file:
with open(fname, fmode) as xml_file:
if use_lock:
fcntl.lockf(xml_file,fcntl.LOCK_SH)