Merge branch 'tbpassin/inkscape_r2p'

Closes #826
rst2pdf · Mar 28, 2020 · 50f2e49 · 50f2e49
2 parents 0c929ad + c3a7c5c
commit 50f2e49
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/rst2pdf/createpdf.py b/rst2pdf/createpdf.py
@@ -34,7 +34,6 @@
 #
 #####################################################################################
 
-
 __docformat__ = 'reStructuredText'
 from importlib import import_module
 import six
@@ -1577,11 +1576,13 @@ def __init__(self):
             sys.path.insert(0, prefix)
         log.info('Importing extension module %s', repr(modname))
         firstname = path_given and modname or (modname + '_r2p')
+        _names = [firstname, modname]
         try:
-            try:
-                module = import_module(firstname)
-            except ImportError as e:
-                module = import_module(modname)
+            for _name in _names:
+                try:
+                    module = import_module(_name, 'rst2pdf')
+                except ImportError:
+                    continue
         except ImportError as e:
             if str(e).split()[-1].replace("'", '') not in [firstname, modname]:
                 raise

diff --git a/rst2pdf/extensions/inkscape_r2p.py b/rst2pdf/extensions/inkscape_r2p.py
@@ -15,8 +15,11 @@
 import sys, os, tempfile, subprocess
 from weakref import WeakKeyDictionary
 from rst2pdf.log import log
-
-from vectorpdf_r2p import VectorPdf
+try:
+    from  vectorpdf_r2p import VectorPdf
+except:
+    from  .vectorpdf_r2p import VectorPdf
+
 import rst2pdf.image