Author: chrisz
Date: Tue Jan 11 07:28:39 2011
New Revision: 7198
URL: http://trac.turbogears.org/changeset/7198
Log:
Disable tools.encode since otherwise CherryPy 3.2 will try to encode the
already encoded output.
Modified:
branches/1.5/turbogears/startup.py
Modified: branches/1.5/turbogears/startup.py
==============================================================================
--- branches/1.5/turbogears/startup.py Wed Dec 22 07:36:15 2010 (r7197)
+++ branches/1.5/turbogears/startup.py Tue Jan 11 07:28:39 2011 (r7198)
@@ -106,10 +106,13 @@
def config_root():
"""Configure the encoding and virtual path for the root controller."""
global webpath
+ encoding = config.get(' genshi.default_encoding ',
+ config.get('kid.encoding', 'utf-8'))
config.update({'/': {
'tools.decode.on': True,
- 'tools.decode.encoding': config.get(' genshi.default_encoding ',
- config.get('kid.encoding', 'utf-8'))}})
+ 'tools.decode.encoding': encoding,
+ 'tools.encode.on': False,
+ 'tools.encode.encoding': encoding}})
webpath = config.get('server.webpath') or ''
webpath = webpath.lstrip('/')
if webpath and not webpath.endswith('/'):
