# HG changeset patch # User Fredrik Lundh # Date 1267228236 -3600 # Node ID 0eaae9ab339ca654bd12e8e99593ebd34f2cc7d1 # Parent 52189358c0eca617f19272aff3cbe484a3204d0c Use fast UTF-8 code path also for "utf8" diff -r 52189358c0eca617f19272aff3cbe484a3204d0c -r 0eaae9ab339ca654bd12e8e99593ebd34f2cc7d1 cjson.c --- a/cjson.c Sun Nov 08 17:18:06 2009 +0100 +++ b/cjson.c Sat Feb 27 00:50:36 2010 +0100 @@ -1261,7 +1261,7 @@ encode.encoding = LATIN1; break; case 'u': - if (strcmp(encoding, "utf-8") == 0) + if (strcmp(encoding, "utf-8") == 0 || strcmp(encoding, "utf8") == 0) encode.encoding = UTF8; else if (strcmp(encoding, "us-ascii") == 0) encode.encoding = LATIN1; diff -r 52189358c0eca617f19272aff3cbe484a3204d0c -r 0eaae9ab339ca654bd12e8e99593ebd34f2cc7d1 test_encoding.py --- a/test_encoding.py Sun Nov 08 17:18:06 2009 +0100 +++ b/test_encoding.py Sat Feb 27 00:50:36 2010 +0100 @@ -18,6 +18,10 @@ print cjson.encode([campus]) print cjson.encode([campus_utf8]) +sys.setdefaultencoding("utf8") +print cjson.encode([campus]) +print cjson.encode([campus_utf8]) + sys.setdefaultencoding("utf-8") print cjson.encode([campus]) print cjson.encode([campus_utf8])