From e1baccf1ec914563d3b2b845906cce024e7cd3b1 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 13 Jan 2015 23:14:50 +0100
Subject: Replace 'except' with 'except Exception'

---
 module/plugins/crypter/ChipDe.py        | 2 +-
 module/plugins/crypter/Go4UpCom.py      | 2 +-
 module/plugins/crypter/LinkCryptWs.py   | 2 +-
 module/plugins/crypter/NCryptIn.py      | 2 +-
 module/plugins/crypter/RelinkUs.py      | 4 ++--
 module/plugins/crypter/ShareLinksBiz.py | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'module/plugins/crypter')

diff --git a/module/plugins/crypter/ChipDe.py b/module/plugins/crypter/ChipDe.py
index 133e5a005..2fc36c355 100644
--- a/module/plugins/crypter/ChipDe.py
+++ b/module/plugins/crypter/ChipDe.py
@@ -22,7 +22,7 @@ class ChipDe(Crypter):
         self.html = self.load(pyfile.url)
         try:
             f = re.search(r'"(http://video\.chip\.de/.+)"', self.html)
-        except:
+        except Exception:
             self.fail(_("Failed to find the URL"))
         else:
             self.urls = [f.group(1)]
diff --git a/module/plugins/crypter/Go4UpCom.py b/module/plugins/crypter/Go4UpCom.py
index 102bc32b5..a7e16c0ab 100644
--- a/module/plugins/crypter/Go4UpCom.py
+++ b/module/plugins/crypter/Go4UpCom.py
@@ -40,7 +40,7 @@ class Go4UpCom(SimpleCrypter):
         for html in pages:
             try:
                 links.append(re.search(r'<b><a href="(.+?)"', html).group(1))
-            except:
+            except Exception:
                 continue
 
         return links
diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py
index 996a92c7b..c67372e3d 100644
--- a/module/plugins/crypter/LinkCryptWs.py
+++ b/module/plugins/crypter/LinkCryptWs.py
@@ -279,7 +279,7 @@ class LinkCryptWs(Crypter):
             (vcrypted, vjk) = self._getCipherParams(cnl_section)
             for (crypted, jk) in zip(vcrypted, vjk):
                 package_links.extend(self._getLinks(crypted, jk))
-        except:
+        except Exception:
             self.logError(_("Unable to decrypt CNL links (JS Error) try to get over links"))
             return self.handleWebLinks()
 
diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py
index 8b7214157..7c881ce75 100644
--- a/module/plugins/crypter/NCryptIn.py
+++ b/module/plugins/crypter/NCryptIn.py
@@ -229,7 +229,7 @@ class NCryptIn(Crypter):
                 (vcrypted, vjk) = self._getCipherParams()
                 for (crypted, jk) in zip(vcrypted, vjk):
                     package_links.extend(self._getLinks(crypted, jk))
-            except:
+            except Exception:
                 self.fail(_("Unable to decrypt CNL2 links"))
 
         return package_links
diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py
index c5a3f1011..0fd80d593 100644
--- a/module/plugins/crypter/RelinkUs.py
+++ b/module/plugins/crypter/RelinkUs.py
@@ -204,7 +204,7 @@ class RelinkUs(Crypter):
                 (vcrypted, vjk) = self._getCipherParams(cnl2_form)
                 for (crypted, jk) in zip(vcrypted, vjk):
                     package_links.extend(self._getLinks(crypted, jk))
-            except:
+            except Exception:
                 self.logDebug("Unable to decrypt CNL2 links")
         return package_links
 
@@ -223,7 +223,7 @@ class RelinkUs(Crypter):
                 with open(dlc_filepath, "wb") as f:
                     f.write(dlc)
                 package_links.append(dlc_filepath)
-            except:
+            except Exception:
                 self.fail("Unable to download DLC container")
         return package_links
 
diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py
index d2e8138f6..df53b5879 100644
--- a/module/plugins/crypter/ShareLinksBiz.py
+++ b/module/plugins/crypter/ShareLinksBiz.py
@@ -235,7 +235,7 @@ class ShareLinksBiz(Crypter):
             try:
                 (crypted, jk) = self._getCipherParams()
                 package_links.extend(self._getLinks(crypted, jk))
-            except:
+            except Exception:
                 self.fail(_("Unable to decrypt CNL2 links"))
         return package_links
 
-- 
cgit v1.2.3