Restructure pyload file tree (1)

10 files changed, 18 insertions, 18 deletions

diff --git a/pyload/plugins/crypter/DailymotionBatch.py b/pyload/plugins/crypter/DailymotionBatch.py
index d44350c6b..2c818d8bc 100644
--- a/pyload/plugins/crypter/DailymotionBatch.py
+++ b/pyload/plugins/crypter/DailymotionBatch.py
@@ -4,7 +4,7 @@ import re
 
 from urlparse import urljoin
 
-from pyload.common.json_layer import json_loads
+from pyload.utils import json_loads
 from pyload.plugins.Crypter import Crypter
 from pyload.utils import safe_join
 
diff --git a/pyload/plugins/crypter/GooGl.py b/pyload/plugins/crypter/GooGl.py
index ae48c61b5..93f3456cc 100644
--- a/pyload/plugins/crypter/GooGl.py
+++ b/pyload/plugins/crypter/GooGl.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from pyload.plugins.Crypter import Crypter
-from pyload.common.json_layer import json_loads
+from pyload.utils import json_loads
 
 
 class GooGl(Crypter):
diff --git a/pyload/plugins/crypter/LinkSaveIn.py b/pyload/plugins/crypter/LinkSaveIn.py
index 84dd8172e..4a56606c8 100644
--- a/pyload/plugins/crypter/LinkSaveIn.py
+++ b/pyload/plugins/crypter/LinkSaveIn.py
@@ -9,7 +9,7 @@ import re
 
 from Crypto.Cipher import AES
 from pyload.plugins.Crypter import Crypter
-from pyload.unescape import unescape
+from pyload.utils import html_unescape
 
 
 class LinkSaveIn(Crypter):
@@ -153,7 +153,7 @@ class LinkSaveIn(Crypter):
                     dlLink = re.search(r'http://linksave\.in/dl-\w+', jseval).group(0)
                     self.logDebug("JsEngine returns value [%s] for redirection link" % dlLink)
                     response = self.load(dlLink)
-                    link = unescape(re.search(r'<iframe src="(.+?)"', response).group(1))
+                    link = html_unescape(re.search(r'<iframe src="(.+?)"', response).group(1))
                     package_links.append(link)
                 except Exception, detail:
                     self.logDebug("Error decrypting Web link %s, %s" % (webLink, detail))
@@ -169,7 +169,7 @@ class LinkSaveIn(Crypter):
         containersLinks = re.findall(pattern, self.html)
         self.logDebug("Found %d %s Container links" % (len(containersLinks), type_.upper()))
         for containerLink in containersLinks:
-            link = "http://linksave.in/%s" % unescape(containerLink)
+            link = "http://linksave.in/%s" % html_unescape(containerLink)
             package_links.append(link)
         return package_links
 
diff --git a/pyload/plugins/crypter/MediafireComFolder.py b/pyload/plugins/crypter/MediafireComFolder.py
index 4ea904e89..98c05f450 100644
--- a/pyload/plugins/crypter/MediafireComFolder.py
+++ b/pyload/plugins/crypter/MediafireComFolder.py
@@ -3,7 +3,7 @@
 import re
 from pyload.plugins.Crypter import Crypter
 from pyload.plugins.hoster.MediafireCom import checkHTMLHeader
-from pyload.common.json_layer import json_loads
+from pyload.utils import json_loads
 
 
 class MediafireComFolder(Crypter):
diff --git a/pyload/plugins/crypter/MultiuploadCom.py b/pyload/plugins/crypter/MultiuploadCom.py
index 5aa77e5f5..b1650b647 100644
--- a/pyload/plugins/crypter/MultiuploadCom.py
+++ b/pyload/plugins/crypter/MultiuploadCom.py
@@ -4,7 +4,7 @@ import re
 from time import time
 
 from pyload.plugins.Crypter import Crypter
-from pyload.common.json_layer import json_loads
+from pyload.utils import json_loads
 
 
 class MultiuploadCom(Crypter):
diff --git a/pyload/plugins/crypter/OneKhDe.py b/pyload/plugins/crypter/OneKhDe.py
index 320eaf6c6..4f3ab2a20 100644
--- a/pyload/plugins/crypter/OneKhDe.py
+++ b/pyload/plugins/crypter/OneKhDe.py
@@ -2,7 +2,7 @@
 
 import re
 
-from pyload.unescape import unescape
+from pyload.utils import html_unescape
 from pyload.plugins.Crypter import Crypter
 
 
@@ -33,6 +33,6 @@ class OneKhDe(Crypter):
         self.html = self.req.load(url)
         link_ids = re.findall(r"<a id=\"DownloadLink_(\d*)\" href=\"http://1kh.de/", self.html)
         for id in link_ids:
-            new_link = unescape(
+            new_link = html_unescape(
                 re.search("width=\"100%\" src=\"(.*)\"></iframe>", self.req.load("http://1kh.de/l/" + id)).group(1))
             self.urls.append(new_link)
diff --git a/pyload/plugins/crypter/SafelinkingNet.py b/pyload/plugins/crypter/SafelinkingNet.py
index 543fb32fb..9c68ba915 100644
--- a/pyload/plugins/crypter/SafelinkingNet.py
+++ b/pyload/plugins/crypter/SafelinkingNet.py
@@ -6,7 +6,7 @@ from pycurl import FOLLOWLOCATION
 
 from BeautifulSoup import BeautifulSoup
 
-from pyload.common.json_layer import json_loads
+from pyload.utils import json_loads
 from pyload.plugins.Crypter import Crypter
 from pyload.plugins.internal.CaptchaService import SolveMedia
 
diff --git a/pyload/plugins/crypter/SerienjunkiesOrg.py b/pyload/plugins/crypter/SerienjunkiesOrg.py
index a1745c6c9..713086cb9 100644
--- a/pyload/plugins/crypter/SerienjunkiesOrg.py
+++ b/pyload/plugins/crypter/SerienjunkiesOrg.py
@@ -8,7 +8,7 @@ from time import sleep
 from BeautifulSoup import BeautifulSoup
 
 from pyload.plugins.Crypter import Crypter
-from pyload.unescape import unescape
+from pyload.utils import html_unescape
 
 
 class SerienjunkiesOrg(Crypter):
@@ -48,7 +48,7 @@ class SerienjunkiesOrg(Crypter):
         soup = BeautifulSoup(src)
         packageName = self.pyfile.package().name
         if self.getConfig("changeNameSJ") == "Show":
-            found = unescape(soup.find("h2").find("a").string.split(' &#8211;')[0])
+            found = html_unescape(soup.find("h2").find("a").string.split(' &#8211;')[0])
             if found:
                 packageName = found
 
@@ -71,7 +71,7 @@ class SerienjunkiesOrg(Crypter):
         post = soup.find("div", attrs={"class": "post-content"})
         ps = post.findAll("p")
 
-        seasonName = unescape(soup.find("a", attrs={"rel": "bookmark"}).string).replace("&#8211;", "-")
+        seasonName = html_unescape(soup.find("a", attrs={"rel": "bookmark"}).string).replace("&#8211;", "-")
         groups = {}
         gid = -1
         for p in ps:
@@ -79,7 +79,7 @@ class SerienjunkiesOrg(Crypter):
                 var = p.findAll("strong")
                 opts = {"Sprache": "", "Format": ""}
                 for v in var:
-                    n = unescape(v.string).strip()
+                    n = html_unescape(v.string).strip()
                     n = re.sub(r"^([:]?)(.*?)([:]?)$", r'\2', n)
                     if n.strip() not in opts:
                         continue
@@ -198,7 +198,7 @@ class SerienjunkiesOrg(Crypter):
         soup = BeautifulSoup(src)
         post = soup.find("div", attrs={"id": "page_post"})
         ps = post.findAll("p")
-        found = unescape(soup.find("h2").find("a").string.split(' &#8211;')[0])
+        found = html_unescape(soup.find("h2").find("a").string.split(' &#8211;')[0])
         if found:
             seasonName = found
 
@@ -209,7 +209,7 @@ class SerienjunkiesOrg(Crypter):
                 var = p.findAll("strong")
                 opts = {"Sprache": "", "Format": ""}
                 for v in var:
-                    n = unescape(v.string).strip()
+                    n = html_unescape(v.string).strip()
                     n = re.sub(r"^([:]?)(.*?)([:]?)$", r'\2', n)
                     if n.strip() not in opts:
                         continue
diff --git a/pyload/plugins/crypter/TurbobitNetFolder.py b/pyload/plugins/crypter/TurbobitNetFolder.py
index 48b28c28a..c7786b7be 100644
--- a/pyload/plugins/crypter/TurbobitNetFolder.py
+++ b/pyload/plugins/crypter/TurbobitNetFolder.py
@@ -3,7 +3,7 @@
 import re
 
 from pyload.plugins.internal.SimpleCrypter import SimpleCrypter
-from pyload.common.json_layer import json_loads
+from pyload.utils import json_loads
 
 
 class TurbobitNetFolder(SimpleCrypter):
diff --git a/pyload/plugins/crypter/YoutubeBatch.py b/pyload/plugins/crypter/YoutubeBatch.py
index 5b7cb6530..bc72e04ea 100644
--- a/pyload/plugins/crypter/YoutubeBatch.py
+++ b/pyload/plugins/crypter/YoutubeBatch.py
@@ -4,7 +4,7 @@ import re
 
 from urlparse import urljoin
 
-from pyload.common.json_layer import json_loads
+from pyload.utils import json_loads
 from pyload.plugins.Crypter import Crypter
 from pyload.utils import safe_join