From 7726bca3234e757dbdf565ef286de734b7701bc5 Mon Sep 17 00:00:00 2001 From: Greg Neagle Date: Sat, 22 Mar 2014 10:22:14 -0700 Subject: [PATCH] in MunkiItems.py, decode names as UTF-8 (since they were encoded as UTF-8 when the object was initialized) --- .../Managed Software Center/MunkiItems.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/Managed Software Center/Managed Software Center/MunkiItems.py b/code/Managed Software Center/Managed Software Center/MunkiItems.py index c3239f35..5809d9a9 100644 --- a/code/Managed Software Center/Managed Software Center/MunkiItems.py +++ b/code/Managed Software Center/Managed Software Center/MunkiItems.py @@ -1,3 +1,4 @@ +# encoding: utf-8 # # MunkiItems.py # Managed Software Center @@ -358,7 +359,7 @@ class GenericItem(dict): '''Return name/relative path of image file to use for the icon''' for key in ['icon_name', 'display_name', 'name']: if key in self: - name = self[key] + name = self[key].decode('utf-8') icon_path = os.path.join(msulib.html_dir(), name + '.png') if os.path.exists(icon_path) or msulib.convertIconToPNG(name, icon_path, 350): return name + '.png'