Propagate changes

diff --git a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ion.py b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ion.py
index c1001917ef17bc724c47b33b5d4c97704c49f3f6..40433ca4184089058acfb77bdc601b89cf558d03 100644 (file)
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ion.py
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ion.py
@@ -23,13 +23,17 @@ from Crypto.Util.py3compat import bchr, bord
 try:
     # lzma library from calibre 2.35.0 or later
     import lzma.lzma1 as calibre_lzma
-except:
+except ImportError:
     calibre_lzma = None
     try:
         import lzma
-    except:
+    except ImportError:
         # Need pip backports.lzma on Python <3.3
-        from backports import lzma
+        try:
+            from backports import lzma
+        except ImportError:
+            # Windows-friendly choice: pylzma wheels
+            import pylzma as lzma
 
 
 TID_NULL = 0

diff --git a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/kfxdedrm.py b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/kfxdedrm.py
index 8885e097e12f7e0a8d7136a4599534fbdffcebcc..c2b9bb1ceaa7b2a84e7b1be8627daf1903c9bd9e 100644 (file)
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/kfxdedrm.py
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/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'

diff --git a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ion.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ion.py
index c1001917ef17bc724c47b33b5d4c97704c49f3f6..40433ca4184089058acfb77bdc601b89cf558d03 100644 (file)
--- a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ion.py
+++ b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ion.py
@@ -23,13 +23,17 @@ from Crypto.Util.py3compat import bchr, bord
 try:
     # lzma library from calibre 2.35.0 or later
     import lzma.lzma1 as calibre_lzma
-except:
+except ImportError:
     calibre_lzma = None
     try:
         import lzma
-    except:
+    except ImportError:
         # Need pip backports.lzma on Python <3.3
-        from backports import lzma
+        try:
+            from backports import lzma
+        except ImportError:
+            # Windows-friendly choice: pylzma wheels
+            import pylzma as lzma
 
 
 TID_NULL = 0

diff --git a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/kfxdedrm.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/kfxdedrm.py
index 8885e097e12f7e0a8d7136a4599534fbdffcebcc..c2b9bb1ceaa7b2a84e7b1be8627daf1903c9bd9e 100644 (file)
--- a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/kfxdedrm.py
+++ b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/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'