4 files changed, 28 insertions, 24 deletions

diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py
index 235d5dc1d..3126d69a5 100644
--- a/module/plugins/container/CCF.py
+++ b/module/plugins/container/CCF.py
@@ -6,14 +6,15 @@ import MultipartPostHandler
 import re
 import urllib2
 
-from module.plugins.Container import Container
-from module.utils import fs_encode, save_join
+from module.plugins.internal.Container import Container
+from module.utils import fs_encode, save_join as fs_join
 
 
 class CCF(Container):
     __name__    = "CCF"
     __type__    = "container"
-    __version__ = "0.23"
+    __version__ = "0.25"
+    __status__  = "testing"
 
     __pattern__ = r'.+\.ccf$'
 
@@ -32,8 +33,8 @@ class CCF(Container):
                                    'filename': "test.ccf",
                                    'upload'  : open(fs_filename, "rb")}).read()
 
-        download_folder = self.config['general']['download_folder']
-        dlc_file        = save_join(download_folder, "tmp_%s.dlc" % pyfile.name)
+        download_folder = self.pyload.config.get("general", "download_folder")
+        dlc_file        = fs_join(download_folder, "tmp_%s.dlc" % pyfile.name)
 
         try:
             dlc = re.search(r'<dlc>(.+)</dlc>', dlc_content, re.S).group(1).decode('base64')
diff --git a/module/plugins/container/DLC.py b/module/plugins/container/DLC.py
index ff2f0104a..145322942 100644
--- a/module/plugins/container/DLC.py
+++ b/module/plugins/container/DLC.py
@@ -7,14 +7,15 @@ import xml.dom.minidom
 
 from Crypto.Cipher import AES
 
-from module.plugins.Container import Container
+from module.plugins.internal.Container import Container
 from module.utils import decode, fs_encode
 
 
 class DLC(Container):
     __name__    = "DLC"
     __type__    = "container"
-    __version__ = "0.24"
+    __version__ = "0.26"
+    __status__  = "testing"
 
     __pattern__ = r'.+\.dlc$'
 
@@ -53,20 +54,20 @@ class DLC(Container):
 
         self.data     = AES.new(key, AES.MODE_CBC, iv).decrypt(dlc_data).decode('base64')
         self.packages = [(name or pyfile.name, links, name or pyfile.name) \
-                         for name, links in self.getPackages()]
+                         for name, links in self.get_packages()]
 
 
-    def getPackages(self):
+    def get_packages(self):
         root    = xml.dom.minidom.parseString(self.data).documentElement
         content = root.getElementsByTagName("content")[0]
-        return self.parsePackages(content)
+        return self.parse_packages(content)
 
 
-    def parsePackages(self, startNode):
-        return [(decode(node.getAttribute("name")).decode('base64'), self.parseLinks(node)) \
+    def parse_packages(self, startNode):
+        return [(decode(node.getAttribute("name")).decode('base64'), self.parse_links(node)) \
                 for node in startNode.getElementsByTagName("package")]
 
 
-    def parseLinks(self, startNode):
+    def parse_links(self, startNode):
         return [node.getElementsByTagName("url")[0].firstChild.data.decode('base64') \
                 for node in startNode.getElementsByTagName("file")]
diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py
index dd2d14cf7..cedb2b605 100644
--- a/module/plugins/container/RSDF.py
+++ b/module/plugins/container/RSDF.py
@@ -7,14 +7,15 @@ import re
 
 from Crypto.Cipher import AES
 
-from module.plugins.Container import Container
+from module.plugins.internal.Container import Container
 from module.utils import fs_encode
 
 
 class RSDF(Container):
     __name__    = "RSDF"
     __type__    = "container"
-    __version__ = "0.29"
+    __version__ = "0.31"
+    __status__  = "testing"
 
     __pattern__ = r'.+\.rsdf$'
 
diff --git a/module/plugins/container/TXT.py b/module/plugins/container/TXT.py
index d419ee060..8c9f99c27 100644
--- a/module/plugins/container/TXT.py
+++ b/module/plugins/container/TXT.py
@@ -2,14 +2,15 @@
 
 import codecs
 
-from module.plugins.Container import Container
+from module.plugins.internal.Container import Container
 from module.utils import fs_encode
 
 
 class TXT(Container):
     __name__    = "TXT"
     __type__    = "container"
-    __version__ = "0.15"
+    __version__ = "0.17"
+    __status__  = "testing"
 
     __pattern__ = r'.+\.(txt|text)$'
     __config__  = [("flush"   , "bool"  , "Flush list after adding", False  ),
@@ -23,7 +24,7 @@ class TXT(Container):
 
     def decrypt(self, pyfile):
         try:
-            encoding = codecs.lookup(self.getConfig('encoding')).name
+            encoding = codecs.lookup(self.get_config('encoding')).name
 
         except Exception:
             encoding = "utf-8"
@@ -43,7 +44,7 @@ class TXT(Container):
                 continue
 
             if link.startswith("[") and link.endswith("]"):
-                # new package
+                #: New package
                 curPack = link[1:-1]
                 packages[curPack] = []
                 continue
@@ -52,18 +53,18 @@ class TXT(Container):
 
         txt.close()
 
-        # empty packages fix
-        for key, value in packages.iteritems():
+        #: Empty packages fix
+        for key, value in packages.items():
             if not value:
                 packages.pop(key, None)
 
-        if self.getConfig('flush'):
+        if self.get_config('flush'):
             try:
                 txt = open(fs_filename, 'wb')
                 txt.close()
 
             except IOError:
-                self.logWarning(_("Failed to flush list"))
+                self.log_warning(_("Failed to flush list"))
 
-        for name, links in packages.iteritems():
+        for name, links in packages.items():
             self.packages.append((name, links, name))