From cf6531b2c87fea99fd03884636bac4c80d1b475d Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sun, 4 Oct 2015 20:09:55 +0200
Subject: Fixpack (3)

---
 module/plugins/internal/Plugin.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'module/plugins/internal/Plugin.py')

diff --git a/module/plugins/internal/Plugin.py b/module/plugins/internal/Plugin.py
index 9d2aa8b50..d89c3d2c0 100644
--- a/module/plugins/internal/Plugin.py
+++ b/module/plugins/internal/Plugin.py
@@ -60,7 +60,7 @@ def fixurl(url, unquote=None):
     if unquote is None:
         unquote = newurl == url
 
-    newurl = html_unescape(newurl.decode('unicode-escape'))
+    newurl = html_unescape(decode(newurl).decode('unicode-escape'))
     newurl = re.sub(r'(?<!:)/{2,}', '/', newurl).strip().lstrip('.')
 
     if not unquote:
@@ -96,7 +96,7 @@ def str2int(string):
     t_tuple = [(w, i * 10) for i, w in enumerate(tens)]
 
     numwords = dict(o_tuple + t_tuple)
-    tokens   = re.split(r"[\s-]+", string.lower())
+    tokens   = re.split(r"[\s\-]+", string.lower())
 
     try:
         return sum(numwords[word] for word in tokens)
@@ -226,7 +226,7 @@ def chunks(iterable, size):
 class Plugin(object):
     __name__    = "Plugin"
     __type__    = "plugin"
-    __version__ = "0.47"
+    __version__ = "0.48"
     __status__  = "testing"
 
     __pattern__ = r'^unmatchable$'
@@ -398,7 +398,7 @@ class Plugin(object):
             self.log_debug("LOAD URL " + url,
                            *["%s=%s" % (key, val) for key, val in locals().items() if key not in ("self", "url", "_[1]")])
 
-        url = fixurl(url)  #: Recheck in 0.4.10
+        url = fixurl(url, unquote=True)  #: Recheck in 0.4.10
 
         if req is None:
             req = self.req or self.pyload.requestFactory.getRequest(self.__name__)
-- 
cgit v1.2.3