From ba105bc6861850b10b788de736f4d4b10fc61a15 Mon Sep 17 00:00:00 2001
From: latercomer <latercomer@qq.com>
Date: Wed, 10 Jul 2024 14:21:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3tools/keil.py=E4=B8=ADpython3?=
 =?UTF-8?q?=E4=B8=8D=E5=85=BC=E5=AE=B9python2=E7=9A=84str.decode()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/keil.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tools/keil.py b/tools/keil.py
index 2c9f239f1e..8cd58c0399 100644
--- a/tools/keil.py
+++ b/tools/keil.py
@@ -87,12 +87,18 @@ def MDK4AddGroupForFN(ProjectFiles, parent, name, filename, project_path):
     if ProjectFiles.count(obj_name):
         name = basename + '_' + name
     ProjectFiles.append(obj_name)
-    file_name.text = name.decode(fs_encoding)
+    try: # python 2
+        file_name.text = name.decode(fs_encoding)
+    except: # python 3
+        file_name.text = name
     file_type = SubElement(file, 'FileType')
     file_type.text = '%d' % _get_filetype(name)
     file_path = SubElement(file, 'FilePath')
+    try: # python 2
+        file_path.text = path.decode(fs_encoding)
+    except: # python 3
+        file_path.text = path
 
-    file_path.text = path.decode(fs_encoding)
 
     return group