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

upgraded simplejson

Browse Source
This commit is contained in:
mdipierro
2014-09-14 16:37:09 -05:00
parent e38565345c
commit 0120ad5b95
10 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+2 -2
View File
@@ -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)
VERSION
+1 -1
View File
@@ -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
applications/admin/static/js/jquery.js
Vendored
+4 -5
View File
File diff suppressed because one or more lines are too long
applications/examples/static/js/jquery.js
Vendored
+4 -5
View File
File diff suppressed because one or more lines are too long
applications/welcome/static/js/jquery.js
Vendored
+4 -4
View File
File diff suppressed because one or more lines are too long
gluon/contrib/simplejson/__init__.py
-2
View File
@@ -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:
@@ -437,4 +436,3 @@ def _toggle_speedups(enabled):
encoding='utf-8', encoding='utf-8',
default=None, default=None,
) )
gluon/contrib/simplejson/decoder.py
-2
View File
@@ -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
gluon/contrib/simplejson/encoder.py
-2
View File
@@ -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
gluon/contrib/simplejson/ordered_dict.py
-1
View File
@@ -117,4 +117,3 @@ 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,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