Merge branch 'stable' into 0.4.10

Conflicts:
	module/PluginThread.py
	pyload/plugins/Plugin.py
	pyload/plugins/hoster/RarefileNet.py
	pyload/plugins/internal/MultiHoster.py
	pyload/plugins/internal/SimpleCrypter.py
	pyload/plugins/internal/SimpleHoster.py
	pyload/plugins/internal/XFSHoster.py

2 files changed, 4 insertions, 15 deletions

diff --git a/pyload/plugins/hoster/EasybytezCom.py b/pyload/plugins/hoster/EasybytezCom.py
index b233e52ee..d02cb371b 100644
--- a/pyload/plugins/hoster/EasybytezCom.py
+++ b/pyload/plugins/hoster/EasybytezCom.py
@@ -6,7 +6,7 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class EasybytezCom(XFSHoster):
     __name__    = "EasybytezCom"
     __type__    = "hoster"
-    __version__ = "0.22"
+    __version__ = "0.23"
 
     __pattern__ = r'http://(?:www\.)?easybytez\.com/\w{12}'
 
@@ -18,7 +18,6 @@ class EasybytezCom(XFSHoster):
 
     HOSTER_DOMAIN = "easybytez.com"
 
-    INFO_PATTERN = r'<span class="name">(?P<N>.+)</span><br>\s*<span class="size">(?P<S>[^<]+)</span>'
     OFFLINE_PATTERN = r'>File not available'
 
     LINK_PATTERN = r'(http://(\w+\.(easybytez|easyload|ezbytez|zingload)\.(com|to)|\d+\.\d+\.\d+\.\d+)/files/\d+/\w+/.+?)["\'<]'
diff --git a/pyload/plugins/hoster/RarefileNet.py b/pyload/plugins/hoster/RarefileNet.py
index fb54f6431..ce54b4dc7 100644
--- a/pyload/plugins/hoster/RarefileNet.py
+++ b/pyload/plugins/hoster/RarefileNet.py
@@ -3,13 +3,12 @@
 import re
 
 from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo
-from pyload.utils import html_unescape
 
 
 class RarefileNet(XFSHoster):
     __name__    = "RarefileNet"
     __type__    = "hoster"
-    __version__ = "0.06"
+    __version__ = "0.08"
 
     __pattern__ = r'http://(?:www\.)?rarefile\.net/\w{12}'
 
@@ -20,19 +19,10 @@ class RarefileNet(XFSHoster):
 
     HOSTER_DOMAIN = "rarefile.net"
 
-    NAME_PATTERN = r'<td><font color="red">(?P<N>.*?)</font></td>'
-    SIZE_PATTERN = r'<td>Size : (?P<S>.+?)&nbsp;'
+    NAME_PATTERN = r'<font color="red">(?P<N>.+?)<'
+    SIZE_PATTERN = r'>Size : (?P<S>[\d.,]+) (?P<U>[\w^_]+)'
 
     LINK_PATTERN = r'<a href="(?P<link>[^"]+)">(?P=link)</a>'
 
 
-    def handleCaptcha(self, inputs):
-        captcha_div = re.search(r'<b>Enter code.*?<div.*?>(.*?)</div>', self.html, re.S).group(1)
-        self.logDebug(captcha_div)
-        numerals = re.findall('<span.*?padding-left\s*:\s*(\d+).*?>(\d)</span>', html_unescape(captcha_div))
-        inputs['code'] = "".join([a[1] for a in sorted(numerals, key=lambda num: int(num[0]))])
-        self.logDebug("CAPTCHA", inputs['code'], numerals)
-        return 3
-
-
 getInfo = create_getInfo(RarefileNet)