Changeset 1483

Timestamp:

03/12/08 14:48:09 (2 years ago)

Author:

JensDiemer

Message:

-use "from django.conf import settings" instead of "from PyLucid import settings"
-use settings.FILE_CHARSET directly

Files:

• trunk/pylucid/PyLucid/plugins_internal/filemanager/filemanager.py (modified) (5 diffs)

trunk/pylucid/PyLucid/plugins_internal/filemanager/filemanager.py

@@ -50 +50 @@
 from datetime import datetime
 
+from django.conf import settings
 from django.http import Http404
 from django import newforms as forms
@@ -55 +56 @@
 from django.utils.translation import ugettext as _
 
-from PyLucid import settings
 from PyLucid.models import Page
 from PyLucid.system.BasePlugin import PyLucidBasePlugin
 
-FILE_CHARSET = getattr(settings, "FILE_CHARSET", "UTF-8")
 
 #______________________________________________________________________________
@@ -458 +457 @@
             content = f.read()
             f.close()
-            content = content.decode(FILE_CHARSET)
+            content = content.decode(settings.FILE_CHARSET)
         except Exception, e:
             self.page_msg.red("Error, reading file:", e)
@@ -476 +475 @@
                 abs_file_path = os.path.join(self.path["abs_path"], filename)
                 try:
-                    content = content.encode(FILE_CHARSET)
+                    content = content.encode(settings.FILE_CHARSET)
                     f = file(abs_file_path, "w")
                     f.write(content)
@@ -509 +508 @@
             "filename": self.path["filename"],
             "form": form,
-            "charset": FILE_CHARSET,
+            "charset": settings.FILE_CHARSET,
         }
         self._render_template("edit_file", context)#, debug=True)