upgraded simplejson
This commit is contained in:
mdipierro
@@ -1,4 +1,4 @@
|
|||||||
## 2.9.6 - 2.9.8
|
## 2.9.6 - 2.9.10
|
||||||
|
|
||||||
- fixed support of GAE + SQL
|
- fixed support of GAE + SQL
|
||||||
- fixed a typo in the license of some login_methods code. It is now LGPL consistently with the rest of the web2py code. This change applied to all previous web2py versions.
|
- fixed a typo in the license of some login_methods code. It is now LGPL consistently with the rest of the web2py code. This change applied to all previous web2py versions.
|
||||||
@@ -6,7 +6,7 @@
|
|||||||
- Sphinx documentation (thanks Niphlod)
|
- Sphinx documentation (thanks Niphlod)
|
||||||
- improved scheduler (thanks Niphlod)
|
- improved scheduler (thanks Niphlod)
|
||||||
- increased security
|
- increased security
|
||||||
- better cache.dick (thanks Leonel)
|
- better cache.disk (thanks Leonel)
|
||||||
- sessions are stored in subfolders for speed
|
- sessions are stored in subfolders for speed
|
||||||
- postgres support for "INSERT ... RETURING ..."
|
- postgres support for "INSERT ... RETURING ..."
|
||||||
- ldap support for Certificate Authority (thanks Maggs and Shane)
|
- ldap support for Certificate Authority (thanks Maggs and Shane)
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
Version 2.9.9-stable+timestamp.2014.09.14.16.01.43
|
Version 2.9.9-stable+timestamp.2014.09.14.16.37.05
|
||||||
|
|||||||
+4
-5
File diff suppressed because one or more lines are too long
+4
-5
File diff suppressed because one or more lines are too long
+4
-4
File diff suppressed because one or more lines are too long
@@ -121,7 +121,6 @@ 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:
|
||||||
@@ -411,7 +410,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:
|
||||||
@@ -437,4 +436,3 @@ def _toggle_speedups(enabled):
|
|||||||
encoding='utf-8',
|
encoding='utf-8',
|
||||||
default=None,
|
default=None,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ 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:
|
||||||
@@ -420,4 +419,3 @@ 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
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ 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:
|
||||||
@@ -500,4 +499,3 @@ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr,
|
|||||||
del markers[markerid]
|
del markers[markerid]
|
||||||
|
|
||||||
return _iterencode
|
return _iterencode
|
||||||
|
|
||||||
|
|||||||
@@ -117,4 +117,3 @@ class OrderedDict(dict, DictMixin):
|
|||||||
|
|
||||||
def __ne__(self, other):
|
def __ne__(self, other):
|
||||||
return not self == other
|
return not self == other
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
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:
|
||||||
@@ -76,4 +75,3 @@ 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
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user