Fix for opening .eps/.ps/.cdr/etc files with % in their names.

(bzr r6066)

2 files changed, 30 insertions, 31 deletions

diff --git a/share/extensions/ps2pdf-ext.py b/share/extensions/ps2pdf-ext.py
index 6781e8a9e..d3bc3d052 100644
--- a/share/extensions/ps2pdf-ext.py
+++ b/share/extensions/ps2pdf-ext.py
@@ -1,30 +1,29 @@
-#!/usr/bin/env python

-

-"""

-ps2pdf-ext.py

-Python script for running ps2pdf in Inkscape extensions

-

-Copyright (C) 2008 Stephen Silver

-

-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

-the Free Software Foundation; either version 2 of the License, or

-(at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA

-"""

-

-import sys

-from run_command import run

-

-#run('pstoedit -f plot-svg -dt -ssp "%s" "%%s"' % sys.argv[1], "pstoedit")

-
run('ps2pdf "%s" "%%s"' % sys.argv[1], "ps2pdf")

-

-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99

+#!/usr/bin/env python
+
+"""
+ps2pdf-ext.py
+Python script for running ps2pdf in Inkscape extensions
+
+Copyright (C) 2008 Stephen Silver
+
+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
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+"""
+
+import sys
+from run_command import run
+
+run('ps2pdf "%s" "%%s"' % sys.argv[1].replace("%","%%"), "ps2pdf")
+
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
diff --git a/share/extensions/uniconv-ext.py b/share/extensions/uniconv-ext.py
index 1197f97bb..4dba05eea 100644
--- a/share/extensions/uniconv-ext.py
+++ b/share/extensions/uniconv-ext.py
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 import sys
 from run_command import run
 
-run('uniconv "%s" "%%s"' % sys.argv[1], "UniConvertor")
+run('uniconv "%s" "%%s"' % sys.argv[1].replace("%","%%"), "UniConvertor")
 
 
 # vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99