Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/hoster/RehostTo.py
	module/plugins/hoster/XVideosCom.py
	module/plugins/hoster/ZeveraCom.py
	module/plugins/internal/CaptchaService.py
	pyload/plugin/account/FilefactoryCom.py
	pyload/plugin/account/OneFichierCom.py
	pyload/plugin/account/WebshareCz.py
	pyload/plugin/addon/AntiVirus.py
	pyload/plugin/addon/Checksum.py
	pyload/plugin/addon/ExtractArchive.py
	pyload/plugin/container/CCF.py
	pyload/plugin/crypter/Go4UpCom.py
	pyload/plugin/hook/BypassCaptcha.py
	pyload/plugin/hook/CaptchaBrotherhood.py
	pyload/plugin/hook/ExpertDecoders.py
	pyload/plugin/hook/ImageTyperz.py
	pyload/plugin/hook/XFileSharingPro.py
	pyload/plugin/hoster/Ftp.py
	pyload/plugin/hoster/GigapetaCom.py
	pyload/plugin/hoster/MegaRapidCz.py
	pyload/plugin/hoster/MegaRapidoNet.py
	pyload/plugin/hoster/MultishareCz.py
	pyload/plugin/hoster/NarodRu.py
	pyload/plugin/hoster/QuickshareCz.py
	pyload/plugin/hoster/RapidgatorNet.py
	pyload/plugin/hoster/RapiduNet.py
	pyload/plugin/hoster/UnibytesCom.py
	pyload/plugin/hoster/UploadingCom.py
	pyload/plugin/hoster/WrzucTo.py
	pyload/plugin/internal/BasePlugin.py
	pyload/plugin/internal/SimpleDereferer.py
	pyload/plugin/internal/SimpleHoster.py
	pyload/plugin/internal/XFSCrypter.py
	pyload/plugin/internal/XFSHoster.py

1 files changed, 6 insertions, 8 deletions

diff --git a/pyload/plugin/addon/Checksum.py b/pyload/plugin/addon/Checksum.py
index 750dd665e..ada52d56e 100644
--- a/pyload/plugin/addon/Checksum.py
+++ b/pyload/plugin/addon/Checksum.py
@@ -3,12 +3,10 @@
 from __future__ import with_statement
 
 import hashlib
+import os
 import re
 import zlib
 
-from os import remove
-from os.path import getsize, isfile, splitext
-
 from pyload.plugin.Addon import Addon
 from pyload.utils import fs_join, fs_encode
 
@@ -108,13 +106,13 @@ class Checksum(Addon):
         # download_folder = self.config.get("general", "download_folder")
         # local_file = fs_encode(fs_join(download_folder, pyfile.package().folder, pyfile.name))
 
-        if not isfile(local_file):
+        if not os.path.isfile(local_file):
             self.checkFailed(pyfile, None, "File does not exist")
 
         # validate file size
         if "size" in data:
             api_size  = int(data['size'])
-            file_size = getsize(local_file)
+            file_size = os.path.getsize(local_file)
 
             if api_size != file_size:
                 self.logWarning(_("File %s has incorrect size: %d B (%d expected)") % (pyfile.name, file_size, api_size))
@@ -156,7 +154,7 @@ class Checksum(Addon):
             retry_action = self.getConfig('retry_action')
             if pyfile.plugin.retries < max_tries:
                 if local_file:
-                    remove(local_file)
+                    os.remove(local_file)
                 pyfile.plugin.retry(max_tries, self.getConfig('wait_time'), msg)
             elif retry_action == "nothing":
                 return
@@ -169,13 +167,13 @@ class Checksum(Addon):
         download_folder = fs_join(self.config.get("general", "download_folder"), pypack.folder, "")
 
         for link in pypack.getChildren().itervalues():
-            file_type = splitext(link['name'])[1][1:].lower()
+            file_type = os.path.splitext(link['name'])[1][1:].lower()
 
             if file_type not in self.formats:
                 continue
 
             hash_file = fs_encode(fs_join(download_folder, link['name']))
-            if not isfile(hash_file):
+            if not os.path.isfile(hash_file):
                 self.logWarning(_("File not found"), link['name'])
                 continue