Minor changes for python3 compatibility

Behery · Behery · commit ff916459ae9f · 2019-02-21T14:17:43.000+01:00
diff --git a/main.py b/main.py
diff --git a/marioai/environment.py b/marioai/environment.py
@@ -100,7 +100,7 @@ def perform_action(self, action):
         '''
         
         actionStr = ""
-        for i in xrange(5):
+        for i in range(5):
             if action[i] == 1:
                 actionStr += '1'
 
@@ -190,7 +190,7 @@ def connect(self):
             data = self.recvData()
             logging.info('[TCPClient] greetings received: %s'%data)
 
-        except socket.error, message:
+        except socket.error as message:
             logging.error('[TCPClient] connection error: %s'%message[1])
             sys.exit(1)
 
@@ -216,7 +216,7 @@ def recvData(self):
         try:
             return self.sock.recv(self.buffer_size)
 
-        except socket.error, message:
+        except socket.error as message:
             logging.error('[TCPClient] error while receiving. Message: %s'%message)
             raise socket.error
 
@@ -227,9 +227,9 @@ def sendData(self, data):
           data (str): the string to be sent.
         '''
         try:
-            self.sock.send(data)
+            self.sock.send(data.encode())
 
-        except socket.error, message:
+        except socket.error as message:
             logging.error('[TCPClient] error while sending. Message: %s'%message)
             raise socket.error
 
diff --git a/marioai/experiment.py b/marioai/experiment.py
@@ -34,7 +34,7 @@ def _episode(self):
     def doEpisodes(self, n=1):
         rewards = []
 
-        for _ in xrange(n):
+        for _ in range(n):
             rewards.append(self._episode())
 
         return rewards
diff --git a/marioai/utils.py b/marioai/utils.py
@@ -37,14 +37,15 @@ def decode(estate):
             col += 1
             if (totalBitsDecoded == 484):
                 break
-    print "totalBitsDecoded = ", totalBitsDecoded
+    print("totalBitsDecoded = ", totalBitsDecoded)
     return dstate, check_sum;
 
 
 def extractObservation(data):
     """
      parse the array of strings and return array 22 by 22 of doubles
     """
+    data = data.decode()
 
     obsLength = 487
     levelScene = numpy.empty(shape = (22, 22), dtype = numpy.int)
@@ -56,7 +57,7 @@ def extractObservation(data):
         levelScene, check_sum_got = decode(data[3:34])
         check_sum_recv = int(data[34:])
         if check_sum_got != check_sum_recv:
-            print "Error check_sum! got %d != recv %d" % (check_sum_got, check_sum_recv)
+            print ("Error check_sum! got %d != recv %d" % (check_sum_got, check_sum_recv))
 
         return (mayMarioJump, isMarioOnGround, levelScene)
     data = data.split(' ')
