Replace some ujson with simplejson to make it work
							parent
							
								
									3bc5bd2d22
								
							
						
					
					
						commit
						bf49d2dca8
					
				| 
						 | 
				
			
			@ -38,6 +38,7 @@ import collections
 | 
			
		|||
import logging
 | 
			
		||||
import urllib
 | 
			
		||||
import ujson
 | 
			
		||||
import simplejson
 | 
			
		||||
 | 
			
		||||
logger = logging.getLogger(__name__)
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -462,7 +463,7 @@ def respond_with_json(request, code, json_object, send_cors=False,
 | 
			
		|||
            json_bytes = encode_canonical_json(json_object)
 | 
			
		||||
        else:
 | 
			
		||||
            # ujson doesn't like frozen_dicts.
 | 
			
		||||
            json_bytes = ujson.dumps(json_object, ensure_ascii=False)
 | 
			
		||||
            json_bytes = simplejson.dumps(json_object)
 | 
			
		||||
 | 
			
		||||
    return respond_with_json_bytes(
 | 
			
		||||
        request, code, json_bytes,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -33,7 +33,7 @@ from ._base import set_timeline_upper_limit
 | 
			
		|||
import itertools
 | 
			
		||||
import logging
 | 
			
		||||
 | 
			
		||||
import ujson as json
 | 
			
		||||
import simplejson as json
 | 
			
		||||
 | 
			
		||||
logger = logging.getLogger(__name__)
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -38,7 +38,7 @@ from functools import wraps
 | 
			
		|||
import synapse.metrics
 | 
			
		||||
 | 
			
		||||
import logging
 | 
			
		||||
import ujson as json
 | 
			
		||||
import simplejson as json
 | 
			
		||||
 | 
			
		||||
# these are only included to make the type annotations work
 | 
			
		||||
from synapse.events import EventBase    # noqa: F401
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -28,7 +28,7 @@ from synapse.api.errors import SynapseError
 | 
			
		|||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
import logging
 | 
			
		||||
import ujson as json
 | 
			
		||||
import simplejson as json
 | 
			
		||||
 | 
			
		||||
# these are only included to make the type annotations work
 | 
			
		||||
from synapse.events import EventBase    # noqa: F401
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue