From 2850a98275b1397c511973e207a16ea704ffb18f Mon Sep 17 00:00:00 2001 From: Jie Luo Date: Fri, 9 Oct 2015 17:07:03 -0700 Subject: fix json_format for python2.6: 1, objcect_pair_hook is not supported in python2.6, so duplicated key check is removed in 2.6 2, total_seconds is not suppoted in python2.6, changed to compute seconds directly --- python/tox.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'python/tox.ini') diff --git a/python/tox.ini b/python/tox.ini index 1c433fa2..a6352ef4 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -2,8 +2,7 @@ envlist = # cpp implementation on py34 is currently broken due to # changes introduced by http://bugs.python.org/issue22079. - # py26 is currently broken due to the json_format - py{27,33,34}-{cpp,python} + py{26,27,33,34}-{cpp,python} [testenv] usedevelop=true -- cgit v1.2.3