dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverted simplejson

Browse Source
This commit is contained in:
mdipierro
2014-09-15 18:30:37 -05:00
parent 2b50cf27e2
commit df234fa252
7 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -30,7 +30,7 @@ update:
echo "remember that pymysql was tweaked" echo "remember that pymysql was tweaked"
src: src:
### Use semantic versioning ### Use semantic versioning
echo 'Version 2.9.10-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION echo 'Version 2.9.11-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
### rm -f all junk files ### rm -f all junk files
make clean make clean
### clean up baisc apps ### clean up baisc apps
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.9.10-stable+timestamp.2014.09.15.08.05.10 Version 2.9.11-stable+timestamp.2014.09.15.18.30.31
gluon/contrib/simplejson/__init__.py
+3 -1
View File
@@ -121,6 +121,7 @@ OrderedDict = _import_OrderedDict()
def _import_c_make_encoder(): def _import_c_make_encoder():
try: try:
raise ImportError # because assumes simplejson in path
from simplejson._speedups import make_encoder from simplejson._speedups import make_encoder
return make_encoder return make_encoder
except ImportError: except ImportError:
@@ -410,7 +411,7 @@ def _toggle_speedups(enabled):
if enabled: if enabled:
dec.scanstring = dec.c_scanstring or dec.py_scanstring dec.scanstring = dec.c_scanstring or dec.py_scanstring
enc.c_make_encoder = c_make_encoder enc.c_make_encoder = c_make_encoder
enc.encode_basestring_ascii = (enc.c_encode_basestring_ascii or enc.encode_basestring_ascii = (enc.c_encode_basestring_ascii or
enc.py_encode_basestring_ascii) enc.py_encode_basestring_ascii)
scan.make_scanner = scan.c_make_scanner or scan.py_make_scanner scan.make_scanner = scan.c_make_scanner or scan.py_make_scanner
else: else:
@@ -436,3 +437,4 @@ def _toggle_speedups(enabled):
encoding='utf-8', encoding='utf-8',
default=None, default=None,
) )
gluon/contrib/simplejson/decoder.py
+2
View File
@@ -7,6 +7,7 @@ import struct
from scanner import make_scanner from scanner import make_scanner
def _import_c_scanstring(): def _import_c_scanstring():
try: try:
raise ImportError # because assumes simplejson in path
from simplejson._speedups import scanstring from simplejson._speedups import scanstring
return scanstring return scanstring
except ImportError: except ImportError:
@@ -419,3 +420,4 @@ class JSONDecoder(object):
except StopIteration: except StopIteration:
raise JSONDecodeError("No JSON object could be decoded", s, idx) raise JSONDecodeError("No JSON object could be decoded", s, idx)
return obj, end return obj, end
gluon/contrib/simplejson/encoder.py
+2
View File
@@ -5,6 +5,7 @@ from decimal import Decimal
def _import_speedups(): def _import_speedups():
try: try:
raise ImportError # because assumes simplejson in path
from simplejson import _speedups from simplejson import _speedups
return _speedups.encode_basestring_ascii, _speedups.make_encoder return _speedups.encode_basestring_ascii, _speedups.make_encoder
except ImportError: except ImportError:
@@ -499,3 +500,4 @@ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr,
del markers[markerid] del markers[markerid]
return _iterencode return _iterencode
gluon/contrib/simplejson/ordered_dict.py
+1
View File
@@ -117,3 +117,4 @@ class OrderedDict(dict, DictMixin):
def __ne__(self, other): def __ne__(self, other):
return not self == other return not self == other
gluon/contrib/simplejson/scanner.py
+2
View File
@@ -3,6 +3,7 @@
import re import re
def _import_c_make_scanner(): def _import_c_make_scanner():
try: try:
raise ImportError # because assumes simplejson in path
from simplejson._speedups import make_scanner from simplejson._speedups import make_scanner
return make_scanner return make_scanner
except ImportError: except ImportError:
@@ -75,3 +76,4 @@ def py_make_scanner(context):
return scan_once return scan_once
make_scanner = c_make_scanner or py_make_scanner make_scanner = c_make_scanner or py_make_scanner