diff options
| author |  Jie Luo <jieluo@jieluo-macbookair.roam.corp.google.com> | 2015-10-09 17:07:03 -0700 |
|---|---|---|
| committer |  Jie Luo <jieluo@google.com> | 2015-10-19 16:25:54 -0700 |
| commit | 2850a98275b1397c511973e207a16ea704ffb18f (patch) | |
| tree | 0ab2a62841f28774a39f9a240185952b3caf0eea /python/tox.ini | |
| parent | 49f24afb45b7add17af3ed4493fa0a94d1cc64da (diff) | |
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
Diffstat (limited to 'python/tox.ini')
| -rw-r--r-- | python/tox.ini | 3 |
1 files changed, 1 insertions, 2 deletions
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 |