Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/internal/CaptchaService.py
	pyload/plugins/account/EasybytezCom.py
	pyload/plugins/account/TusfilesNet.py
	pyload/plugins/base/OCR.py
	pyload/plugins/crypter/MultiuploadCom.py
	pyload/plugins/crypter/UploadableChFolder.py
	pyload/plugins/hoster/DuploadOrg.py
	pyload/plugins/hoster/EpicShareNet.py
	pyload/plugins/hoster/LemUploadsCom.py
	pyload/plugins/hoster/LoadTo.py
	pyload/plugins/hoster/LomafileCom.py
	pyload/plugins/hoster/MegaFilesSe.py
	pyload/plugins/hoster/MegareleaseOrg.py
	pyload/plugins/hoster/PandaPlanet.py
	pyload/plugins/hoster/PotloadCom.py
	pyload/plugins/hoster/PremiumTo.py
	pyload/plugins/hoster/TurbobitNet.py
	pyload/plugins/internal/DeadCrypter.py
	pyload/plugins/internal/DeadHoster.py
	pyload/plugins/internal/SimpleCrypter.py
	pyload/plugins/internal/UpdateManager.py
	pyload/plugins/ocr/LinksaveIn.py

6 files changed, 19 insertions, 22 deletions

diff --git a/pyload/plugins/base/Account.py b/pyload/plugins/base/Account.py
index acf531694..687803d2e 100644
--- a/pyload/plugins/base/Account.py
+++ b/pyload/plugins/base/Account.py
@@ -24,8 +24,8 @@ class Account(Base):
     __version__ = "0.3"
 
     __description__ = """Base account plugin"""
-    __author_name__ = "mkaay"
-    __author_mail__ = "mkaay@mkaay.de"
+    __authors__ = [("mkaay", "mkaay@mkaay.de")]
+
 
     #: after that time (in minutes) pyload will relogin the account
     login_timeout = 10 * 60
@@ -67,13 +67,13 @@ class Account(Base):
             self.login(user, data, req)
         except WrongPassword:
             self.logWarning(
-                _("Could not login with account %(user)s | %(msg)s") % {"user": user
-                                                                        , "msg": _("Wrong Password")})
+                _("Could not login with account %(user)s | %(msg)s") % {"user": user,
+                                                                        "msg": _("Wrong Password")})
             success = data['valid'] = False
         except Exception, e:
             self.logWarning(
-                _("Could not login with account %(user)s | %(msg)s") % {"user": user
-                                                                        , "msg": e})
+                _("Could not login with account %(user)s | %(msg)s") % {"user": user,
+                                                                        "msg": e})
             success = data['valid'] = False
             if self.core.debug:
                 print_exc()
diff --git a/pyload/plugins/base/Container.py b/pyload/plugins/base/Container.py
index 2059ae9b2..40cc25195 100644
--- a/pyload/plugins/base/Container.py
+++ b/pyload/plugins/base/Container.py
@@ -17,8 +17,7 @@ class Container(Crypter):
     __pattern__ = None
 
     __description__ = """Base container decrypter plugin"""
-    __author_name__ = "mkaay"
-    __author_mail__ = "mkaay@mkaay.de"
+    __authors__ = [("mkaay", "mkaay@mkaay.de")]
 
 
     def preprocessing(self, thread):
diff --git a/pyload/plugins/base/Crypter.py b/pyload/plugins/base/Crypter.py
index 7bb48d607..8d269c75d 100644
--- a/pyload/plugins/base/Crypter.py
+++ b/pyload/plugins/base/Crypter.py
@@ -11,8 +11,7 @@ class Crypter(Plugin):
     __pattern__ = None
 
     __description__ = """Base decrypter plugin"""
-    __author_name__ = "mkaay"
-    __author_mail__ = "mkaay@mkaay.de"
+    __authors__ = [("mkaay", "mkaay@mkaay.de")]
 
 
     def __init__(self, pyfile):
diff --git a/pyload/plugins/base/Hook.py b/pyload/plugins/base/Hook.py
index a866278ba..718802ad8 100644
--- a/pyload/plugins/base/Hook.py
+++ b/pyload/plugins/base/Hook.py
@@ -31,8 +31,9 @@ class Hook(Base):
     __config__ = [("name", "type", "desc", "default")]
 
     __description__ = """Interface for hook"""
-    __author_name__ = ("mkaay", "RaNaN")
-    __author_mail__ = ("mkaay@mkaay.de", "RaNaN@pyload.org")
+    __authors__ = [("mkaay", "mkaay@mkaay.de"),
+                   ("RaNaN", "RaNaN@pyload.org")]
+
 
     #: automatically register event listeners for functions, attribute will be deleted dont use it yourself
     event_map = None
diff --git a/pyload/plugins/base/Hoster.py b/pyload/plugins/base/Hoster.py
index 23369deec..8f0bdb727 100644
--- a/pyload/plugins/base/Hoster.py
+++ b/pyload/plugins/base/Hoster.py
@@ -16,5 +16,4 @@ class Hoster(Plugin):
     __pattern__ = None
 
     __description__ = """Base hoster plugin"""
-    __author_name__ = "mkaay"
-    __author_mail__ = "mkaay@mkaay.de"
+    __authors__ = [("mkaay", "mkaay@mkaay.de")]
diff --git a/pyload/plugins/base/OCR.py b/pyload/plugins/base/OCR.py
index 0991184f3..5ce85aef6 100644
--- a/pyload/plugins/base/OCR.py
+++ b/pyload/plugins/base/OCR.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import with_statement
-import os
+
+try:
+    from PIL import Image, GifImagePlugin, JpegImagePlugin, PngImagePlugin, TiffImagePlugin
+except ImportError:
+    import Image, GifImagePlugin, JpegImagePlugin, PngImagePlugin, TiffImagePlugin
+
 import logging
 import subprocess
 
 from os.path import abspath, join
-from PIL import Image
-from PIL import TiffImagePlugin
-from PIL import PngImagePlugin
-from PIL import GifImagePlugin
-from PIL import JpegImagePlugin
 
 
 class OCR(object):
@@ -19,8 +19,7 @@ class OCR(object):
     __version__ = "0.1"
 
     __description__ = """OCR base plugin"""
-    __author_name__ = "pyLoad Team"
-    __author_mail__ = "admin@pyload.org"
+    __authors__ = [("pyLoad Team", "admin@pyload.org")]
 
 
     def __init__(self):