1 files changed, 5 insertions, 8 deletions
diff --git a/python/vyos/util.py b/python/vyos/util.py
index 66ded464d..d5330db13 100644
--- a/python/vyos/util.py
+++ b/python/vyos/util.py
@@ -874,12 +874,16 @@ def convert_data(data):
     Returns:
         str | list | dict: converted data
     """
+    from base64 import b64encode
     from collections import OrderedDict
 
     if isinstance(data, str):
         return data
     if isinstance(data, bytes):
-        return data.decode()
+        try:
+            return data.decode()
+        except UnicodeDecodeError:
+            return b64encode(data).decode()
     if isinstance(data, list):
         list_tmp = []
         for item in data:
@@ -1142,13 +1146,6 @@ def sysctl_write(name, value):
         return True
     return False
 
-# approach follows a discussion in:
-# https://stackoverflow.com/questions/1175208/elegant-python-function-to-convert-camelcase-to-snake-case
-def camel_to_snake_case(name: str) -> str:
-    pattern = r'\d+|[A-Z]?[a-z]+|\W|[A-Z]{2,}(?=[A-Z][a-z]|\d|\W|$)'
-    words = re.findall(pattern, name)
-    return '_'.join(map(str.lower, words))
-
 def load_as_module(name: str, path: str):
     import importlib.util