# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1224967020 -7200
# Node ID 9d3f4c58187bd599870a9a4ad445f6dfc0dccb36
# Parent  4626e4174edfef423209b5b5cbf00c0f7fcfac57
Removed default encoding and path_encoding attributes from XSLFormsResource.

diff -r 4626e4174edf -r 9d3f4c58187b README.txt
--- a/README.txt	Sun Oct 12 19:47:09 2008 +0200
+++ b/README.txt	Sat Oct 25 22:37:00 2008 +0200
@@ -72,6 +72,9 @@
   * Added XInclude support in templates (requires libxml2dom 0.4.6 or later).
   * Removed PyQt support since the advantages of designing user interfaces for
     the Web using Qt Designer are questionable.
+  * Removed default encoding and path_encoding attributes from the
+    XSLFormsResource class, since the default response encoding should be used
+    instead or set using WebStack's EncodingSelector.
 
 New in XSLTools 0.5 (Changes since XSLTools 0.4.6)
 --------------------------------------------------
diff -r 4626e4174edf -r 9d3f4c58187b XSLForms/Resources/WebResources.py
--- a/XSLForms/Resources/WebResources.py	Sun Oct 12 19:47:09 2008 +0200
+++ b/XSLForms/Resources/WebResources.py	Sat Oct 25 22:37:00 2008 +0200
@@ -104,8 +104,9 @@
                                 not be overridden)
     """
 
-    path_encoding = "utf-8"
-    encoding = "utf-8"
+    #path_encoding = "utf-8"
+    #encoding = "utf-8"
+
     template_resources = {}
     in_page_resources = {}
     init_resources = {}
@@ -432,7 +433,13 @@
 
         # Start the response.
 
-        encoding = attributes.get("encoding") or self.encoding or trans.default_charset
+        if attributes.has_key("encoding"):
+            encoding = attributes["encoding"] # NOTE: Potentially redundant.
+        elif hasattr(self, "encoding"):
+            encoding = self.encoding
+        else:
+            encoding = trans.default_charset
+
         content_type = content_type or WebStack.Generic.ContentType("application/xhtml+xml", encoding)
         trans.set_content_type(content_type)