remove the unused json import and revert the response of type applica…

…tion/octet-stream back to json.dumps, change a log message argument to display failing reason
junhaoliao · Jan 5, 2025 · 4efa440 · 4efa440
1 parent f937db9
commit 4efa440
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/application/routes/audio.py b/application/routes/audio.py
@@ -27,7 +27,6 @@
 #   furnished to do so, subject to the following conditions:
 #
 #
-import json
 
 from flask import request, abort, jsonify
 

diff --git a/application/routes/common.py b/application/routes/common.py
@@ -18,7 +18,6 @@
 #   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 #   IN THE SOFTWARE.
 
-import json
 import threading
 
 from flask import request, abort, jsonify

diff --git a/application/routes/term.py b/application/routes/term.py
@@ -20,7 +20,7 @@
 
 import json
 
-from flask import request, abort, stream_with_context, jsonify
+from flask import request, abort, stream_with_context
 
 from .common import create_connection
 from .. import api, app
@@ -59,7 +59,7 @@ def generate():
             'port': TERMINAL_PORT,
             'term_id': term.id
         }
-        yield jsonify(result)
+        yield json.dumps(result)
 
     return app.response_class(stream_with_context(generate()), mimetype='application/octet-stream')
 

diff --git a/application/routes/vnc.py b/application/routes/vnc.py
@@ -21,7 +21,7 @@
 import json
 import logging
 
-from flask import request, abort, stream_with_context, jsonify
+from flask import request, abort, stream_with_context
 
 from .common import create_connection
 from .. import api, app, profiles
@@ -93,7 +93,7 @@ def generate():
             'port': ws_port,
             'credentials': credentials
         }
-        yield jsonify(result)
+        yield json.dumps(result)
 
     return app.response_class(stream_with_context(generate()), mimetype='application/octet-stream')
 
@@ -104,7 +104,7 @@ def change_vncpasswd():
 
     vnc, reason = create_connection(session_id, ConnectionType.VNC)
     if reason != '':
-        logger.error("create_connection() failed with status=", status)
+        logger.error("create_connection() failed with status=", reason)
         abort(403, description=reason)
 
     passwd = request.json.get('passwd')
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,6 @@ @@
     #   furnished to do so, subject to the following conditions:
     #
     #
-    import json
     from flask import request, abort, jsonify
@@ Expand Down @@