From 50ac3aab7ae2d8a1e2e42e2b05c82ce30f4b502a Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Sat, 6 Apr 2013 01:48:23 +0200
Subject: [PATCH] Minor patch

---
 lib/core/common.py  | 2 +-
 lib/core/convert.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/core/common.py b/lib/core/common.py
index 2aed77697..e7eaea623 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -777,7 +777,7 @@ def dataToStdout(data, forceOutput=False, bold=False, content_type=None, status=
             if kb.get("multiThreadMode"):
                 logging._acquireLock()
 
-            if isinstance(data, basestring):
+            if isinstance(data, unicode):
                 message = stdoutencode(data)
             else:
                 message = data
diff --git a/lib/core/convert.py b/lib/core/convert.py
index 91102b176..4a16e76cf 100644
--- a/lib/core/convert.py
+++ b/lib/core/convert.py
@@ -141,7 +141,7 @@ def stdoutencode(data):
     try:
         # Reference: http://bugs.python.org/issue1602
         if IS_WIN:
-            output = data.encode('ascii', "replace")
+            output = data.encode("ascii", "replace")
 
             if output != data:
                 warnMsg = "cannot properly display Unicode characters "