Merge pull request #1 from pyload/stable

sync with stable

1 files changed, 6 insertions, 5 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')