beckermj/gramps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #113 from sam-m888/useWithOpen

Browse Source 
Prefer with to open files
This commit is contained in:
Doug Blank 2016-04-25 21:35:23 -04:00
commit b526a41af1
11 changed files with 296 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gramps/cli/clidbman.py
View File

@ -234,9 +234,8 @@ class CLIDbManager(object):
except: except:
version = (0, 0, 0) version = (0, 0, 0)
if os.path.isfile(path_name): if os.path.isfile(path_name):
file = open(path_name, 'r', encoding='utf8') with open(path_name, 'r', encoding='utf8') as file:
name = file.readline().strip() name = file.readline().strip()
file.close()
(tval, last) = time_val(dirpath) (tval, last) = time_val(dirpath)
(enable, stock_id) = self.icon_values(dirpath, self.active, (enable, stock_id) = self.icon_values(dirpath, self.active,
@ -293,9 +292,8 @@ class CLIDbManager(object):
name_list = [ name[0] for name in self.current_names ] name_list = [ name[0] for name in self.current_names ]
title = find_next_db_name(name_list) title = find_next_db_name(name_list)
name_file = open(path_name, "w", encoding='utf8') with open(path_name, "w", encoding='utf8') as name_file:
name_file.write(title) name_file.write(title)
name_file.close()
if create_db: if create_db:
# write the version number into metadata # write the version number into metadata
@ -409,9 +407,8 @@ class CLIDbManager(object):
dirpath = os.path.join(dbdir, dpath) dirpath = os.path.join(dbdir, dpath)
path_name = os.path.join(dirpath, NAME_FILE) path_name = os.path.join(dirpath, NAME_FILE)
if os.path.isfile(path_name): if os.path.isfile(path_name):
file = open(path_name, 'r', encoding='utf8') with open(path_name, 'r', encoding='utf8') as file:
name = file.readline().strip() name = file.readline().strip()
file.close()
if re.match("^" + dbname + "$", name): if re.match("^" + dbname + "$", name):
match_list.append((name, dirpath)) match_list.append((name, dirpath))
if len(match_list) == 0: if len(match_list) == 0:
@ -438,12 +435,10 @@ class CLIDbManager(object):
Returns old_name, new_name if success, None, None if no success Returns old_name, new_name if success, None, None if no success
""" """
try: try:
name_file = open(filepath, "r", encoding='utf8') with open(filepath, "r", encoding='utf8') as name_file:
old_text=name_file.read() old_text=name_file.read()
name_file.close() with open(filepath, "w", encoding='utf8') as name_file:
name_file = open(filepath, "w", encoding='utf8') name_file.write(new_text)
name_file.write(new_text)
name_file.close()
except (OSError, IOError) as msg: except (OSError, IOError) as msg:
CLIDbManager.ERROR(_("Could not rename Family Tree"), CLIDbManager.ERROR(_("Could not rename Family Tree"),
str(msg)) str(msg))
@ -543,11 +538,10 @@ def find_locker_name(dirpath):
""" """
try: try:
fname = os.path.join(dirpath, "lock") fname = os.path.join(dirpath, "lock")
ifile = open(fname, 'r', encoding='utf8') with open(fname, 'r', encoding='utf8') as ifile:
username = ifile.read().strip() username = ifile.read().strip()
# feature request 2356: avoid genitive form # feature request 2356: avoid genitive form
last = _("Locked by %s") % username last = _("Locked by %s") % username
ifile.close()
except (OSError, IOError, UnicodeDecodeError): except (OSError, IOError, UnicodeDecodeError):
last = _("Unknown") last = _("Unknown")
return last return last

17
gramps/gen/dbstate.py
View File

@ -203,26 +203,23 @@ class DbState(Callback):
dirpath = os.path.join(dbdir, dpath) dirpath = os.path.join(dbdir, dpath)
path_name = os.path.join(dirpath, "name.txt") path_name = os.path.join(dirpath, "name.txt")
if os.path.isfile(path_name): if os.path.isfile(path_name):
file = open(path_name, 'r', encoding='utf8') with open(path_name, 'r', encoding='utf8') as file:
name = file.readline().strip() name = file.readline().strip()
file.close()
if dbname == name: if dbname == name:
locked = False locked = False
locked_by = None locked_by = None
backend = None backend = None
fname = os.path.join(dirpath, "database.txt") fname = os.path.join(dirpath, "database.txt")
if os.path.isfile(fname): if os.path.isfile(fname):
ifile = open(fname, 'r', encoding='utf8') with open(fname, 'r', encoding='utf8') as ifile:
backend = ifile.read().strip() backend = ifile.read().strip()
ifile.close()
else: else:
backend = "bsddb" backend = "bsddb"
try: try:
fname = os.path.join(dirpath, "lock") fname = os.path.join(dirpath, "lock")
ifile = open(fname, 'r', encoding='utf8') with open(fname, 'r', encoding='utf8') as ifile:
locked_by = ifile.read().strip() locked_by = ifile.read().strip()
locked = True locked = True
ifile.close()
except (OSError, IOError): except (OSError, IOError):
pass pass
return (dirpath, locked, locked_by, backend) return (dirpath, locked, locked_by, backend)

5
gramps/gen/filters/_filterlist.py
View File

@ -103,9 +103,8 @@ class FilterList(object):
if os.path.isfile(self.file): if os.path.isfile(self.file):
parser = make_parser() parser = make_parser()
parser.setContentHandler(FilterParser(self)) parser.setContentHandler(FilterParser(self))
the_file = open(self.file, 'r', encoding='utf8') with open(self.file, 'r', encoding='utf8') as the_file:
parser.parse(the_file) parser.parse(the_file)
the_file.close()
except (IOError, OSError): except (IOError, OSError):
print("IO/OSError in _filterlist.py") print("IO/OSError in _filterlist.py")
except SAXParseException: except SAXParseException:

5
gramps/gen/plug/docgen/graphdoc.py
View File

@ -603,9 +603,8 @@ class GVDotDoc(GVDocBase):
if self._filename[-3:] != ".gv": if self._filename[-3:] != ".gv":
self._filename += ".gv" self._filename += ".gv"
dotfile = open(self._filename, "wb") with open(self._filename, "wb") as dotfile:
dotfile.write(self._dot.getvalue()) dotfile.write(self._dot.getvalue())
dotfile.close()
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# #

42
gramps/gen/plug/docgen/stylesheet.py
View File

@ -146,31 +146,30 @@ class StyleSheetList(object):
""" """
Saves the current StyleSheet definitions to the associated file. Saves the current StyleSheet definitions to the associated file.
""" """
xml_file = open(self.__file, "w") with open(self.__file, "w") as xml_file:
xml_file.write('<?xml version="1.0" encoding="utf-8"?>\n') xml_file.write('<?xml version="1.0" encoding="utf-8"?>\n')
xml_file.write('<stylelist>\n') xml_file.write('<stylelist>\n')
for name in sorted(self.map.keys()): # enable diff of archived copies for name in sorted(self.map.keys()): # enable diff of archived copies
if name == "default": if name == "default":
continue continue
sheet = self.map[name] sheet = self.map[name]
xml_file.write('<sheet name="%s">\n' % escxml(name)) xml_file.write('<sheet name="%s">\n' % escxml(name))
for p_name in sheet.get_paragraph_style_names(): for p_name in sheet.get_paragraph_style_names():
self.write_paragraph_style(xml_file, sheet, p_name) self.write_paragraph_style(xml_file, sheet, p_name)
for t_name in sheet.get_table_style_names(): for t_name in sheet.get_table_style_names():
self.write_table_style(xml_file, sheet, t_name) self.write_table_style(xml_file, sheet, t_name)
for c_name in sheet.get_cell_style_names(): for c_name in sheet.get_cell_style_names():
self.write_cell_style(xml_file, sheet, c_name) self.write_cell_style(xml_file, sheet, c_name)
for g_name in sheet.get_draw_style_names(): for g_name in sheet.get_draw_style_names():
self.write_graphics_style(xml_file, sheet, g_name) self.write_graphics_style(xml_file, sheet, g_name)
xml_file.write('</sheet>\n') xml_file.write('</sheet>\n')
xml_file.write('</stylelist>\n') xml_file.write('</stylelist>\n')
xml_file.close()
def write_paragraph_style(self, xml_file, sheet, p_name): def write_paragraph_style(self, xml_file, sheet, p_name):
@ -275,9 +274,8 @@ class StyleSheetList(object):
if os.path.isfile(self.__file): if os.path.isfile(self.__file):
parser = make_parser() parser = make_parser()
parser.setContentHandler(SheetParser(self)) parser.setContentHandler(SheetParser(self))
the_file = open(self.__file) with open(self.__file) as the_file:
parser.parse(the_file) parser.parse(the_file)
the_file.close()
except (IOError, OSError, SAXParseException): except (IOError, OSError, SAXParseException):
pass pass

113
gramps/gen/plug/report/_book.py
View File

@ -458,68 +458,67 @@ class BookList(object):
""" """
Saves the current BookList to the associated file. Saves the current BookList to the associated file.
""" """
f = open(self.file, "w") with open(self.file, "w") as f:
f.write("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n") f.write("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")
f.write('<booklist>\n') f.write('<booklist>\n')
for name in sorted(self.bookmap): # enable a diff of archived copies for name in sorted(self.bookmap): # enable a diff of archived copies
book = self.get_book(name) book = self.get_book(name)
dbname = book.get_dbname() dbname = book.get_dbname()
f.write(' <book name="%s" database="%s">\n' % (name, dbname) ) f.write(' <book name="%s" database="%s">\n' % (name, dbname) )
for item in book.get_item_list(): for item in book.get_item_list():
f.write(' <item name="%s" trans_name="%s">\n' % f.write(' <item name="%s" trans_name="%s">\n' %
(item.get_name(), item.get_translated_name() ) ) (item.get_name(), item.get_translated_name() ) )
options = item.option_class.handler.options_dict options = item.option_class.handler.options_dict
for option_name in sorted(options.keys()): # enable a diff for option_name in sorted(options.keys()): # enable a diff
option_value = options[option_name] option_value = options[option_name]
if isinstance(option_value, (list, tuple)): if isinstance(option_value, (list, tuple)):
f.write(' <option name="%s" value="" ' f.write(' <option name="%s" value="" '
'length="%d">\n' % ( 'length="%d">\n' % (
escape(option_name), escape(option_name),
len(options[option_name]) ) ) len(options[option_name]) ) )
for list_index in range(len(option_value)): for list_index in range(len(option_value)):
option_type = type_name(option_value[list_index]) option_type = type_name(option_value[list_index])
value = escape(str(option_value[list_index])) value = escape(str(option_value[list_index]))
value = value.replace('"', '&quot;')
f.write(' <listitem number="%d" type="%s" '
'value="%s"/>\n' % (
list_index,
option_type,
value ) )
f.write(' </option>\n')
else:
option_type = type_name(option_value)
value = escape(str(option_value))
value = value.replace('"', '&quot;') value = value.replace('"', '&quot;')
f.write(' <listitem number="%d" type="%s" ' f.write(' <option name="%s" type="%s" '
'value="%s"/>\n' % ( 'value="%s"/>\n' % (
list_index, escape(option_name),
option_type, option_type,
value ) ) value) )
f.write(' </option>\n')
else:
option_type = type_name(option_value)
value = escape(str(option_value))
value = value.replace('"', '&quot;')
f.write(' <option name="%s" type="%s" '
'value="%s"/>\n' % (
escape(option_name),
option_type,
value) )
f.write(' <style name="%s"/>\n' % item.get_style_name() ) f.write(' <style name="%s"/>\n' % item.get_style_name() )
f.write(' </item>\n') f.write(' </item>\n')
if book.get_paper_name(): if book.get_paper_name():
f.write(' <paper name="%s"/>\n' % book.get_paper_name() ) f.write(' <paper name="%s"/>\n' % book.get_paper_name() )
if book.get_orientation() is not None: # 0 is legal if book.get_orientation() is not None: # 0 is legal
f.write(' <orientation value="%s"/>\n' % f.write(' <orientation value="%s"/>\n' %
book.get_orientation() ) book.get_orientation() )
if book.get_paper_metric() is not None: # 0 is legal if book.get_paper_metric() is not None: # 0 is legal
f.write(' <metric value="%s"/>\n' % book.get_paper_metric() ) f.write(' <metric value="%s"/>\n' % book.get_paper_metric() )
if book.get_custom_paper_size(): if book.get_custom_paper_size():
size = book.get_custom_paper_size() size = book.get_custom_paper_size()
f.write(' <size value="%f %f"/>\n' % (size[0], size[1]) ) f.write(' <size value="%f %f"/>\n' % (size[0], size[1]) )
if book.get_margins(): if book.get_margins():
for pos in range(len(book.get_margins())): for pos in range(len(book.get_margins())):
f.write(' <margin number="%s" value="%f"/>\n' % f.write(' <margin number="%s" value="%f"/>\n' %
(pos, book.get_margin(pos)) ) (pos, book.get_margin(pos)) )
if book.get_format_name(): if book.get_format_name():
f.write(' <format name="%s"/>\n' % book.get_format_name() ) f.write(' <format name="%s"/>\n' % book.get_format_name() )
if book.get_output(): if book.get_output():
f.write(' <output name="%s"/>\n' % book.get_output() ) f.write(' <output name="%s"/>\n' % book.get_output() )
f.write(' </book>\n') f.write(' </book>\n')
f.write('</booklist>\n') f.write('</booklist>\n')
f.close()
def parse(self): def parse(self):
""" """

10
gramps/gen/plug/report/_options.py
View File

@ -504,9 +504,8 @@ class OptionListCollection(_options.OptionListCollection):
if os.path.isfile(self.filename): if os.path.isfile(self.filename):
p = make_parser() p = make_parser()
p.setContentHandler(OptionParser(self)) p.setContentHandler(OptionParser(self))
the_file = open(self.filename, encoding="utf-8") with open(self.filename, encoding="utf-8") as the_file:
p.parse(the_file) p.parse(the_file)
the_file.close()
except (IOError, OSError, SAXParseException): except (IOError, OSError, SAXParseException):
pass pass
@ -1000,9 +999,8 @@ class DocOptionListCollection(_options.OptionListCollection):
if os.path.isfile(self.filename): if os.path.isfile(self.filename):
p = make_parser() p = make_parser()
p.setContentHandler(DocOptionParser(self)) p.setContentHandler(DocOptionParser(self))
the_file = open(self.filename, encoding="utf-8") with open(self.filename, encoding="utf-8") as the_file:
p.parse(the_file) p.parse(the_file)
the_file.close()
except (IOError, OSError, SAXParseException): except (IOError, OSError, SAXParseException):
pass pass

5
gramps/gen/utils/image.py
View File

@ -279,9 +279,8 @@ def resize_to_jpeg_buffer(source, size, crop=None):
scaled = img.scale_simple(int(size[0]), int(size[1]), GdkPixbuf.InterpType.BILINEAR) scaled = img.scale_simple(int(size[0]), int(size[1]), GdkPixbuf.InterpType.BILINEAR)
os.close(filed) os.close(filed)
scaled.savev(dest, "jpeg", "", "") scaled.savev(dest, "jpeg", "", "")
ofile = open(dest, mode='rb') with open(dest, mode='rb') as ofile:
data = ofile.read() data = ofile.read()
ofile.close()
try: try:
os.unlink(dest) os.unlink(dest)
except: except:

6
gramps/plugins/docgen/htmldoc.py
View File

@ -285,10 +285,8 @@ class HtmlDoc(BaseDoc, TextDoc):
Copy support files to the datadir that needs to hold them Copy support files to the datadir that needs to hold them
""" """
#css of textdoc styles #css of textdoc styles
tdfile = open(os.path.join(self._backend.datadirfull(), with open(os.path.join(self._backend.datadirfull(), _TEXTDOCSCREEN), 'w') as tdfile:
_TEXTDOCSCREEN), 'w') tdfile.write(self.style_declaration)
tdfile.write(self.style_declaration)
tdfile.close()
#css file #css file
if self.css_filename: if self.css_filename:
#we do an extra check in case file does not exist, eg cli call #we do an extra check in case file does not exist, eg cli call

26
po/test/po_test.py
View File

@ -30,12 +30,11 @@ from test import test_util
test_util.path_append_parent() test_util.path_append_parent()
def get_potfile(filename): def get_potfile(filename):
fp = open(filename, "r") with open(filename, "r") as fp:
retvals = [] retvals = []
for line in fp: for line in fp:
if line and line[0] != "#": if line and line[0] != "#":
retvals.append(line.strip()) retvals.append(line.strip())
fp.close()
return retvals return retvals
# POTFILES.skip # POTFILES.skip
@ -55,9 +54,8 @@ class TestPOT(unittest.TestCase):
realpath = (dir + "/" + file) realpath = (dir + "/" + file)
pathfile = realpath[3:] pathfile = realpath[3:]
if os.path.exists(realpath): if os.path.exists(realpath):
fp = open(realpath, "r") with open(realpath, "r") as fp:
lines = fp.read() lines = fp.read()
fp.close()
found = False found = False
for search in searches: for search in searches:
if search in lines: if search in lines:
@ -88,9 +86,8 @@ class TestMake(unittest.TestCase):
if pathfile[3:] in excluded_files: if pathfile[3:] in excluded_files:
self.assertTrue(True, "exclude '%s'" % pathfile) self.assertTrue(True, "exclude '%s'" % pathfile)
elif os.path.exists(makefile): elif os.path.exists(makefile):
fp = open(makefile, "r") with open(makefile, "r") as fp:
lines = fp.read() lines = fp.read()
fp.close()
self.assertTrue(filename in lines, "'%s' not in %s/Makefile.in" % self.assertTrue(filename in lines, "'%s' not in %s/Makefile.in" %
(filename, path)) (filename, path))
else: else:
@ -107,9 +104,8 @@ class TestGetText(unittest.TestCase):
def helper(self, pofile, searches): def helper(self, pofile, searches):
if not os.path.exists("../../" + pofile): if not os.path.exists("../../" + pofile):
self.assertTrue(False, "'%s' is in POTFILES.in and does not exist" % pofile) self.assertTrue(False, "'%s' is in POTFILES.in and does not exist" % pofile)
fp = open("../../" + pofile, "r") with open("../../" + pofile, "r") as fp:
lines = fp.read() lines = fp.read()
fp.close()
found = False found = False
for search in searches: for search in searches:
found = (search in lines) or found found = (search in lines) or found

385
po/update_po.py
View File

@ -37,11 +37,11 @@ Examples:
python update_po.py -p python update_po.py -p
Generates a new template/catalog (gramps.pot). Generates a new template/catalog (gramps.pot).
python update_po.py -m de.po python update_po.py -m de.po
Merges 'de.po' file with 'gramps.pot'. Merges 'de.po' file with 'gramps.pot'.
python update_po.py -k de.po python update_po.py -k de.po
Checks 'de.po' file, tests to compile and generates a textual resume. Checks 'de.po' file, tests to compile and generates a textual resume.
@ -55,7 +55,7 @@ from argparse import ArgumentParser
# Windows OS # Windows OS
if sys.platform == 'win32': if sys.platform == 'win32':
# GetText Win 32 obtained from http://gnuwin32.sourceforge.net/packages/gettext.htm # GetText Win 32 obtained from http://gnuwin32.sourceforge.net/packages/gettext.htm
# ....\gettext\bin\msgmerge.exe needs to be on the path # ....\gettext\bin\msgmerge.exe needs to be on the path
msgmergeCmd = os.path.join('C:', 'Program Files(x86)', 'gettext', 'bin', 'msgmerge.exe') msgmergeCmd = os.path.join('C:', 'Program Files(x86)', 'gettext', 'bin', 'msgmerge.exe')
@ -96,67 +96,64 @@ def tests():
print ("\n====='msgmerge'=(merge our translation)================\n") print ("\n====='msgmerge'=(merge our translation)================\n")
os.system('''%(program)s -V''' % {'program': msgmergeCmd}) os.system('''%(program)s -V''' % {'program': msgmergeCmd})
except: except:
print ('Please, install %(program)s for updating your translation' print ('Please, install %(program)s for updating your translation'
% {'program': msgmergeCmd}) % {'program': msgmergeCmd})
try: try:
print ("\n==='msgfmt'=(format our translation for installation)==\n") print ("\n==='msgfmt'=(format our translation for installation)==\n")
os.system('''%(program)s -V''' % {'program': msgfmtCmd}) os.system('''%(program)s -V''' % {'program': msgfmtCmd})
except: except:
print ('Please, install %(program)s for checking your translation' print ('Please, install %(program)s for checking your translation'
% {'program': msgfmtCmd}) % {'program': msgfmtCmd})
try: try:
print ("\n===='msgattrib'==(list groups of messages)=============\n") print ("\n===='msgattrib'==(list groups of messages)=============\n")
os.system('''%(program)s -V''' % {'program': msgattribCmd}) os.system('''%(program)s -V''' % {'program': msgattribCmd})
except: except:
print ('Please, install %(program)s for listing groups of messages' print ('Please, install %(program)s for listing groups of messages'
% {'program': msgattribCmd}) % {'program': msgattribCmd})
try: try:
print("\n===='xgettext' =(generate a new template)==============\n") print("\n===='xgettext' =(generate a new template)==============\n")
os.system('''%(program)s -V''' % {'program': xgettextCmd}) os.system('''%(program)s -V''' % {'program': xgettextCmd})
except: except:
print ('Please, install %(program)s for generating a new template' print ('Please, install %(program)s for generating a new template'
% {'program': xgettextCmd}) % {'program': xgettextCmd})
try: try:
print("\n=================='python'=============================\n") print("\n=================='python'=============================\n")
os.system('''%(program)s -V''' % {'program': pythonCmd}) os.system('''%(program)s -V''' % {'program': pythonCmd})
except: except:
print ('Please, install python') print ('Please, install python')
def TipsParse(filename, mark): def TipsParse(filename, mark):
""" """
Experimental alternative to 'intltool-extract' for 'tips.xml'. Experimental alternative to 'intltool-extract' for 'tips.xml'.
""" """
from xml.etree import ElementTree from xml.etree import ElementTree
tree = ElementTree.parse(filename) tree = ElementTree.parse(filename)
root = tree.getroot() root = tree.getroot()
''' '''
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<tips> <tips>
<_tip number="1"> <_tip number="1">
<b>Working with Dates</b> <b>Working with Dates</b>
<br/> <br/>
A range of dates can be given by using the format &quot;between A range of dates can be given by using the format &quot;between
January 4, 2000 and March 20, 2003&quot;. You can also indicate January 4, 2000 and March 20, 2003&quot;. You can also indicate
the level of confidence in a date and even choose between seven the level of confidence in a date and even choose between seven
different calendars. Try the button next to the date field in the different calendars. Try the button next to the date field in the
Events Editor. Events Editor.
</_tip> </_tip>
char *s = N_("<b>Working with Dates</b><br/>A range of dates can be char *s = N_("<b>Working with Dates</b><br/>A range of dates can be
given by using the format &quot;between January 4, 2000 and March 20, given by using the format &quot;between January 4, 2000 and March 20,
2003&quot;. You can also indicate the level of confidence in a date 2003&quot;. You can also indicate the level of confidence in a date
and even choose between seven different calendars. Try the button and even choose between seven different calendars. Try the button
next to the date field in the Events Editor."); next to the date field in the Events Editor.");
gramps.pot: gramps.pot:
msgid "" msgid ""
"<b>Working with Dates</b><br/>A range of dates can be given by using the " "<b>Working with Dates</b><br/>A range of dates can be given by using the "
@ -165,34 +162,32 @@ def TipsParse(filename, mark):
"different calendars. Try the button next to the date field in the Events " "different calendars. Try the button next to the date field in the Events "
"Editor." "Editor."
''' '''
tips = open('../data/tips.xml.in.h', 'w') with open('../data/tips.xml.in.h', 'w') as tips:
marklist = root.iter(mark) marklist = root.iter(mark)
for key in marklist: for key in marklist:
tip = ElementTree.tostring(key, encoding="UTF-8", method="xml") tip = ElementTree.tostring(key, encoding="UTF-8", method="xml")
if sys.version_info[0] < 3: if sys.version_info[0] < 3:
tip = tip.replace("<?xml version='1.0' encoding='UTF-8'?>", "") tip = tip.replace("<?xml version='1.0' encoding='UTF-8'?>", "")
tip = tip.replace('\n<_tip number="%(number)s">' % key.attrib, "") tip = tip.replace('\n<_tip number="%(number)s">' % key.attrib, "")
else: # python3 support else: # python3 support
tip = tip.decode("utf-8") tip = tip.decode("utf-8")
tip = tip.replace('<_tip number="%(number)s">' % key.attrib, "") tip = tip.replace('<_tip number="%(number)s">' % key.attrib, "")
tip = tip.replace("<br />", "<br/>") tip = tip.replace("<br />", "<br/>")
#tip = tip.replace("\n</_tip>\n", "</_tip>\n") # special case tip 7 #tip = tip.replace("\n</_tip>\n", "</_tip>\n") # special case tip 7
#tip = tip.replace("\n<b>", "<b>") # special case tip 18 #tip = tip.replace("\n<b>", "<b>") # special case tip 18
tip = tip.replace("</_tip>\n\n", "") tip = tip.replace("</_tip>\n\n", "")
tip = tip.replace('"', '&quot;') tip = tip.replace('"', '&quot;')
tips.write('char *s = N_("%s");\n' % tip) tips.write('char *s = N_("%s");\n' % tip)
tips.close()
print ('Wrote ../data/tips.xml.in.h') print ('Wrote ../data/tips.xml.in.h')
root.clear() root.clear()
def HolidaysParse(filename, mark): def HolidaysParse(filename, mark):
""" """
Experimental alternative to 'intltool-extract' for 'holidays.xml'. Experimental alternative to 'intltool-extract' for 'holidays.xml'.
""" """
from xml.etree import ElementTree from xml.etree import ElementTree
tree = ElementTree.parse(filename) tree = ElementTree.parse(filename)
root = tree.getroot() root = tree.getroot()
ellist = root.iter() ellist = root.iter()
@ -204,26 +199,24 @@ def HolidaysParse(filename, mark):
.. ..
<country _name="Jewish Holidays"> <country _name="Jewish Holidays">
<date _name="Yom Kippur" value="> passover(y)" offset="172"/> <date _name="Yom Kippur" value="> passover(y)" offset="172"/>
char *s = N_("Bulgaria"); char *s = N_("Bulgaria");
char *s = N_("Jewish Holidays"); char *s = N_("Jewish Holidays");
char *s = N_("Yom Kippur"); char *s = N_("Yom Kippur");
gramps.pot: gramps.pot:
msgid "Bulgaria" msgid "Bulgaria"
msgid "Jewish Holidays" msgid "Jewish Holidays"
msgid "Yom Kippur" msgid "Yom Kippur"
''' '''
with open('../data/holidays.xml.in.h', 'w') as holidays:
holidays = open('../data/holidays.xml.in.h', 'w') for key in ellist:
for key in ellist: if key.attrib.get(mark):
if key.attrib.get(mark): line = key.attrib
line = key.attrib string = line.items
string = line.items # mapping via the line dict (_name is the key)
# mapping via the line dict (_name is the key) name = 'char *s = N_("%(_name)s");\n' % line
name = 'char *s = N_("%(_name)s");\n' % line holidays.write(name)
holidays.write(name)
holidays.close()
print ('Wrote ../data/holidays.xml.in.h') print ('Wrote ../data/holidays.xml.in.h')
root.clear() root.clear()
@ -232,12 +225,11 @@ def XmlParse(filename, mark):
""" """
Experimental alternative to 'intltool-extract' for 'file.xml.in'. Experimental alternative to 'intltool-extract' for 'file.xml.in'.
""" """
from xml.etree import ElementTree from xml.etree import ElementTree
tree = ElementTree.parse(filename) tree = ElementTree.parse(filename)
root = tree.getroot() root = tree.getroot()
''' '''
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
@ -252,47 +244,44 @@ def XmlParse(filename, mark):
<glob pattern="*.gedcom"/> <glob pattern="*.gedcom"/>
<glob pattern="*.GED"/> <glob pattern="*.GED"/>
<glob pattern="*.GEDCOM"/> <glob pattern="*.GEDCOM"/>
msgid "Gramps database" msgid "Gramps database"
msgid "GEDCOM" msgid "GEDCOM"
<_p> Gramps is a free software project and community. <_p> Gramps is a free software project and community.
We strive to produce a genealogy program that is both intuitive for hobbyists We strive to produce a genealogy program that is both intuitive for hobbyists
and feature-complete for professional genealogists. and feature-complete for professional genealogists.
</p> </p>
''' '''
head = open(filename + '.h', 'w') with open(filename + '.h', 'w') as head:
for key in root.iter():
if key.tag == '{http://www.freedesktop.org/standards/shared-mime-info}%s' % mark:
comment = 'char *s = N_("%s");\n' % key.text
head.write(comment)
if root.tag == 'application':
for key in root.iter(): for key in root.iter():
if key.tag == mark: if key.tag == '{http://www.freedesktop.org/standards/shared-mime-info}%s' % mark:
comment = 'char *s = N_("%s");\n' % key.text comment = 'char *s = N_("%s");\n' % key.text
head.write(comment) head.write(comment)
head.close() if root.tag == 'application':
for key in root.iter():
if key.tag == mark:
comment = 'char *s = N_("%s");\n' % key.text
head.write(comment)
print ('Wrote %s' % filename) print ('Wrote %s' % filename)
root.clear() root.clear()
def DesktopParse(filename): def DesktopParse(filename):
""" """
Experimental alternative to 'intltool-extract' for 'gramps.desktop'. Experimental alternative to 'intltool-extract' for 'gramps.desktop'.
""" """
''' '''
[Desktop Entry] [Desktop Entry]
_Name=Gramps _Name=Gramps
_GenericName=Genealogy System _GenericName=Genealogy System
_X-GNOME-FullName=Gramps Genealogy System _X-GNOME-FullName=Gramps Genealogy System
_Comment=Manage genealogical information, _Comment=Manage genealogical information,
perform genealogical research and analysis perform genealogical research and analysis
msgid "Gramps" msgid "Gramps"
msgid "Genealogy System" msgid "Genealogy System"
msgid "Gramps Genealogy System" msgid "Gramps Genealogy System"
@ -300,29 +289,25 @@ def DesktopParse(filename):
"Manage genealogical information, "Manage genealogical information,
perform genealogical research and analysis" perform genealogical research and analysis"
''' '''
with open('../data/gramps.desktop.in.h', 'w') as desktop:
desktop = open('../data/gramps.desktop.in.h', 'w')
with open(filename) as f:
f = open(filename) lines = [file.strip() for file in f]
lines = [file.strip() for file in f]
f.close() for line in lines:
if line[0] == '_':
for line in lines: for i in range(len(line)):
if line[0] == '_': if line[i] == '=':
for i in range(len(line)): val = 'char *s = N_("%s");\n' % line[i+1:len(line)]
if line[i] == '=': desktop.write(val)
val = 'char *s = N_("%s");\n' % line[i+1:len(line)]
desktop.write(val)
desktop.close()
print ('Wrote ../data/gramps.desktop.in.h') print ('Wrote ../data/gramps.desktop.in.h')
def KeyParse(filename, mark): def KeyParse(filename, mark):
""" """
Experimental alternative to 'intltool-extract' for 'gramps.keys'. Experimental alternative to 'intltool-extract' for 'gramps.keys'.
""" """
''' '''
application/x-gramps-xml: application/x-gramps-xml:
_description=Gramps XML database _description=Gramps XML database
@ -338,48 +323,44 @@ def KeyParse(filename, mark):
application/x-gedcom: application/x-gedcom:
_description=GEDCOM _description=GEDCOM
default_action_type=application default_action_type=application
msgid "Gramps XML database" msgid "Gramps XML database"
msgid "GEDCOM" msgid "GEDCOM"
''' '''
with open('../data/gramps.keys.in.h', 'w') as key:
key = open('../data/gramps.keys.in.h', 'w')
with open(filename) as f:
f = open(filename) lines = [file for file in f]
lines = [file for file in f]
f.close() temp = []
temp = [] for line in lines:
for i in range(len(line)):
for line in lines: if line[i:i+12] == mark:
for i in range(len(line)): temp.append(line.strip())
if line[i:i+12] == mark:
temp.append(line.strip()) for t in temp:
for i in range(len(t)):
for t in temp: if t[i] == '=':
for i in range(len(t)): val = 'char *s = N_("%s");\n' % t[i+1:len(t)]
if t[i] == '=': key.write(val)
val = 'char *s = N_("%s");\n' % t[i+1:len(t)]
key.write(val)
key.close()
print ('Wrote ../data/gramps.keys.in.h') print ('Wrote ../data/gramps.keys.in.h')
def main(): def main():
""" """
The utility for handling translation stuff. The utility for handling translation stuff.
What is need by Gramps, nothing more. What is need by Gramps, nothing more.
""" """
parser = ArgumentParser( parser = ArgumentParser(
description='This program generates a new template and ' description='This program generates a new template and '
'also provides some common features.', 'also provides some common features.',
) )
parser.add_argument("-t", "--test", parser.add_argument("-t", "--test",
action="store_true", dest="test", default=True, action="store_true", dest="test", default=True,
help="test if 'python' and 'gettext' are properly installed") help="test if 'python' and 'gettext' are properly installed")
parser.add_argument("-x", "--xml", parser.add_argument("-x", "--xml",
action="store_true", dest="xml", default=False, action="store_true", dest="xml", default=False,
help="extract messages from xml based file formats") help="extract messages from xml based file formats")
@ -392,90 +373,88 @@ def main():
parser.add_argument("-p", "--pot", parser.add_argument("-p", "--pot",
action="store_true", dest="catalog", default=False, action="store_true", dest="catalog", default=False,
help="create a new catalog") help="create a new catalog")
update = parser.add_argument_group('Update', 'Maintenance around translations') update = parser.add_argument_group('Update', 'Maintenance around translations')
# need at least one argument (sv.po, de.po, etc ...) # need at least one argument (sv.po, de.po, etc ...)
# lang.po files maintenance # lang.po files maintenance
update.add_argument("-m", dest="merge", update.add_argument("-m", dest="merge",
choices=LANG, choices=LANG,
help="merge lang.po files with last catalog") help="merge lang.po files with last catalog")
update.add_argument("-k", dest="check", update.add_argument("-k", dest="check",
choices=LANG, choices=LANG,
help="check lang.po files") help="check lang.po files")
# testing stage # testing stage
trans = parser.add_argument_group('Translation', 'Display content of translations file') trans = parser.add_argument_group('Translation', 'Display content of translations file')
# need one argument (eg, de.po) # need one argument (eg, de.po)
trans.add_argument("-u", dest="untranslated", trans.add_argument("-u", dest="untranslated",
choices=[file for file in os.listdir('.') if file.endswith('.po')], choices=[file for file in os.listdir('.') if file.endswith('.po')],
help="list untranslated messages") help="list untranslated messages")
trans.add_argument("-f", dest="fuzzy", trans.add_argument("-f", dest="fuzzy",
choices=[file for file in os.listdir('.') if file.endswith('.po')], choices=[file for file in os.listdir('.') if file.endswith('.po')],
help="list fuzzy messages") help="list fuzzy messages")
args = parser.parse_args() args = parser.parse_args()
namespace, extra = parser.parse_known_args() namespace, extra = parser.parse_known_args()
if args.test: if args.test:
tests() tests()
if args.xml: if args.xml:
extract_xml() extract_xml()
if args.glade: if args.glade:
create_filesfile() create_filesfile()
extract_glade() extract_glade()
if os.path.isfile('tmpfiles'): if os.path.isfile('tmpfiles'):
os.unlink('tmpfiles') os.unlink('tmpfiles')
if args.catalog: if args.catalog:
retrieve() retrieve()
if args.clean: if args.clean:
clean() clean()
if args.merge: if args.merge:
#retrieve() windows os? #retrieve() windows os?
if sys.argv[2:] == ['all']: if sys.argv[2:] == ['all']:
sys.argv[2:] = LANG sys.argv[2:] = LANG
merge(sys.argv[2:]) merge(sys.argv[2:])
if args.check: if args.check:
#retrieve() windows os? #retrieve() windows os?
if sys.argv[2:] == ['all']: if sys.argv[2:] == ['all']:
sys.argv[2:] = LANG sys.argv[2:] = LANG
check(sys.argv[2:]) check(sys.argv[2:])
if args.untranslated: if args.untranslated:
untranslated(sys.argv[2:]) untranslated(sys.argv[2:])
if args.fuzzy: if args.fuzzy:
fuzzy(sys.argv[2:]) fuzzy(sys.argv[2:])
def create_filesfile(): def create_filesfile():
""" """
Create a file with all files that we should translate. Create a file with all files that we should translate.
These are all python files not in POTFILES.skip added with those in These are all python files not in POTFILES.skip added with those in
POTFILES.in POTFILES.in
""" """
dir = os.getcwd() dir = os.getcwd()
topdir = os.path.normpath(os.path.join(dir, '..', 'gramps')) topdir = os.path.normpath(os.path.join(dir, '..', 'gramps'))
lentopdir = len(topdir) lentopdir = len(topdir)
f = open('POTFILES.in') with open('POTFILES.in') as f:
infiles = dict(['../' + file.strip(), None] for file in f if file.strip() infiles = dict(['../' + file.strip(), None] for file in f if file.strip()
and not file[0]=='#') and not file[0]=='#')
f.close()
f = open('POTFILES.skip') with open('POTFILES.skip') as f:
notinfiles = dict(['../' + file.strip(), None] for file in f if file notinfiles = dict(['../' + file.strip(), None] for file in f if file
and not file[0]=='#') and not file[0]=='#')
f.close()
for (dirpath, dirnames, filenames) in os.walk(topdir): for (dirpath, dirnames, filenames) in os.walk(topdir):
root, subdir = os.path.split(dirpath) root, subdir = os.path.split(dirpath)
if subdir.startswith("."): if subdir.startswith("."):
@ -490,7 +469,7 @@ def create_filesfile():
# if the directory does not exist or is a link, do nothing # if the directory does not exist or is a link, do nothing
if not os.path.isdir(dirpath) or os.path.islink(dirpath): if not os.path.isdir(dirpath) or os.path.islink(dirpath):
continue continue
for filename in os.listdir(dirpath): for filename in os.listdir(dirpath):
name = os.path.split(filename)[1] name = os.path.split(filename)[1]
if name.endswith('.py') or name.endswith('.glade'): if name.endswith('.py') or name.endswith('.glade'):
@ -499,11 +478,10 @@ def create_filesfile():
if full_filename[lentopdir:] in notinfiles: if full_filename[lentopdir:] in notinfiles:
infiles['../gramps' + full_filename[lentopdir:]] = None infiles['../gramps' + full_filename[lentopdir:]] = None
#now we write out all the files in form ../gramps/filename #now we write out all the files in form ../gramps/filename
f = open('tmpfiles', 'w') with open('tmpfiles', 'w') as f:
for file in sorted(infiles.keys()): for file in sorted(infiles.keys()):
f.write(file) f.write(file)
f.write('\n') f.write('\n')
f.close()
def listing(name, extensionlist): def listing(name, extensionlist):
""" """
@ -511,26 +489,22 @@ def listing(name, extensionlist):
Parsing from a textual file (gramps) is faster and easy for maintenance. Parsing from a textual file (gramps) is faster and easy for maintenance.
Like POTFILES.in and POTFILES.skip Like POTFILES.in and POTFILES.skip
""" """
f = open('tmpfiles') with open('tmpfiles') as f:
files = [file.strip() for file in f if file and not file[0]=='#'] files = [file.strip() for file in f if file and not file[0]=='#']
f.close()
with open(name, 'w') as temp:
temp = open(name, 'w') for entry in files:
for ext in extensionlist:
for entry in files: if entry.endswith(ext):
for ext in extensionlist: temp.write(entry)
if entry.endswith(ext): temp.write('\n')
temp.write(entry) break
temp.write('\n')
break
temp.close()
def headers(): def headers():
""" """
Look at existing C file format headers. Look at existing C file format headers.
Generated by 'intltool-extract' but want to get rid of this Generated by 'intltool-extract' but want to get rid of this
dependency (perl, just a set of tools). dependency (perl, just a set of tools).
""" """
headers = [] headers = []
@ -550,7 +524,7 @@ def headers():
headers.append('''../data/gramps.appdata.xml.in.h''') headers.append('''../data/gramps.appdata.xml.in.h''')
if os.path.isfile('''gtklist.h'''): if os.path.isfile('''gtklist.h'''):
headers.append('''gtklist.h''') headers.append('''gtklist.h''')
return headers return headers
def extract_xml(): def extract_xml():
@ -558,21 +532,20 @@ def extract_xml():
Extract translation strings from XML based, keys, mime and desktop Extract translation strings from XML based, keys, mime and desktop
files. Own XML files parsing and custom translation marks. files. Own XML files parsing and custom translation marks.
""" """
HolidaysParse('../data/holidays.xml.in', '_name') HolidaysParse('../data/holidays.xml.in', '_name')
TipsParse('../data/tips.xml.in', '_tip') TipsParse('../data/tips.xml.in', '_tip')
XmlParse('../data/gramps.xml.in', '_comment') XmlParse('../data/gramps.xml.in', '_comment')
XmlParse('../data/gramps.appdata.xml.in', '_p') XmlParse('../data/gramps.appdata.xml.in', '_p')
DesktopParse('../data/gramps.desktop.in') DesktopParse('../data/gramps.desktop.in')
KeyParse('../data/gramps.keys.in', '_description') KeyParse('../data/gramps.keys.in', '_description')
def create_template(): def create_template():
""" """
Create a new file for template, if it does not exist. Create a new file for template, if it does not exist.
""" """
template = open('gramps.pot', 'w') with open('gramps.pot', 'w') as template:
template.close() pass
def extract_glade(): def extract_glade():
""" """
Extract messages from a temp file with all .glade Extract messages from a temp file with all .glade
@ -592,9 +565,9 @@ def extract_gtkbuilder():
https://savannah.gnu.org/bugs/index.php?29216 https://savannah.gnu.org/bugs/index.php?29216
See bug reports #6595, #5621 See bug reports #6595, #5621
""" """
from xml.etree import ElementTree from xml.etree import ElementTree
''' '''
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
@ -617,26 +590,24 @@ def extract_gtkbuilder():
</row> </row>
</data> </data>
</object> </object>
msgid "All rules must apply" msgid "All rules must apply"
msgid "At least one rule must apply" msgid "At least one rule must apply"
msgid "Exactly one rule must apply" msgid "Exactly one rule must apply"
''' '''
files = ['../gramps/plugins/importer/importgedcom.glade', '../gramps/gui/glade/rule.glade'] files = ['../gramps/plugins/importer/importgedcom.glade', '../gramps/gui/glade/rule.glade']
temp = open('gtklist.h', 'w') with open('gtklist.h', 'w') as temp:
for filename in files:
for filename in files: tree = ElementTree.parse(filename)
tree = ElementTree.parse(filename) root = tree.getroot()
root = tree.getroot() for line in root.iter():
for line in root.iter(): att = line.attrib
att = line.attrib if att == {'id': '0', 'translatable': 'yes'}:
if att == {'id': '0', 'translatable': 'yes'}: col = 'char *s = N_("%s");\n' % line.text
col = 'char *s = N_("%s");\n' % line.text temp.write(col)
temp.write(col) root.clear()
root.clear()
temp.close()
print ('Wrote gtklist.h') print ('Wrote gtklist.h')
def retrieve(): def retrieve():
@ -644,14 +615,14 @@ def retrieve():
Extract messages from all files used by Gramps (python, glade, xml) Extract messages from all files used by Gramps (python, glade, xml)
""" """
extract_xml() extract_xml()
extract_gtkbuilder() extract_gtkbuilder()
create_template() create_template()
create_filesfile() create_filesfile()
listing('python.txt', ['.py', '.py.in']) listing('python.txt', ['.py', '.py.in'])
# additional keywords must always be kept in sync with those in genpot.sh # additional keywords must always be kept in sync with those in genpot.sh
os.system('''%(xgettext)s -F -c -j --directory=./ -d gramps ''' os.system('''%(xgettext)s -F -c -j --directory=./ -d gramps '''
'''-L Python -o gramps.pot --files-from=python.txt ''' '''-L Python -o gramps.pot --files-from=python.txt '''
@ -659,14 +630,14 @@ def retrieve():
'''--keyword=_T_ --keyword=trans_text ''' '''--keyword=_T_ --keyword=trans_text '''
'''--keyword=sgettext --from-code=UTF-8''' % {'xgettext': xgettextCmd} '''--keyword=sgettext --from-code=UTF-8''' % {'xgettext': xgettextCmd}
) )
extract_glade() extract_glade()
# C format header (.h extension) # C format header (.h extension)
for h in headers(): for h in headers():
print ('xgettext for %s' % h) print ('xgettext for %s' % h)
os.system('''%(xgettext)s -F --add-comments -j -o gramps.pot ''' os.system('''%(xgettext)s -F --add-comments -j -o gramps.pot '''
'''--keyword=N_ --from-code=UTF-8 %(head)s''' '''--keyword=N_ --from-code=UTF-8 %(head)s'''
% {'xgettext': xgettextCmd, 'head': h} % {'xgettext': xgettextCmd, 'head': h}
) )
clean() clean()
@ -696,10 +667,9 @@ def merge(args):
""" """
Merge messages with 'gramps.pot' Merge messages with 'gramps.pot'
""" """
for arg in args: for arg in args:
if arg == 'all': if arg == 'all':
continue continue
print ('Merge %(lang)s with current template' % {'lang': arg}) print ('Merge %(lang)s with current template' % {'lang': arg})
os.system('''%(msgmerge)s %(lang)s gramps.pot -o updated_%(lang)s''' \ os.system('''%(msgmerge)s %(lang)s gramps.pot -o updated_%(lang)s''' \
% {'msgmerge': msgmergeCmd, 'lang': arg}) % {'msgmerge': msgmergeCmd, 'lang': arg})
@ -709,7 +679,6 @@ def check(args):
""" """
Check the translation file Check the translation file
""" """
for arg in args: for arg in args:
if arg == 'all': if arg == 'all':
continue continue
@ -724,14 +693,12 @@ def untranslated(arg):
""" """
List untranslated messages List untranslated messages
""" """
os.system('''%(msgattrib)s --untranslated %(lang.po)s''' % {'msgattrib': msgattribCmd, 'lang.po': arg[0]}) os.system('''%(msgattrib)s --untranslated %(lang.po)s''' % {'msgattrib': msgattribCmd, 'lang.po': arg[0]})
def fuzzy(arg): def fuzzy(arg):
""" """
List fuzzy messages List fuzzy messages
""" """
os.system('''%(msgattrib)s --only-fuzzy --no-obsolete %(lang.po)s''' % {'msgattrib': msgattribCmd, 'lang.po': arg[0]}) os.system('''%(msgattrib)s --only-fuzzy --no-obsolete %(lang.po)s''' % {'msgattrib': msgattribCmd, 'lang.po': arg[0]})
if __name__ == "__main__": if __name__ == "__main__":