From 91bc493153ac1cbb54cf9036a33d347d3d70c190 Mon Sep 17 00:00:00 2001 From: Jonas Braathen Date: Wed, 14 Jan 2015 20:27:21 +0100 Subject: [PATCH] Remove CustomJSONEncoder --- tekstmelding.py | 5 ++--- utils.py | 15 --------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/tekstmelding.py b/tekstmelding.py index db4baac..4abc472 100644 --- a/tekstmelding.py +++ b/tekstmelding.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from flask import Flask, request, g, abort, jsonify -from utils import CustomJSONEncoder, generate_activation_code +from flask import Flask, request, g, abort +from utils import generate_activation_code import MySQLdb import MySQLdb.cursors import datetime @@ -13,7 +13,6 @@ import config app = Flask(__name__) app.config.from_object('config') -app.json_encoder = CustomJSONEncoder if not app.debug: import logging diff --git a/utils.py b/utils.py index 61064eb..b455af9 100644 --- a/utils.py +++ b/utils.py @@ -1,22 +1,7 @@ -from datetime import date -from flask.json import JSONEncoder import string import random -class CustomJSONEncoder(JSONEncoder): - def default(self, obj): - try: - if isinstance(obj, date): - return obj.isoformat() - iterable = iter(obj) - except TypeError: - pass - else: - return list(iterable) - return JSONEncoder.default(self, obj) - - def generate_activation_code(length=5): chars = string.ascii_lowercase + string.digits # remove easily misinterpreted chars