[svn] fixed various borkenness with the default_charset deprecation w…

…arnings

--HG--
branch : trunk

pylons/config.py

@@ -5,6 +5,7 @@
 """
 import os
 import re
+import warnings
 
 from paste.deploy.converters import asbool
 
@@ -105,7 +106,7 @@ def __init__(self, tmpl_options=None, map=None, paths=None,
 
         if default_charset is not None:
             warnings.warn(pylons.legacy.default_charset_warning % \
-                              ('Config', default_charset),
+                              dict(klass='Config', charset=default_charset),
                           DeprecationWarning, 2)
             self.response_settings['charset'] = default_charset
 

pylons/legacy.py

@@ -6,12 +6,13 @@
 
 import pylons
 
-default_charset_warning = \
-"The 'default_charset' keyword argument to the %s constructor is deprecated. "
-"Please specify response_settings=dict(charset='%s') to the Config object in "
-"your 'config/environment.py file instead, e.g.:\n"
-"return pylons.config.Config(myghty, map, paths,"
-"                            response_settings=dict(charset='%s'))"
+default_charset_warning = (
+"The 'default_charset' keyword argument to the %(klass)s constructor is "
+"deprecated. Please specify response_settings=dict(charset='%(charset)s') to "
+"""the Config constructor in your 'config/environment.py file instead, e.g.:\n
+    return pylons.config.Config(tmpl_options, map, paths,
+                                response_settings=dict(charset='%(charset)s'))"
+""")
 
 
 def load_h(package_name):

pylons/wsgiapp.py

@@ -209,9 +209,9 @@ def __init__(self, config, default_charset=None, helpers=None, g=None,
         self.config = config
         if default_charset:
             warnings.warn(pylons.legacy.default_charset_warning % \
-                              ('PylonsApp', default_charset),
+                              dict(klass='PylonsApp', charset=default_charset),
                           DeprecationWarning, 2)
-            self.config.request_settings['charset'] = default_charset
+            self.config.response_settings['charset'] = default_charset
 
         if helpers is None or g is None:
             warnings.warn(