summaryrefslogtreecommitdiffstats
path: root/net/tools
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-26 07:10:41 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-26 07:10:41 +0000
commit51884be87e59c8b416d5e0557f6061c6aea5eac0 (patch)
tree8ab4a741f1ecb70fa5a10572d8744df91e8ab0d5 /net/tools
parentf31a93fab3a781d0c78163fde7018a6bfcd53e6c (diff)
downloadchromium_src-51884be87e59c8b416d5e0557f6061c6aea5eac0.zip
chromium_src-51884be87e59c8b416d5e0557f6061c6aea5eac0.tar.gz
chromium_src-51884be87e59c8b416d5e0557f6061c6aea5eac0.tar.bz2
Added simplejson import line to testserver.py.
This is split off from 5196001 (to try to narrow down the test failures on XP). BUG=53934 TEST=manually TBR=cbentzel Review URL: http://codereview.chromium.org/5330008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67435 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
-rwxr-xr-xnet/tools/testserver/testserver.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py
index 2551139..0dbe4c4 100755
--- a/net/tools/testserver/testserver.py
+++ b/net/tools/testserver/testserver.py
@@ -20,6 +20,7 @@ import optparse
import os
import re
import shutil
+import simplejson
import SocketServer
import sys
import struct