Upgrade to Python3

.travis.yml

@@ -1,7 +1,7 @@
 language: python
 python:
 - '2.7'
-- '3.2'
+- '3.8'
 before_install:
 - sudo apt-get -qq update
 - sudo apt-get install -y python-pygame

battle.py

@@ -15,6 +15,7 @@
 import menu
 import inspect
 import bdb
+import math
 
 import engine.network as network
 
@@ -88,7 +89,7 @@ def startBattle(self,_screen):
 
                 self.clock_sprite = spriteManager.TextSprite('8:00','Orbitron Medium',32,[0,0,0])
                 self.clock_sprite.rect.topright = self.screen.get_rect().topright
-                self.clock_sprite.changeText(str(self.clock_time / 60)+':'+str(self.clock_time % 60).zfill(2))
+                self.updateClockText()
                 self.gui_objects.append(self.clock_sprite)
 
             gui_offset = self.screen.get_rect().width / (len(self.players) + 1)
@@ -183,6 +184,10 @@ def startBattle(self,_screen):
 
         self.endBattle(self.exit_status)    
         return self.exit_status # This'll pop us back to the character select screen.
+
+    def updateClockText(self):
+        clockText = str(math.floor(self.clock_time / 60))+':'+str(self.clock_time % 60).zfill(2)
+        self.clock_sprite.changeText(clockText)
 
     def gameEventLoop(self):
         for cont in self.controllers:
@@ -210,7 +215,7 @@ def gameEventLoop(self):
 
             if event.type == pygame.USEREVENT+2:
                 pygame.time.set_timer(pygame.USEREVENT+2, 1000)
-                self.clock_sprite.changeText(str(self.clock_time / 60)+':'+str(self.clock_time % 60).zfill(2))
+                self.updateClockText()
                 self.clock_time -= 1
                 if self.clock_time <= 5 and self.clock_time > 0:
                     self.countdown_sprite.changeText(str(self.clock_time))
@@ -432,7 +437,7 @@ def endBattle(self,_exitStatus):
             dist = 48
 
             print(fighter.data_log.data)
-            for item,val in fighter.data_log.data.items():
+            for item,val in list(fighter.data_log.data.items()):
                 text = spriteManager.TextSprite(str(item) + ': ' + str(val))
                 result_sprite.image.blit(text.image,(0,dist))
                 dist += 16

builder/builderWindow.py

@@ -6,15 +6,21 @@
 import settingsManager
 import inspect
 import engine.abstractFighter
-import subactionSelector
+import builder.subactionSelector
 import engine.subaction
 import xml.etree.ElementTree as ElementTree
-from Tkinter import *
-from tkFileDialog import askopenfile
-from tkMessageBox import showinfo
+if sys.version_info[0] == 3:
+    from tkinter import *
+    from tkinter.filedialog import askopenfile
+    from tkinter.messagebox import showinfo
+    from tkinter import ttk
+else:
+    from Tkinter import *
+    from tkFileDialog import askopenfile
+    from tkMessageBox import showinfo
+    import ttk
 from shutil import copyfile
 import stages.training_stage.stage
-import ttk
 import builder.dataSelector as dataSelector
 from engine.abstractFighter import AbstractFighter
 
@@ -187,7 +193,7 @@ def changeAction(self,*_args):
         global changed_actions
         global fighter
         if fighter:
-            if changed_actions.has_key(self.action_string.get()):
+            if self.action_string.get() in changed_actions:
                 action = changed_actions[self.action_string.get()]
             else: action = fighter.getAction(self.action_string.get())
 
@@ -239,7 +245,7 @@ def saveFighter(self):
         global action
         global changed_actions
 
-        for actName, new_action in changed_actions.iteritems():
+        for actName, new_action in list(changed_actions.items()):
             if hasattr(fighter.actions, 'modifyAction'):
                 fighter.actions.modifyAction(actName, new_action) 
         if hasattr(fighter.actions,'saveActions'):
@@ -311,7 +317,7 @@ def submit(self,*_args):
         name = self.name.get()
         if name:
             if not fighter.actions.hasAction(name): #if it doesn't already exist
-                if not changed_actions.has_key(name): #and we didn't already make one
+                if not name in changed_actions: #and we didn't already make one
                     act = engine.action.Action()
                     act.name = name
                     self.root.addAction(act)
@@ -324,7 +330,7 @@ def submitBasic(self,*_args):
         name = self.basic_choice.get()
         if name:
             if not fighter.actions.hasAction(name): #if it doesn't already exist
-                if not changed_actions.has_key(name): #and we didn't already make one
+                if not name in changed_actions: #and we didn't already make one
                     if hasattr(engine.baseActions, name):
                         act = getattr(engine.baseActions, name)()
                         act.name = name
@@ -349,7 +355,7 @@ def submit(self,*_args):
         global action
 
         name = self.name.get()
-        if name and not action.conditional_actions.has_key(name):
+        if name and not name in action.conditional_actions:
             action.conditional_actions[name] = []
             self.root.actionModified()
             self.destroy()
@@ -633,7 +639,7 @@ def refreshDropdowns(self):
         global changed_actions
         global action
 
-        for changed_action in changed_actions.keys():
+        for changed_action in list(changed_actions.keys()):
             if not changed_action in self.act_list:
                 self.act_list.append(changed_action)
 
@@ -645,7 +651,7 @@ def refreshDropdowns(self):
         else:
             self.group_list = self.default_group_list[:]
             if action and isinstance(action, engine.action.Action):
-                for group in action.events.keys():
+                for group in list(action.events.keys()):
                     self.group_list.append('Cond: '+ group)
 
         self.action.destroy()
@@ -740,7 +746,7 @@ def printNode(self,_node,_prefix=''):
         text += _node.text.lstrip() if _node.text is not None else ''
         if len(_node.attrib) > 0: #if it has attributes
             text += ' ('
-            for name,atr in _node.attrib.iteritems():
+            for name,atr in list(_node.attrib.items()):
                 text+=name+': '+str(atr)
                 text+=','
             text = text[:-1] #chop off the last comma
@@ -804,7 +810,7 @@ def groupChanged(self,*_args):
 
             self.showSubactionList()
         elif self.group == 'Attributes':
-            for tag,val in fighter.var.iteritems():
+            for tag,val in list(fighter.var.items()):
                 panel = subactionSelector.SubactionSelector(self.scroll_frame,[(tag,type(val).__name__,fighter.var,tag)],tag+': '+str(val))
                 self.subaction_list.append(panel)
 
@@ -909,7 +915,7 @@ def __init__(self,_parent,_root):
                          'Article': self.article_window
                          }
 
-        for name,window in subact_windows.iteritems():
+        for name,window in list(subact_windows.items()):
             self.new_subaction_frame.add(window,text=name)
 
         subaction_lists = {'Control':[],
@@ -918,13 +924,13 @@ def __init__(self,_parent,_root):
                           'Hitbox':[],
                           'Article':[]}
 
-        for name,subact in engine.subaction.SubactionFactory.subaction_dict.iteritems():
-            if subact.subact_group in subact_windows.keys():
+        for name,subact in list(engine.subaction.SubactionFactory.subaction_dict.items()):
+            if subact.subact_group in list(subact_windows.keys()):
                 short_name = (name[:19] + '..') if len(name) > 22 else name
                 button = Button(subact_windows[subact.subact_group],text=short_name,command=lambda subaction=subact: self.addSubaction(subaction))
                 subaction_lists[subact.subact_group].append(button)
 
-        for group in subaction_lists.values():
+        for group in list(subaction_lists.values()):
             x = 0
             y = 0
             for button in group:
@@ -949,7 +955,7 @@ def addSubaction(self,_subaction):
                          'After Frames': action.actions_after_frame,
                          'Last Frame': action.actions_at_last_frame}
         group = self.parent.action_selector_panel.current_group.get()
-        if group_to_action.has_key(group) or group.startswith('Cond:'):
+        if group in group_to_action or group.startswith('Cond:'):
             subact = _subaction()
             if group.startswith('Cond:'):
                 action.conditional_actions[group[6:]].append(subact)
@@ -1041,11 +1047,11 @@ def __init__(self,_parent,_root):
             'Actions': fighter_actions
             }
 
-        for name,window in self.panel_windows.iteritems():
+        for name,window in list(self.panel_windows.items()):
             self.add(window,text=name,sticky=N+S+E+W)
 
     def addActionPane(self,_actionName):
-        if not _actionName in self.panel_windows.keys():
+        if not _actionName in list(self.panel_windows.keys()):
             actionPanel = ActionPanel(self,self.root,_actionName)
             self.panel_windows[_actionName] = actionPanel
             self.add(actionPanel,text=_actionName,sticky=N+S+E+W)
@@ -1166,7 +1172,7 @@ def __init__(self,_parent,_root,_actionName):
         dataPanel.__init__(self, _parent, _root)
         self.config(bg="light coral")
 
-        if changed_actions.has_key(_actionName):
+        if _actionName in changed_actions:
             self.action = changed_actions[_actionName]
         else: self.action = fighter.getAction(_actionName)
 
@@ -1227,7 +1233,7 @@ def __init__(self,_parent,_root,_actionName):
         lastGroup.childElements.append(dataSelector.NewSubactionLine(self,self.interior))
         self.data_list.append(lastGroup)
 
-        for name,event in self.action.events.iteritems():
+        for name,event in list(self.action.events.items()):
             eventGroup = dataSelector.GroupLine(self,self.interior,'Event: '+name)
             for subact in event:
                 eventGroup.childElements.append(subact.getDataLine(self))

builder/dataSelector.py

@@ -1,9 +1,18 @@
-from Tkinter import *
-import settingsManager
-from idlelib.ObjectBrowser import _object_browser
-from tkFileDialog import askopenfile,askdirectory
+import sys
 import os
-import tkMessageBox
+
+# Python 3 compatibility
+if sys.version_info[0] == 3:
+    from tkinter import *
+    from tkinter.filedialog import askopenfile, askdirectory
+    import tkinter.messagebox as tkMessageBox
+else:
+    from Tkinter import *
+    from tkFileDialog import askopenfile, askdirectory
+    import tkMessageBox
+
+import settingsManager
+#from idlelib.ObjectBrowser import _object_browser
 import engine.action
 import inspect
 
@@ -375,7 +384,7 @@ def __init__(self,_root,_parent,_name,_target_object,_varname):
 
         sprite_vals = ['No Sprites found']
         if self.root.getFighter():
-            sprite_vals = self.root.getFighter().sprite.image_library["right"].keys()
+            sprite_vals = list(self.root.getFighter().sprite.image_library["right"].keys())
 
         self.sprite_entry = OptionMenu(self,self.sprite_data,*sprite_vals)
         self.sprite_entry.config(width=18)
@@ -704,7 +713,7 @@ def __init__(self,_root,_parent,_name,_target_object,_varname):
         self.target_object = _target_object
         self.var_name = _varname
 
-        self.tran_list = engine.baseActions.state_dict.keys()
+        self.tran_list = list(engine.baseActions.state_dict.keys())
 
         self.tran_data = StringVar()
         self.tran_entry = OptionMenu(self,self.tran_data,*self.tran_list)
@@ -723,4 +732,4 @@ def packChildren(self):
     def update(self):
         if self.target_object:            
             self.tran_data.set(getattr(self.target_object, self.var_name))
-        self.packChildren()
+        self.packChildren()