diff options
| author | isaacs <i@izs.me> | 2013-01-18 12:58:16 -0800 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2013-01-18 12:58:16 -0800 |
| commit | 3d7818fc42c5f9af2aeccf9d75ad6a2372179f28 (patch) | |
| tree | dc768380326c509df5d90616bdfcbfb6d22b6264 /tools | |
| parent | fc3547bc828dfcaca83e9c4415743fb201a821f6 (diff) | |
| parent | 9c2c84546347df599840aceb59605b4b6d38a549 (diff) | |
| download | nodejs-3d7818fc42c5f9af2aeccf9d75ad6a2372179f28.tar.gz nodejs-3d7818fc42c5f9af2aeccf9d75ad6a2372179f28.tar.bz2 nodejs-3d7818fc42c5f9af2aeccf9d75ad6a2372179f28.zip | |
Merge remote-tracking branch 'ry/v0.8' into master
Conflicts:
AUTHORS
ChangeLog
src/node_version.h
test/simple/test-buffer.js
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/install.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/install.py b/tools/install.py index d82d9ea84..c8ad828c1 100755 --- a/tools/install.py +++ b/tools/install.py @@ -1,7 +1,12 @@ #!/usr/bin/env python import errno -import json + +try: + import json +except ImportError: + import simplejson as json + import os import re import shutil |