Merge pull request #489 from wzyboy/backports/pylzma

Support pylzma as a fallback
2018-05-05 18:36:55 +01:00
parent 75acbe5536 599f33171f
commit dd09da7dd9
7 changed files with 36 additions and 15 deletions
--- a/DeDRM_calibre_plugin/DeDRM_plugin/kfxdedrm.py
+++ b/DeDRM_calibre_plugin/DeDRM_plugin/kfxdedrm.py
@@ -15,9 +15,9 @@ except ImportError:
    from StringIO import StringIO

 try:
-    import ion
-except:
    from calibre_plugins.dedrm import ion
+except ImportError:
+    import ion


 __license__ = 'GPL v3'