diff options
| -rw-r--r-- | module/plugins/internal/Addon.py | 4 | ||||
| -rw-r--r-- | module/plugins/internal/Captcha.py | 5 | ||||
| -rw-r--r-- | module/plugins/internal/Container.py | 2 | ||||
| -rw-r--r-- | module/plugins/internal/Crypter.py | 2 | ||||
| -rw-r--r-- | module/plugins/internal/misc.py | 10 |
5 files changed, 10 insertions, 13 deletions
diff --git a/module/plugins/internal/Addon.py b/module/plugins/internal/Addon.py index fcb9210ce..cf7321893 100644 --- a/module/plugins/internal/Addon.py +++ b/module/plugins/internal/Addon.py @@ -61,7 +61,7 @@ class Addon(Plugin): """ Checks if addon is activated """ - return self.config.get("activated") + return self.config.get('activated') #@TODO: Remove in 0.4.10 @@ -195,7 +195,7 @@ class Addon(Plugin): #: Deprecated method, use `download_failed` instead (Remove in 0.4.10) def downloadFailed(self, pyfile): - if pyfile.hasStatus("failed"): #: Check if still "failed" (Fix in 0.4.10) + if pyfile.hasStatus("failed"): #@NOTE: Check if "still" set as failed (Fix in 0.4.10) return self.download_failed(pyfile) diff --git a/module/plugins/internal/Captcha.py b/module/plugins/internal/Captcha.py index dde92816b..8f96d3fc2 100644 --- a/module/plugins/internal/Captcha.py +++ b/module/plugins/internal/Captcha.py @@ -70,7 +70,7 @@ class Captcha(Plugin): img_f.write(img) if ocr: - self.log_warning(_("Using OCR to decrypt captcha")) + self.log_info(_("Using OCR to decrypt captcha...")) if isinstance(ocr, basestring): _OCR = self.pyload.pluginManager.loadClass("captcha", ocr) #: Rename `captcha` to `ocr` in 0.4.10 @@ -81,9 +81,6 @@ class Captcha(Plugin): if not result: self.log_warning(_("No OCR result")) - else: - self.log_warning(_("OCR was not used")) - if not result: captchaManager = self.pyload.captchaManager diff --git a/module/plugins/internal/Container.py b/module/plugins/internal/Container.py index f9d92db64..717fe1a57 100644 --- a/module/plugins/internal/Container.py +++ b/module/plugins/internal/Container.py @@ -62,7 +62,7 @@ class Container(Crypter): content = self.load(self.pyfile.url) self.pyfile.name = "tmp_" + self.pyfile.name - self.pyfile.url = os.path.join(self.pyload.config.get("general", "download_folder"), self.pyfile.name) + self.pyfile.url = os.path.join(self.pyload.config.get('general', 'download_folder'), self.pyfile.name) try: with open(self.pyfile.url, "wb") as f: diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index 665dd3705..4b802199c 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -69,7 +69,7 @@ class Crypter(Base): folder_per_package = self.config.get('folder_per_package', "Default") if folder_per_package == "Default": - folder_per_package = self.pyload.config.get("general", "folder_per_package") + folder_per_package = self.pyload.config.get('general', 'folder_per_package') else: folder_per_package = folder_per_package == "Yes" diff --git a/module/plugins/internal/misc.py b/module/plugins/internal/misc.py index b5b25260a..346424db7 100644 --- a/module/plugins/internal/misc.py +++ b/module/plugins/internal/misc.py @@ -519,7 +519,7 @@ def parse_name(value, safechar=True): def parse_size(value, unit=""): #: returns bytes - m = re.match(r"([\d.,]+)\s*([\w^_]*)", str(value).lower()) + m = re.match(r'([\d.,]+)\s*([\w^_]*)', str(value).lower()) if m is None: return 0 @@ -557,7 +557,7 @@ def str2int(value): t_tuple = [(w, i * 10) for i, w in enumerate(tens)] numwords = dict(o_tuple + t_tuple) - tokens = re.split(r"[\s\-]+", value.lower()) + tokens = re.split(r'[\s\-]+', value.lower()) try: return sum(numwords[word] for word in tokens) @@ -717,17 +717,17 @@ def parse_html_header(header): def parse_html_tag_attr_value(attr_name, tag): - m = re.search(r"%s\s*=\s*([\"']?)((?<=\")[^\"]+|(?<=')[^']+|[^>\s\"'][^>\s]*)\1" % attr_name, tag, re.I) + m = re.search(r'%s\s*=\s*(["\']?)((?<=")[^"]+|(?<=\')[^\']+|[^>\s"\'][^>\s]*)\1' % attr_name, tag, re.I) return m.group(2) if m else None def parse_html_form(attr_str, html, input_names={}): - for form in re.finditer(r"(?P<TAG><form[^>]*%s[^>]*>)(?P<CONTENT>.*?)</?(form|body|html)[^>]*>" % attr_str, + for form in re.finditer(r'(?P<TAG><form[^>]*%s.*?>)(?P<CONTENT>.*?)</?(form|body|html).*?>' % attr_str, html, re.I | re.S): inputs = {} action = parse_html_tag_attr_value("action", form.group('TAG')) - for inputtag in re.finditer(r'(<(input|textarea)[^>]*>)([^<]*(?=</\2)|)', form.group('CONTENT'), re.I | re.S): + for inputtag in re.finditer(r'(<(input|textarea).*?>)([^<]*(?=</\2)|)', form.group('CONTENT'), re.I | re.S): name = parse_html_tag_attr_value("name", inputtag.group(1)) if name: value = parse_html_tag_attr_value("value", inputtag.group(1)) |