From ec17e176f431c1f651a9bd413b3f493aade5bf80 Mon Sep 17 00:00:00 2001 From: GammaC0de Date: Tue, 5 Jan 2016 00:58:20 +0200 Subject: [Plugin] Update --- module/plugins/internal/Plugin.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'module/plugins/internal') diff --git a/module/plugins/internal/Plugin.py b/module/plugins/internal/Plugin.py index a8ef9b4f2..f84d57105 100644 --- a/module/plugins/internal/Plugin.py +++ b/module/plugins/internal/Plugin.py @@ -4,24 +4,18 @@ from __future__ import with_statement import inspect import os +import pycurl import re if os.name != "nt": import grp import pwd -import pycurl -try: - import send2trash -except ImportError: - pass - -import module.plugins.internal.misc as utils from module.network.RequestFactory import getRequest as get_request from module.plugins.Plugin import Abort, Fail, Reconnect, Retry, SkipDownload as Skip #@TODO: Remove in 0.4.10 from module.plugins.internal.misc import (Config, DB, decode, encode, exists, fixurl, fsjoin, - format_exc, html_unescape, parse_html_header, set_cookies) + format_exc, html_unescape, parse_html_header, remove, set_cookies) class Plugin(object): @@ -219,7 +213,7 @@ class Plugin(object): #@TODO: Move to network in 0.4.10 if isinstance(decode, basestring): - html = utils.decode(html, decode) + html = decode(html, decode) self.last_html = html -- cgit v1.2.3