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

[r21448]grampletpane: Use __future__.unicode_literals instead of cuni()

Browse Source 
And get rid of the silly NL = "\n"

svn: r21453
This commit is contained in:
John Ralls 2013-02-26 00:23:21 +00:00
parent b126aa1fc3
commit 44f065eabf
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
gramps/gui/widgets/grampletpane.py
View File

@ -30,7 +30,7 @@ GrampletView interface.
# Python modules # Python modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from __future__ import print_function from __future__ import print_function, unicode_literals
from gi.repository import GObject from gi.repository import GObject
from gi.repository import Gdk from gi.repository import Gdk
@ -1175,14 +1175,13 @@ class GrampletPane(Gtk.ScrolledWindow):
except IOError: except IOError:
print("Failed writing '%s'; gramplets not saved" % filename) print("Failed writing '%s'; gramplets not saved" % filename)
return return
fp.write(cuni(";; Gramps gramplets file" + NL)) fp.write(";; Gramps gramplets file\n")
fp.write(cuni((";; Automatically created at %s" % fp.write(";; Automatically created at %s" %
time.strftime("%Y/%m/%d %H:%M:%S")) + NL + NL)) time.strftime("%Y/%m/%d %H:%M:%S\n\n"))
fp.write(cuni("[Gramplet View Options]" + NL)) fp.write("[Gramplet View Options\n]")
fp.write(cuni(("column_count=%d" + NL) % self.column_count)) fp.write("column_count=%d\n" % self.column_count)
fp.write(cuni(("pane_position=%d" + NL) % self.pane_position)) fp.write("pane_position=%d\n" % self.pane_position)
fp.write(cuni(("pane_orientation=%s" + NL) % self.pane_orientation)) fp.write("pane_orientation=%s\n\n" % self.pane_orientation)
fp.write(cuni(NL))
# showing gramplets: # showing gramplets:
for col in range(self.column_count): for col in range(self.column_count):
row = 0 row = 0
@ -1194,12 +1193,12 @@ class GrampletPane(Gtk.ScrolledWindow):
for key in base_opts: for key in base_opts:
if key in gramplet.__dict__: if key in gramplet.__dict__:
base_opts[key] = gramplet.__dict__[key] base_opts[key] = gramplet.__dict__[key]
fp.write(("[%s]" + NL) % gramplet.gname) fp.write("[%s]\n" % gramplet.gname)
for key in base_opts: for key in base_opts:
if key == "content": continue if key == "content": continue
elif key == "title": elif key == "title":
if gramplet.title_override: if gramplet.title_override:
fp.write(("title=%s" + NL)% base_opts[key]) fp.write("title=%s\n" % base_opts[key])
elif key == "tname": continue elif key == "tname": continue
elif key == "column": continue elif key == "column": continue
elif key == "row": continue elif key == "row": continue
@ -1207,18 +1206,16 @@ class GrampletPane(Gtk.ScrolledWindow):
elif key == "gramps": continue # code, don't save elif key == "gramps": continue # code, don't save
elif key == "data": elif key == "data":
if not isinstance(base_opts["data"], (list, tuple)): if not isinstance(base_opts["data"], (list, tuple)):
fp.write(("data[0]=%s" + NL) % fp.write("data[0]=%s\n" % base_opts["data"])
base_opts["data"])
else: else:
cnt = 0 cnt = 0
for item in base_opts["data"]: for item in base_opts["data"]:
fp.write(("data[%d]=%s" + NL) % (cnt, item)) fp.write("data[%d]=%s\n" % (cnt, item))
cnt += 1 cnt += 1
else: else:
fp.write(("%s=%s" + NL)% (key, base_opts[key])) fp.write("%s=%s\n"% (key, base_opts[key]))
fp.write(("column=%d" + NL) % col) fp.write("column=%d\n" % col)
fp.write(("row=%d" + NL) % row) fp.write("row=%d\n\n" % row)
fp.write(NL)
row += 1 row += 1
for gramplet in self.detached_gramplets: for gramplet in self.detached_gramplets:
opts = get_gramplet_options_by_name(gramplet.gname) opts = get_gramplet_options_by_name(gramplet.gname)
@ -1227,27 +1224,27 @@ class GrampletPane(Gtk.ScrolledWindow):
for key in base_opts: for key in base_opts:
if key in gramplet.__dict__: if key in gramplet.__dict__:
base_opts[key] = gramplet.__dict__[key] base_opts[key] = gramplet.__dict__[key]
fp.write(("[%s]" + NL) % gramplet.title) fp.write("[%s]\n" % gramplet.title)
for key in base_opts: for key in base_opts:
if key == "content": continue if key == "content": continue
elif key == "title": elif key == "title":
if "title_override" in base_opts: if "title_override" in base_opts:
base_opts["title"] = base_opts["title_override"] base_opts["title"] = base_opts["title_override"]
fp.write(("title=%s" + NL)% base_opts[key]) fp.write("title=%s\n" % base_opts[key])
elif key == "tname": continue elif key == "tname": continue
elif key == "version": continue # code, don't save elif key == "version": continue # code, don't save
elif key == "gramps": continue # code, don't save elif key == "gramps": continue # code, don't save
elif key == "data": elif key == "data":
if not isinstance(base_opts["data"], (list, tuple)): if not isinstance(base_opts["data"], (list, tuple)):
fp.write(("data[0]=%s" + NL) % base_opts["data"]) fp.write("data[0]=%s\n" % base_opts["data"])
else: else:
cnt = 0 cnt = 0
for item in base_opts["data"]: for item in base_opts["data"]:
fp.write(("data[%d]=%s" + NL) % (cnt, item)) fp.write("data[%d]=%s\n" % (cnt, item))
cnt += 1 cnt += 1
else: else:
fp.write(("%s=%s" + NL)% (key, base_opts[key])) fp.write("%s=%s\n\n" % (key, base_opts[key]))
fp.write(NL)
fp.close() fp.close()
def drop_widget(self, source, context, x, y, timedata): def drop_widget(self, source, context, x, y, timedata):