diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-14 00:38:18 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-14 00:38:18 +0000 |
| commit | 393b33ca415c99ff5b0c6b42ccfecda5bb13b7e9 (patch) | |
| tree | 9f6f8043c1517fad79c1721d3abf2748db809b69 /net/tools | |
| parent | 0a3c8c6212810e3e386255efa38618bf2f1f61dd (diff) | |
| download | chromium_src-393b33ca415c99ff5b0c6b42ccfecda5bb13b7e9.zip chromium_src-393b33ca415c99ff5b0c6b42ccfecda5bb13b7e9.tar.gz chromium_src-393b33ca415c99ff5b0c6b42ccfecda5bb13b7e9.tar.bz2 | |
move to json, make work w/ a python2.6 that doesn't have simplejson installed
R=jar@chromium.org, maruel@chromium.org
BUG=none
TEST=unit tests still pass
Review URL: http://codereview.chromium.org/8253011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105425 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
| -rwxr-xr-x | net/tools/testserver/testserver.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py index 4147004..4e27482 100755 --- a/net/tools/testserver/testserver.py +++ b/net/tools/testserver/testserver.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.4 +#!/usr/bin/env python # Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -23,7 +23,6 @@ import os import random import re import select -import simplejson import SocketServer import socket import sys @@ -48,6 +47,11 @@ except ImportError: import md5 _new_md5 = md5.new +try: + import json +except ImportError: + import simplejson as json + if sys.platform == 'win32': import msvcrt @@ -1825,7 +1829,7 @@ def main(options, args): # Notify the parent that we've started. (BaseServer subclasses # bind their sockets on construction.) if options.startup_pipe is not None: - server_data_json = simplejson.dumps(server_data) + server_data_json = json.dumps(server_data) server_data_len = len(server_data_json) print 'sending server_data: %s (%d bytes)' % ( server_data_json, server_data_len) |