summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2013-01-16 23:09:13 +0000
committer~suv <suv-sf@users.sourceforge.net>2013-01-16 23:09:13 +0000
commit04b95ec3b366bc4323ad5be54a66974b0a96877e (patch)
treee76c1fea4edce360c59aec3d63f1f4ffc15ab756
parentCleanup SPDropperContext: (diff)
downloadinkscape-04b95ec3b366bc4323ad5be54a66974b0a96877e.tar.gz
inkscape-04b95ec3b366bc4323ad5be54a66974b0a96877e.zip
Fix support for UniConvertor 1.1.4 (see bug #425202)
(bzr r12032)
-rwxr-xr-xshare/extensions/uniconv-ext.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/share/extensions/uniconv-ext.py b/share/extensions/uniconv-ext.py
index 5608000c4..f4c80b5d6 100755
--- a/share/extensions/uniconv-ext.py
+++ b/share/extensions/uniconv-ext.py
@@ -22,6 +22,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
"""
# standard library
import sys
+# local library
+from run_command import run
+import inkex
+
+inkex.localize()
+
+cmd = None
+
try:
from subprocess import Popen, PIPE
p = Popen('uniconvertor', shell=True, stdout=PIPE, stderr=PIPE).wait()
@@ -37,13 +45,6 @@ except ImportError:
if p!=32512 : cmd = 'uniconv'
p = Popen3('uniconvertor', True).wait()
if p!=32512 : cmd = 'uniconvertor'
-# local library
-from run_command import run
-import inkex
-
-cmd = None
-
-inkex.localize()
if cmd == None:
# there's no succeffully-returning uniconv command; try to get the module directly (on Windows)