diff options
| author | erikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-27 19:15:16 +0000 |
|---|---|---|
| committer | erikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-27 19:15:16 +0000 |
| commit | 691519839a22b371f53b4f7b2b7c6e553c252591 (patch) | |
| tree | 3c6980a23eefde54c4818de2c7d90590149528fe /chrome/tools | |
| parent | cecc80a3e4eff12b20ce8c68b8857e4596a62ec9 (diff) | |
| download | chromium_src-691519839a22b371f53b4f7b2b7c6e553c252591.zip chromium_src-691519839a22b371f53b4f7b2b7c6e553c252591.tar.gz chromium_src-691519839a22b371f53b4f7b2b7c6e553c252591.tar.bz2 | |
Fix script to support python 2.6, which has json module built in.
Review URL: http://codereview.chromium.org/27278
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10618 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
| -rwxr-xr-x | chrome/tools/extensions/chromium_extension.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/tools/extensions/chromium_extension.py b/chrome/tools/extensions/chromium_extension.py index de5d3bf..4431b34 100755 --- a/chrome/tools/extensions/chromium_extension.py +++ b/chrome/tools/extensions/chromium_extension.py @@ -12,10 +12,15 @@ import optparse import os import re import shutil -import simplejson as json import sys import zipfile +if sys.version_info < (2, 6): + import simplejson as json +else: + import json + + ignore_dirs = [".svn", "CVS"] ignore_files = [re.compile(".*~")] |