From d15809c3cd6a4dee45af556b4d3c883628068fe9 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Mon, 21 May 2007 23:26:36 +0000 Subject: [PATCH] Removed some cruft left over from fixing problems in the move to DecimalField ([5302]). git-svn-id: http://code.djangoproject.com/svn/django/trunk@5311 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/serializers/json.py | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/django/core/serializers/json.py b/django/core/serializers/json.py index 20adce798d..55804b8316 100644 --- a/django/core/serializers/json.py +++ b/django/core/serializers/json.py @@ -35,7 +35,6 @@ def Deserializer(stream_or_string, **options): stream = StringIO(stream_or_string) else: stream = stream_or_string - #for obj in PythonDeserializer(simplejson.load(stream, cls=DjangoJSONDecoder)): for obj in PythonDeserializer(simplejson.load(stream)): yield obj @@ -62,25 +61,3 @@ class DjangoJSONEncoder(simplejson.JSONEncoder): # Older, deprecated class name (for backwards compatibility purposes). DateTimeAwareJSONEncoder = DjangoJSONEncoder -## Our override for simplejson.JSONNumber, because we want to use decimals in -## preference to floats (we can convert decimal -> float when they stored, if -## needed, but cannot go the other way). -#def DjangoNumber(match, context): -# match = DjangoNumber.regex.match(match.string, *match.span()) -# integer, frac, exp = match.groups() -# if exp: -# res = float(integer + (frac or '') + (exp or '')) -# elif frac: -# res = decimal.Decimal(integer + frac) -# else: -# res = int(integer) -# return res, None -#decoder.pattern(r'(-?(?:0|[1-9]\d*))(\.\d+)?([eE][-+]?\d+)?')(DjangoNumber) -# -#converters = decoder.ANYTHING[:] -#converters[-1] = DjangoNumber -#decoder.JSONScanner = decoder.Scanner(converters) -# -#class DjangoJSONDecoder(simplejson.JSONDecoder): -# _scanner = decoder.Scanner(converters) -#