Fixed Python 3 compatibility bug - Py3k requires __str__ to return unicode for print() to work, duh!

git-svn-id: http://prettytable.googlecode.com/svn/trunk@83 0f58610c-415a-11de-9c03-5d6cfad8e937

2 files changed, 11 insertions, 7 deletions

diff --git a/prettytable.py b/prettytable.py
index 410fd74..1fbd42d 100644
--- a/prettytable.py
+++ b/prettytable.py
@@ -209,8 +209,12 @@ class PrettyTable(object):
             raise Exception("Index %s is invalid, must be an integer or slice" % str(index))
         return newtable
 
-    def __str__(self):
-        return self.__unicode__().encode(self.encoding)
+    if py3k:
+        def __str__(self):
+           return self.__unicode__()
+    else:
+        def __str__(self):
+           return self.__unicode__().encode(self.encoding)
 
     def __unicode__(self):
         return self.get_string()
diff --git a/prettytable_test.py b/prettytable_test.py
index 5736f5d..e5a8696 100644
--- a/prettytable_test.py
+++ b/prettytable_test.py
@@ -1,4 +1,3 @@
-#import cProfile, pstats
 import unittest
 import sys
 sys.path.append("../src/")
@@ -468,9 +467,10 @@ class HtmlOutputTests(unittest.TestCase):
 </table>
 """.strip()
 
+class PrintTest(CityDataTest):
+
+    def testPrint(self):
+        print(self.x)
+
 if __name__ == "__main__":
-    #cProfile.run("unittest.main()", "fooprof")
-    #p = pstats.Stats("fooprof")
-    #p.sort_stats("time")
-    #p.print_stats()
     unittest.main()