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

2007-06-30 Alex Roitman <shura@gramps-project.org>

Browse Source 
* src/ReportBase/_TemplateParser.py: Close file after parsing.
	* src/ReportBase/_ReportOptions.py (OptionListCollection.parse):
	Close file after parsing.
	* src/ReportBase/_PaperMenu.py: Close file after parsing.
	* src/plugins/BookReport.py (BookList.parse): Close file after parsing.
	* src/Filters/_FilterList.py (load): Close file after parsing.
	* src/BaseDoc.py (StyleSheetList.parse): Close file after parsing.



svn: r8686
This commit is contained in:
Alex Roitman 2007-06-30 18:57:34 +00:00
parent 0aa630a32e
commit 52d74237ae
7 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2007-06-30 Alex Roitman <shura@gramps-project.org>
* src/ReportBase/_TemplateParser.py: Close file after parsing.
* src/ReportBase/_ReportOptions.py (OptionListCollection.parse):
Close file after parsing.
* src/ReportBase/_PaperMenu.py: Close file after parsing.
* src/plugins/BookReport.py (BookList.parse): Close file after parsing.
* src/Filters/_FilterList.py (load): Close file after parsing.
* src/BaseDoc.py (StyleSheetList.parse): Close file after parsing.
2007-06-28 Alex Roitman <shura@gramps-project.org> 2007-06-28 Alex Roitman <shura@gramps-project.org>
* src/ScratchPad.py (ScratchSourceLink.tooltip): Typo. * src/ScratchPad.py (ScratchSourceLink.tooltip): Typo.

6
src/BaseDoc.py
View File

@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
# Copyright (C) 2000-2005 Donald N. Allingham # Copyright (C) 2000-2007 Donald N. Allingham
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -922,7 +922,9 @@ class StyleSheetList:
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))
parser.parse(self.file) the_file = open(self.file)
parser.parse(the_file)
the_file.close()
except (IOError,OSError,SAXParseException): except (IOError,OSError,SAXParseException):
pass pass

6
src/Filters/_FilterList.py
View File

@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
# Copyright (C) 2002-2006 Donald N. Allingham # Copyright (C) 2002-2007 Donald N. Allingham
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -68,7 +68,9 @@ class FilterList:
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))
parser.parse(self.file) the_file = open(self.file)
parser.parse(the_file)
the_file.close()
except (IOError,OSError): except (IOError,OSError):
pass pass
except SAXParseException: except SAXParseException:

6
src/ReportBase/_PaperMenu.py
View File

@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
# Copyright (C) 2000-2005 Donald N. Allingham # Copyright (C) 2000-2007 Donald N. Allingham
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -175,7 +175,9 @@ class PageSizeParser(handler.ContentHandler):
try: try:
parser = make_parser() parser = make_parser()
parser.setContentHandler(PageSizeParser(paper_sizes)) parser.setContentHandler(PageSizeParser(paper_sizes))
parser.parse(const.papersize) the_file = open(const.papersize)
parser.parse(the_file)
the_file.close()
paper_sizes.append(BaseDoc.PaperStyle(_("Custom Size"),-1,-1)) paper_sizes.append(BaseDoc.PaperStyle(_("Custom Size"),-1,-1))
except (IOError,OSError,SAXParseException): except (IOError,OSError,SAXParseException):
paper_sizes = [ paper_sizes = [

6
src/ReportBase/_ReportOptions.py
View File

@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
# Copyright (C) 2004-2006 Donald N. Allingham # Copyright (C) 2004-2007 Donald N. Allingham
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -280,7 +280,9 @@ 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))
p.parse(self.filename) the_file = open(self.filename)
p.parse(the_file)
the_file.close()
except (IOError,OSError,SAXParseException): except (IOError,OSError,SAXParseException):
pass pass

6
src/ReportBase/_TemplateParser.py
View File

@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
# Copyright (C) 2001-2006 Donald N. Allingham # Copyright (C) 2001-2007 Donald N. Allingham
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -98,7 +98,9 @@ try:
if os.path.isfile(xmlfile): if os.path.isfile(xmlfile):
parser = make_parser() parser = make_parser()
parser.setContentHandler(TemplateParser(_template_map,template_path)) parser.setContentHandler(TemplateParser(_template_map,template_path))
parser.parse(xmlfile) the_file = open(xmlfile)
parser.parse(the_file)
the_file.close()
template_path = os.path.join(const.home_dir,"templates") template_path = os.path.join(const.home_dir,"templates")
xmlfile = os.path.join(template_path,"templates.xml") xmlfile = os.path.join(template_path,"templates.xml")

6
src/plugins/BookReport.py
View File

@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
# Copyright (C) 2003-2006 Donald N. Allingham # Copyright (C) 2003-2007 Donald N. Allingham
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -405,7 +405,9 @@ class BookList:
try: try:
p = make_parser() p = make_parser()
p.setContentHandler(BookParser(self)) p.setContentHandler(BookParser(self))
p.parse(self.file) the_file = open(self.file)
p.parse(the_file)
the_file.close()
except (IOError,OSError,ValueError,SAXParseException): except (IOError,OSError,ValueError,SAXParseException):
pass pass