From d8297dfd3f1c4df30e76b8ab595c59ff900c966e Mon Sep 17 00:00:00 2001 From: James Vega Date: Sun, 22 Mar 2009 14:58:25 -0400 Subject: [PATCH] Google: Modify our local simplejson to work pre-Python2.6 Signed-off-by: James Vega --- plugins/Google/local/simplejson/decoder.py | 4 ++-- plugins/Google/local/simplejson/encoder.py | 4 ++-- plugins/Google/local/simplejson/scanner.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/Google/local/simplejson/decoder.py b/plugins/Google/local/simplejson/decoder.py index b769ea486..811e73347 100644 --- a/plugins/Google/local/simplejson/decoder.py +++ b/plugins/Google/local/simplejson/decoder.py @@ -4,9 +4,9 @@ import re import sys import struct -from simplejson.scanner import make_scanner +from scanner import make_scanner try: - from simplejson._speedups import scanstring as c_scanstring + from _speedups import scanstring as c_scanstring except ImportError: c_scanstring = None diff --git a/plugins/Google/local/simplejson/encoder.py b/plugins/Google/local/simplejson/encoder.py index cf5829036..afff9e825 100644 --- a/plugins/Google/local/simplejson/encoder.py +++ b/plugins/Google/local/simplejson/encoder.py @@ -3,11 +3,11 @@ import re try: - from simplejson._speedups import encode_basestring_ascii as c_encode_basestring_ascii + from _speedups import encode_basestring_ascii as c_encode_basestring_ascii except ImportError: c_encode_basestring_ascii = None try: - from simplejson._speedups import make_encoder as c_make_encoder + from _speedups import make_encoder as c_make_encoder except ImportError: c_make_encoder = None diff --git a/plugins/Google/local/simplejson/scanner.py b/plugins/Google/local/simplejson/scanner.py index adbc6ec97..c70629ff4 100644 --- a/plugins/Google/local/simplejson/scanner.py +++ b/plugins/Google/local/simplejson/scanner.py @@ -2,7 +2,7 @@ """ import re try: - from simplejson._speedups import make_scanner as c_make_scanner + from _speedups import make_scanner as c_make_scanner except ImportError: c_make_scanner = None