From e4de8e285e84b94404ec13ccb45463d19fab3858 Mon Sep 17 00:00:00 2001 From: Tiara Rodney Date: Fri, 15 Apr 2022 03:53:18 +0200 Subject: [PATCH] fix(controller/paste): prioritize encoding over highlighting --- src/httpaste/controller/paste/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/httpaste/controller/paste/__init__.py b/src/httpaste/controller/paste/__init__.py index bd0a076..08a74a1 100644 --- a/src/httpaste/controller/paste/__init__.py +++ b/src/httpaste/controller/paste/__init__.py @@ -100,11 +100,13 @@ def get(**kwargs): else: paste_model.remove(pid, backend.paste) + if encoding is not None: + data = data.decode(encoding) + if syntax is not None: data = highlight(data, str(syntax), formatter, linenos) - if encoding is not None: - data = data.decode(encoding) + return ConnexionResponse( status_code=200,