From: Jozef Behran <jbehran@cisco.com>
Date: Thu, 25 Feb 2016 13:55:56 +0000 (+0100)
Subject: Fix crash in tidytool.py when processing non-ASCII Robot file
X-Git-Tag: release/beryllium-sr1~58
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=006afcdcec0c679ada82779d977d46da0a1a398f

Fix crash in tidytool.py when processing non-ASCII Robot file

Change-Id: Ie28116c94db9a03129aca7ac4c0416719847743f
Signed-off-by: Jozef Behran <jbehran@cisco.com>
---

diff --git a/tools/robot_check/tidytool.py b/tools/robot_check/tidytool.py
index 1f69ca293a..d20abd9b1d 100644
--- a/tools/robot_check/tidytool.py
+++ b/tools/robot_check/tidytool.py
@@ -39,6 +39,11 @@ def check_quietly(FileSpec):
     except (IOError, OSError), e:
         Error(FileSpec, "Not accessible: " + str(e))
         return
+    try:
+        Data = Data.decode("utf8")
+    except:
+        Error(FileSpec, "Has invalid UTF8 data")
+        return
     TidyTool = robot.tidy.Tidy()
     CleanedData = TidyTool.file(FileSpec)
     if Data != CleanedData:
@@ -61,6 +66,7 @@ def tidy(FileSpec):
     TidyTool = robot.tidy.Tidy()
     try:
         CleanedData = TidyTool.file(FileSpec)
+        CleanedData = CleanedData.encode("utf8")
         open(FileSpec, "w").write(CleanedData)
     except (IOError, OSError), e:
         Error(FileSpec, "Not accessible: " + str(e))