| commit | acccf3e5efc39e82aa93108795ae912de2f32fe9 | [log] [tgz] |
|---|---|---|
| author | Cheng Tang <cheng.tang@supwisdom.com> | 周三 2月 27 09:58:30 2013 +0800 |
| committer | Cheng Tang <cheng.tang@supwisdom.com> | 周三 2月 27 09:58:30 2013 +0800 |
| tree | 2963bca6c4db77cc3fd9530254b4270f6113ab09 | |
| parent | d524c152d1d90a326f4f6893ee4fc00b44938dd8 [diff] | |
| parent | d7538e53903c50dab95ac5ee56f56162ec1559a3 [diff] |
Merge branch 'master' of git.ecard:00master/commons/swtools
diff --git a/supwisdom/protocol/nettrans.py b/supwisdom/protocol/nettrans.py index 6c651f3..35c9619 100644 --- a/supwisdom/protocol/nettrans.py +++ b/supwisdom/protocol/nettrans.py
@@ -3,7 +3,10 @@ 所有数据都是 unicode utf-8 编码 """ import traceback -import simplejson as json +try: + import json +except ImportError: + import simplejson as json """ 后台服务的字符编码