Merge pull request #2 from pyload/stable

sync with stable

1 files changed, 14 insertions, 22 deletions

diff --git a/module/plugins/hoster/NarodRu.py b/module/plugins/hoster/NarodRu.py
index b0d4a4960..bea04c9cd 100644
--- a/module/plugins/hoster/NarodRu.py
+++ b/module/plugins/hoster/NarodRu.py
@@ -34,33 +34,25 @@ class NarodRu(SimpleHoster):
 
 
     def handle_free(self, pyfile):
-        for _i in xrange(5):
-            self.html = self.load('http://narod.ru/disk/getcapchaxml/?rnd=%d' % int(random.random() * 777))
+        self.html = self.load('http://narod.ru/disk/getcapchaxml/?rnd=%d' % int(random.random() * 777))
 
-            m = re.search(self.CAPTCHA_PATTERN, self.html)
-            if m is None:
-                self.error(_("Captcha"))
+        m = re.search(self.CAPTCHA_PATTERN, self.html)
+        if m is None:
+            self.error(_("Captcha"))
 
-            post_data = {'action': "sendcapcha"}
-            captcha_url, post_data['key'] = m.groups()
-            post_data['rep'] = self.captcha.decrypt(captcha_url)
+        post_data = {'action': "sendcapcha"}
+        captcha_url, post_data['key'] = m.groups()
+        post_data['rep'] = self.captcha.decrypt(captcha_url)
 
-            self.html = self.load(pyfile.url, post=post_data)
+        self.html = self.load(pyfile.url, post=post_data)
 
-            m = re.search(self.LINK_FREE_PATTERN, self.html)
-            if m:
-                self.link = urlparse.urljoin("http://narod.ru", m.group(1))
-                self.captcha.correct()
-                break
+        m = re.search(self.LINK_FREE_PATTERN, self.html)
+        if m is not None:
+            self.captcha.correct()
+            self.link = urlparse.urljoin("http://narod.ru/", m.group(1))
 
-            elif u'<b class="error-msg"><strong>Ошиблись?</strong>' in self.html:
-                self.captcha.invalid()
-
-            else:
-                self.error(_("Download link"))
-
-        else:
-            self.fail(_("No valid captcha code entered"))
+        elif u'<b class="error-msg"><strong>Ошиблись?</strong>' in self.html:
+            self.retry_captcha()
 
 
 getInfo = create_getInfo(NarodRu)