fix chinese problem
learn python ddt
Merge branch 'master' of https://github.com/huntinux/python

Conflicts:
	json/chj/pretty_print_json.py