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

Merge pull request #1649 from ilvalle/fix_globals

Browse Source 
fix Pickler.dispatch_table
This commit is contained in:
mdipierro
2017-06-15 04:01:14 -05:00
committed by GitHub
parent c117e3d1b9 2ea5939640
commit 566feb79d4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/globals.py
+3 -3
View File
@@ -89,10 +89,11 @@ class SortingPickler(Pickler):
self._batch_setitems([(key, obj[key]) for key in sorted(obj)]) self._batch_setitems([(key, obj[key]) for key in sorted(obj)])
if PY2: if PY2:
#FIXME PY3
SortingPickler.dispatch = copy.copy(Pickler.dispatch) SortingPickler.dispatch = copy.copy(Pickler.dispatch)
SortingPickler.dispatch[dict] = SortingPickler.save_dict SortingPickler.dispatch[dict] = SortingPickler.save_dict
else:
SortingPickler.dispatch_table = copyreg.dispatch_table.copy()
SortingPickler.dispatch_table[dict] = SortingPickler.save_dict
def sorting_dumps(obj, protocol=None): def sorting_dumps(obj, protocol=None):
file = StringIO() file = StringIO()
@@ -415,7 +416,6 @@ class Response(Storage):
if not escape: if not escape:
self.body.write(str(data)) self.body.write(str(data))
else: else:
# FIXME PY3:
self.body.write(to_native(xmlescape(data))) self.body.write(to_native(xmlescape(data)))
def render(self, *a, **b): def render(self, *a, **b):