From cd646f9971391af41baa91c4dd4315dc6f7a32e1 Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Tue, 7 Apr 2020 23:46:03 +0200
Subject: [PATCH] Use print() function in both Python 2 and Python 3 (#141)

Thanks!
---
 hyrise/benchmark/benchmark.py       | 16 +++++++++-------
 src/parser/keywordlist_generator.py | 12 ++++++------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/hyrise/benchmark/benchmark.py b/hyrise/benchmark/benchmark.py
index d7d8b6e..3336e3e 100644
--- a/hyrise/benchmark/benchmark.py
+++ b/hyrise/benchmark/benchmark.py
@@ -1,4 +1,6 @@
 #!/bin/python
+from __future__ import print_function
+
 import urllib, urllib2
 import json
 
@@ -14,7 +16,7 @@ class HyriseConnection(object):
 	def __parseResponse(self, response):
 		result = json.loads(response)
 		if 'error' in result:
-			print 'An error occurred: %s' % result['error'][0]
+			print('An error occurred: %s' % result['error'][0])
 			return None
 
 		if 'performanceData' in result:
@@ -47,10 +49,10 @@ class HyriseConnection(object):
 			rsp = urllib2.urlopen(req)
 			response = rsp.read();
 			return self.__parseResponse(response)
-		except TypeError, e:
-			print "An error occurred"
+		except TypeError as e:
+			print("An error occurred")
 			return None
-		except Exception, e:
+		except Exception as e:
 			return self.__parseResponse(e.read())
 
 	def __aggregatePerfArray(self, perfArray):
@@ -160,8 +162,8 @@ if __name__ == '__main__':
 
 	# if 'prepare' in query:	hyrise.executeSQL(query['prepare'])
 	
-	if 'sql' in query: 		print 'SQL: ', hyrise.executeSQL(query['sql'], times)
+	if 'sql' in query: 		print('SQL: ', hyrise.executeSQL(query['sql'], times))
 
-	if 'execute' in query: 	print 'Prepared: ', hyrise.executeSQL(query['execute'], times)
+	if 'execute' in query: 	print('Prepared: ', hyrise.executeSQL(query['execute'], times))
 
-	# if 'json' in query:		print 'JSON: ', hyrise.executeJSON(query['json'], times)
+	# if 'json' in query:		print('JSON: ', hyrise.executeJSON(query['json'], times))
diff --git a/src/parser/keywordlist_generator.py b/src/parser/keywordlist_generator.py
index ae4c0f0..c4e3fcb 100644
--- a/src/parser/keywordlist_generator.py
+++ b/src/parser/keywordlist_generator.py
@@ -1,4 +1,4 @@
-
+from __future__ import print_function
 import math
 
 
@@ -21,7 +21,7 @@ with open("sql_keywords.txt", 'r') as fh:
 		if len_diff % 4 != 0: num_tabs += 1
 
 		tabs = ''.join(['\t' for _ in range(num_tabs)])
-		print "%s%sTOKEN(%s)" % (keyword, tabs, keyword) 
+		print("%s%sTOKEN(%s)" % (keyword, tabs, keyword))
 
 	#
 	#################
@@ -32,15 +32,15 @@ with open("sql_keywords.txt", 'r') as fh:
 	line = "%token"
 	max_len = 60
 
-	print "/* SQL Keywords */"
+	print("/* SQL Keywords */")
 	for keyword in keywords:
 
 		if len(line + " " + keyword) > max_len:
-			print line
+			print(line)
 			line = "%token " + keyword
 		else:
 			line = line + " " + keyword
-	print line
+	print(line)
 
 	#
-	#################
\ No newline at end of file
+	#################