Update to Flask==2.3.3

api_v1.py

@@ -1,14 +1,13 @@
 from flask import Blueprint, jsonify, request
 
 from api_common import get_builds, get_device_version, get_build_types, get_device_builds
-from changelog.gerrit import GerritServer, GerritJSONEncoder
+from changelog.gerrit import GerritServer
 from changelog import get_changes, get_timestamp
 from config import Config
 
 import extensions
 
 api = Blueprint('api_v1', __name__)
-api.json_encoder = GerritJSONEncoder
 
 gerrit = GerritServer(Config.GERRIT_URL)
 

app.py

@@ -8,6 +8,7 @@
 from prometheus_client import multiprocess, generate_latest, CollectorRegistry, CONTENT_TYPE_LATEST, Counter, Histogram
 
 from api_common import get_device_builds, get_oems, get_device_data
+from changelog.gerrit import GerritJSONProvider
 from custom_exceptions import DeviceNotFoundException, UpstreamApiException
 from config import Config
 from api_v1 import api as api_v1
@@ -19,6 +20,7 @@
 app.config.from_object('config.FlaskConfig')
 app.register_blueprint(api_v1, url_prefix='/api/v1')
 app.register_blueprint(api_v2, url_prefix='/api/v2')
+app.json = GerritJSONProvider(app)
 app.url_map.strict_slashes = False
 extensions.setup(app)
 

changelog/gerrit.py

@@ -16,20 +16,20 @@
 from __future__ import absolute_import
 
 from datetime import datetime
-from flask.json import JSONEncoder
+from flask.json.provider import DefaultJSONProvider
 
 import json
 import requests
 
 
-class GerritJSONEncoder(JSONEncoder):
+class GerritJSONProvider(DefaultJSONProvider):
     def default(self, obj):
         try:
             if isinstance(obj, GerritUser):
                 return {'id': obj.id, 'name': obj.name, 'username': obj.username, 'avatars': obj.avatars}
         except TypeError:
             pass
-        return JSONEncoder.default(self, obj)
+        return super().default(obj)
 
 
 def parse_gerrit_datetime(d):

requirements.txt

@@ -5,7 +5,7 @@ certifi==2023.7.22
 chardet==5.2.0
 charset-normalizer==3.2.0
 click==8.1.7
-Flask==2.2.5
+Flask==2.3.3
 Flask-Caching==2.0.2
 Flask-Cors==4.0.0
 gunicorn==21.2.0