6 files changed, 23 insertions, 23 deletions
diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py
index ee92beb9a..c7824fcc4 100644
--- a/module/plugins/container/CCF.py
+++ b/module/plugins/container/CCF.py
@@ -6,25 +6,24 @@ from os import makedirs
 from os.path import exists
 from urllib2 import build_opener
 
-from module.lib.MultipartPostHandler import MultipartPostHandler
+from MultipartPostHandler import MultipartPostHandler
 
 from module.plugins.Container import Container
 from module.utils import save_join
 
 
 class CCF(Container):
-    __name__ = "CCF"
+    __name__    = "CCF"
     __version__ = "0.2"
 
     __pattern__ = r'.+\.ccf'
 
     __description__ = """CCF container decrypter plugin"""
-    __author_name__ = "Willnix"
-    __author_mail__ = "Willnix@pyload.org"
+    __license__     = "GPLv3"
+    __authors__     = [("Willnix", "Willnix@pyload.org")]
 
 
     def decrypt(self, pyfile):
-
         infile = pyfile.url.replace("\n", "")
 
         opener = build_opener(MultipartPostHandler)
@@ -37,7 +36,7 @@ class CCF(Container):
 
         tempdlc_name = save_join(download_folder, "tmp_%s.dlc" % pyfile.name)
         tempdlc = open(tempdlc_name, "w")
-        tempdlc.write(re.search(r'<dlc>(.*)</dlc>', tempdlc_content, re.DOTALL).group(1))
+        tempdlc.write(re.search(r'<dlc>(.*)</dlc>', tempdlc_content, re.S).group(1))
         tempdlc.close()
 
         self.urls = [tempdlc_name]
diff --git a/module/plugins/container/DLC_25.pyc b/module/plugins/container/DLC_25.pyc
index b8fde0051..409264902 100644
--- a/module/plugins/container/DLC_25.pyc
+++ b/module/plugins/container/DLC_25.pyc
diff --git a/module/plugins/container/DLC_26.pyc b/module/plugins/container/DLC_26.pyc
index 41a4e0cb8..685995fc2 100644
--- a/module/plugins/container/DLC_26.pyc
+++ b/module/plugins/container/DLC_26.pyc
diff --git a/module/plugins/container/DLC_27.pyc b/module/plugins/container/DLC_27.pyc
index a6bffaf74..6c6d663e5 100644
--- a/module/plugins/container/DLC_27.pyc
+++ b/module/plugins/container/DLC_27.pyc
diff --git a/module/plugins/container/LinkList.py b/module/plugins/container/LinkList.py
index 7e418bd67..c6173ad73 100644
--- a/module/plugins/container/LinkList.py
+++ b/module/plugins/container/LinkList.py
@@ -7,7 +7,7 @@ from module.utils import fs_encode
 
 
 class LinkList(Container):
-    __name__ = "LinkList"
+    __name__    = "LinkList"
     __version__ = "0.12"
 
     __pattern__ = r'.+\.txt'
@@ -15,8 +15,9 @@ class LinkList(Container):
                   ("encoding", "string", "File encoding (default utf-8)", "")]
 
     __description__ = """Read link lists in txt format"""
-    __author_name__ = ("spoob", "jeix")
-    __author_mail__ = ("spoob@pyload.org", "jeix@hasnomail.com")
+    __license__     = "GPLv3"
+    __authors__     = [("spoob", "spoob@pyload.org"),
+                       ("jeix", "jeix@hasnomail.com")]
 
 
     def decrypt(self, pyfile):
@@ -25,9 +26,6 @@ class LinkList(Container):
         except:
             file_enc = "utf-8"
 
-        print repr(pyfile.url)
-        print pyfile.url
-
         file_name = fs_encode(pyfile.url)
 
         txt = codecs.open(file_name, 'r', file_enc)
@@ -67,7 +65,7 @@ class LinkList(Container):
                 txt = open(file_name, 'wb')
                 txt.close()
             except:
-                self.logWarning(_("LinkList could not be cleared."))
+                self.logWarning(_("LinkList could not be cleared"))
 
         for name, links in packages.iteritems():
             self.packages.append((name, links, name))
diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py
index c35efacc6..9c57c8ddb 100644
--- a/module/plugins/container/RSDF.py
+++ b/module/plugins/container/RSDF.py
@@ -5,24 +5,26 @@ import binascii
 import re
 
 from module.plugins.Container import Container
+from module.utils import fs_encode
 
 
 class RSDF(Container):
-    __name__ = "RSDF"
-    __version__ = "0.22"
+    __name__    = "RSDF"
+    __version__ = "0.23"
 
     __pattern__ = r'.+\.rsdf'
 
     __description__ = """RSDF container decrypter plugin"""
-    __author_name__ = ("RaNaN", "spoob")
-    __author_mail__ = ("RaNaN@pyload.org", "spoob@pyload.org")
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+                       ("spoob", "spoob@pyload.org")]
 
 
     def decrypt(self, pyfile):
 
         from Crypto.Cipher import AES
 
-        infile = pyfile.url.replace("\n", "")
+        infile = fs_encode(pyfile.url.replace("\n", ""))
         Key = binascii.unhexlify('8C35192D964DC3182C6F84F3252239EB4A320D2500000000')
 
         IV = binascii.unhexlify('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF')
@@ -31,10 +33,11 @@ class RSDF(Container):
 
         obj = AES.new(Key, AES.MODE_CFB, IV)
 
-        rsdf = open(infile, 'r')
-
-        data = rsdf.read()
-        rsdf.close()
+        try:
+            with open(infile, 'r') as rsdf:
+                data = rsdf.read()
+        except IOError, e:
+            self.fail(str(e))
 
         if re.search(r"<title>404 - Not Found</title>", data) is None:
             data = binascii.unhexlify(''.join(data.split()))
@@ -48,4 +51,4 @@ class RSDF(Container):
                 decryptedUrl = link.replace('CCF: ', '')
                 self.urls.append(decryptedUrl)
 
-            self.log.debug("%s: adding package %s with %d links" % (self.__name__,pyfile.package().name,len(links)))
+            self.logDebug("Adding package %s with %d links" % (pyfile.package().name, len(self.urls)))