Changeset 4789

Show
Ignore:
Timestamp:
06/20/08 04:52:23 (5 months ago)
Author:
chrisz
Message:

Support json.encoding (output encoding for TurboJSON).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/1.0/turbogears/view/base.py

    r4726 r4789  
    388388        "json.separators": get("json.separators", None), 
    389389        "json.ensure_ascii": get("json.ensure_ascii", False), 
     390        "json.encoding": get("json.encoding", "utf-8"), 
    390391        "json.assume_encoding": get("json.assume_encoding", "utf-8"), 
    391392        "kid.encoding": get("kid.encoding", "utf-8"), 
  • branches/1.1/turbogears/view/base.py

    r4726 r4789  
    401401        "json.separators": get("json.separators", None), 
    402402        "json.ensure_ascii": get("json.ensure_ascii", False), 
     403        "json.encoding": get("json.encoding", "utf-8"), 
    403404        "json.assume_encoding": get("json.assume_encoding", "utf-8"), 
    404405        "kid.encoding": get("kid.encoding", "utf-8"),