Merge pull request #1 from pyload/stable

sync with stable

1 files changed, 11 insertions, 10 deletions

diff --git a/module/plugins/crypter/EmbeduploadCom.py b/module/plugins/crypter/EmbeduploadCom.py
index 28633f634..341b3e315 100644
--- a/module/plugins/crypter/EmbeduploadCom.py
+++ b/module/plugins/crypter/EmbeduploadCom.py
@@ -1,14 +1,15 @@
 # -*- coding: utf-8 -*-
 
 import re
-from module.plugins.Crypter import Crypter
+from module.plugins.internal.Crypter import Crypter
 from module.network.HTTPRequest import BadHeader
 
 
 class EmbeduploadCom(Crypter):
     __name__    = "EmbeduploadCom"
     __type__    = "crypter"
-    __version__ = "0.02"
+    __version__ = "0.04"
+    __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?embedupload\.com/\?d=.+'
     __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"           , True         ),
@@ -25,30 +26,30 @@ class EmbeduploadCom(Crypter):
 
 
     def decrypt(self, pyfile):
-        self.html = self.load(pyfile.url, decode=True)
+        self.html = self.load(pyfile.url)
         tmp_links = []
 
         m = re.findall(self.LINK_PATTERN, self.html)
         if m:
-            prefered_set = set(self.getConfig('preferedHoster').split('|'))
+            prefered_set = set(self.get_config('preferedHoster').split('|'))
             prefered_set = map(lambda s: s.lower().split('.')[0], prefered_set)
 
-            self.logDebug("PF: %s" % prefered_set)
+            self.log_debug("PF: %s" % prefered_set)
 
             tmp_links.extend(x[1] for x in m if x[0] in prefered_set)
-            self.urls = self.getLocation(tmp_links)
+            self.urls = self.get_location(tmp_links)
 
             if not self.urls:
-                ignored_set = set(self.getConfig('ignoredHoster').split('|'))
+                ignored_set = set(self.get_config('ignoredHoster').split('|'))
                 ignored_set = map(lambda s: s.lower().split('.')[0], ignored_set)
 
-                self.logDebug("IG: %s" % ignored_set)
+                self.log_debug("IG: %s" % ignored_set)
 
                 tmp_links.extend(x[1] for x in m if x[0] not in ignored_set)
-                self.urls = self.getLocation(tmp_links)
+                self.urls = self.get_location(tmp_links)
 
 
-    def getLocation(self, tmp_links):
+    def get_location(self, tmp_links):
         new_links = []
         for link in tmp_links:
             try: