From 0cd59fedb86438eea607bfce4e3922c7a1e0af3e Mon Sep 17 00:00:00 2001
From: Syres916 <46537884+Syres916@users.noreply.github.com>
Date: Wed, 9 Jan 2019 18:56:03 +0000
Subject: [PATCH] Py3 Fix to import Airfoil DAT files

To prevent error message as per https://forum.freecadweb.org/viewtopic.php?f=3&t=33309#p278902

As it's my first PR, I've tried to follow the advice @triplus gave in https://forum.freecadweb.org/viewtopic.php?f=10&t=30340&start=300#p279079 but please let me know if I'm not providing sufficient information.
---
 src/Mod/Draft/importAirfoilDAT.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Mod/Draft/importAirfoilDAT.py b/src/Mod/Draft/importAirfoilDAT.py
index f93da786cf..732a040e69 100644
--- a/src/Mod/Draft/importAirfoilDAT.py
+++ b/src/Mod/Draft/importAirfoilDAT.py
@@ -42,13 +42,16 @@ useDraftWire = True
 def decodeName(name):
 	"decodes encoded strings"
 	try:
-		decodedName = (name.decode("utf8"))
+		decodedName = name
 	except UnicodeDecodeError:
 		try:
 			decodedName = (name.decode("latin1"))
 		except UnicodeDecodeError:
-			print("AirfoilDAT: error: couldn't determine character encoding")
-			decodedName = name
+			try:
+				decodedName = (name.decode("utf8"))
+			except UnicodeDecodeError:
+				print("AirfoilDAT: error: couldn't determine character encoding")
+				decodedName = name
 	return decodedName
 
 def open(filename):