From 8a12e8b527c5053d1acd51c77ad19722c310b67d Mon Sep 17 00:00:00 2001 From: Brian Matherly Date: Mon, 14 May 2007 03:41:36 +0000 Subject: [PATCH] * src/plugins/NarrativeWeb.py: Fix reference paths on Windows. svn: r8466 --- gramps2/ChangeLog | 3 +++ gramps2/src/plugins/NarrativeWeb.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index c4c936088..5e8699191 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,6 @@ +2007-05-13 Brian Matherly + * src/plugins/NarrativeWeb.py: Fix reference paths on Windows. + 2007-05-13 Brian Matherly * src/Editors/_EditFamily.py: fix typo. diff --git a/gramps2/src/plugins/NarrativeWeb.py b/gramps2/src/plugins/NarrativeWeb.py index 57df81459..e8955ac4e 100644 --- a/gramps2/src/plugins/NarrativeWeb.py +++ b/gramps2/src/plugins/NarrativeWeb.py @@ -162,7 +162,7 @@ class BasePage: def store_file(self,archive,html_dir,from_path,to_path): if archive: - archive.add(from_path,to_path) + archive.add(str(from_path),str(to_path)) else: dest = os.path.join(html_dir,to_path) dirname = os.path.dirname(dest) @@ -211,7 +211,7 @@ class BasePage: def link_path(self,name,path): base = self.build_name("",name) - path = os.path.join(path,name[0],name[1],base) + path = "%s/%s/%s/%s" % (path,name[0],name[1],base) if os.sys.platform == "win32": path = path.lower() return path