kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

apply() was removed in Python 3

Browse Source
This commit is contained in:
cclauss
2019-01-08 13:18:23 +01:00
committed by wmayer
parent 3d52e8a6b9
commit a17ca7dc05
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/Test/unittestgui.py
View File

@@ -51,7 +51,7 @@ class BaseGUITestRunner:
self.currentResult = None self.currentResult = None
self.running = 0 self.running = 0
self.__rollbackImporter = None self.__rollbackImporter = None
apply(self.initGUI, args, kwargs) self.initGUI(*args, **kwargs)
def getSelectedTestName(self): def getSelectedTestName(self):
"Override to return the name of the test selected to be run" "Override to return the name of the test selected to be run"
@@ -75,7 +75,7 @@ class BaseGUITestRunner:
test = unittest.defaultTestLoader.loadTestsFromName(testName) test = unittest.defaultTestLoader.loadTestsFromName(testName)
except: except:
exc_type, exc_value, exc_tb = sys.exc_info() exc_type, exc_value, exc_tb = sys.exc_info()
apply(traceback.print_exception,sys.exc_info()) traceback.print_exception(*sys.exc_info())
self.errorDialog("Unable to run test '%s'" % testName, self.errorDialog("Unable to run test '%s'" % testName,
"Error loading specified test: %s, %s" % \ "Error loading specified test: %s, %s" % \
(exc_type, exc_value)) (exc_type, exc_value))
@@ -341,7 +341,7 @@ class TkTestRunner(BaseGUITestRunner):
test, error = self.errorInfo[selected] test, error = self.errorInfo[selected]
tk.Label(window, text=str(test), tk.Label(window, text=str(test),
foreground="red", justify=tk.LEFT).pack(anchor=tk.W) foreground="red", justify=tk.LEFT).pack(anchor=tk.W)
tracebackLines = apply(traceback.format_exception, error + (10,)) tracebackLines = traceback.format_exception(*error + (10,))
tracebackText = string.join(tracebackLines,'') tracebackText = string.join(tracebackLines,'')
tk.Label(window, text=tracebackText, justify=tk.LEFT).pack() tk.Label(window, text=tracebackText, justify=tk.LEFT).pack()
tk.Button(window, text="Close", tk.Button(window, text="Close",
@@ -356,7 +356,7 @@ class ProgressBar(tk.Frame):
the given colour.""" the given colour."""
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
apply(tk.Frame.__init__, (self,) + args, kwargs) tk.Frame.__init__(*(self,) + args, **kwargs)
self.canvas = tk.Canvas(self, height='20', width='60', self.canvas = tk.Canvas(self, height='20', width='60',
background='white', borderwidth=3) background='white', borderwidth=3)
self.canvas.pack(fill=tk.X, expand=1) self.canvas.pack(fill=tk.X, expand=1)