Drop python2 support in scripts.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

1 files changed, 44 insertions, 44 deletions

diff --git a/lib/kross/test/testcase.py b/lib/kross/test/testcase.py
index 28917f874..6db6d980a 100644
--- a/lib/kross/test/testcase.py
+++ b/lib/kross/test/testcase.py
@@ -59,84 +59,84 @@ class TestPlugin(unittest.TestCase):
 	def setUp(self):
 		import krosstestpluginmodule
 		self.pluginobject1 = krosstestpluginmodule.testpluginobject1()
-		self.assert_( self.pluginobject1 )
+		self.assertTrue( self.pluginobject1 )
 
 		self.pluginobject2 = krosstestpluginmodule.testpluginobject2()
-		self.assert_( self.pluginobject2 )
+		self.assertTrue( self.pluginobject2 )
 
 		self.testqobject1 = krosstestpluginmodule.testqobject1()
-		self.assert_( self.testqobject1 )
+		self.assertTrue( self.testqobject1 )
 
 	def testBasicDataTypes(self):
-		self.assert_( self.pluginobject1.uintfunc(177321) == 177321 )
-		self.assert_( self.pluginobject1.intfunc(93675) == 93675 )
-		self.assert_( self.pluginobject1.intfunc(-73673) == -73673 )
-		self.assert_( self.pluginobject1.boolfunc(True) == True )
-		self.assert_( self.pluginobject1.boolfunc(False) == False )
-		self.assert_( self.pluginobject1.doublefunc(4265.3723) == 4265.3723 )
-		self.assert_( self.pluginobject1.doublefunc(-4265.68) == -4265.68 )
-		self.assert_( self.pluginobject1.cstringfunc(" This is a Test! ") == " This is a Test! " )
-		self.assert_( self.pluginobject1.stringfunc(" Another \n\r Test! $%&\"") == " Another \n\r Test! $%&\"" )
+		self.assertTrue( self.pluginobject1.uintfunc(177321) == 177321 )
+		self.assertTrue( self.pluginobject1.intfunc(93675) == 93675 )
+		self.assertTrue( self.pluginobject1.intfunc(-73673) == -73673 )
+		self.assertTrue( self.pluginobject1.boolfunc(True) == True )
+		self.assertTrue( self.pluginobject1.boolfunc(False) == False )
+		self.assertTrue( self.pluginobject1.doublefunc(4265.3723) == 4265.3723 )
+		self.assertTrue( self.pluginobject1.doublefunc(-4265.68) == -4265.68 )
+		self.assertTrue( self.pluginobject1.cstringfunc(" This is a Test! ") == " This is a Test! " )
+		self.assertTrue( self.pluginobject1.stringfunc(" Another \n\r Test! $%&\"") == " Another \n\r Test! $%&\"" )
 
 		#TODO
 		#self.assert_( self.pluginobject1.stringfunc( unicode(" Unicode test ") ) == " Unicode test " )
 		#self.assert_( self.pluginobject1.stringfunc(unicode(" Another Test! ")) == unicode(" Another Test! ") )
 
-		self.assert_( self.pluginobject1.stringstringfunc("MyString1", "MyString2") == "MyString1" )
-		self.assert_( self.pluginobject1.uintdoublestringfunc(8529,285.246,"String") == 8529 )
-		self.assert_( self.pluginobject1.stringlistbooluintdouble(["s1","s2"],True,6,7.0,"String") == ["s1","s2"] )
+		self.assertTrue( self.pluginobject1.stringstringfunc("MyString1", "MyString2") == "MyString1" )
+		self.assertTrue( self.pluginobject1.uintdoublestringfunc(8529,285.246,"String") == 8529 )
+		self.assertTrue( self.pluginobject1.stringlistbooluintdouble(["s1","s2"],True,6,7.0,"String") == ["s1","s2"] )
 
 	def testStringList(self):
-		self.assert_( self.pluginobject1.stringlistfunc( [] ) == [] )
-		self.assert_( self.pluginobject1.stringlistfunc( ["First Item"," Second Item "] ) == ["First Item"," Second Item "] )
-		self.assert_( self.pluginobject1.stringlistfunc( ("Theird Item"," Forth Item ","Fifth Item") ) == ["Theird Item"," Forth Item ","Fifth Item"] )
+		self.assertTrue( self.pluginobject1.stringlistfunc( [] ) == [] )
+		self.assertTrue( self.pluginobject1.stringlistfunc( ["First Item"," Second Item "] ) == ["First Item"," Second Item "] )
+		self.assertTrue( self.pluginobject1.stringlistfunc( ("Theird Item"," Forth Item ","Fifth Item") ) == ["Theird Item"," Forth Item ","Fifth Item"] )
 
 	def testVariant(self):
-		self.assert_( self.pluginobject1.variantfunc(True) == True )
-		self.assert_( self.pluginobject1.variantfunc(False) == False )
-		self.assert_( self.pluginobject1.variantfunc(187937) == 187937 )
-		self.assert_( self.pluginobject1.variantfunc(-69825) == -69825 )
-		self.assert_( self.pluginobject1.variantfunc(8632.274) == 8632.274 )
-		self.assert_( self.pluginobject1.variantfunc(-8632.351) == -8632.351 )
-		self.assert_( self.pluginobject1.variantfunc(" Test \n\r This String $%&\"") == " Test \n\r This String $%&\"")
+		self.assertTrue( self.pluginobject1.variantfunc(True) == True )
+		self.assertTrue( self.pluginobject1.variantfunc(False) == False )
+		self.assertTrue( self.pluginobject1.variantfunc(187937) == 187937 )
+		self.assertTrue( self.pluginobject1.variantfunc(-69825) == -69825 )
+		self.assertTrue( self.pluginobject1.variantfunc(8632.274) == 8632.274 )
+		self.assertTrue( self.pluginobject1.variantfunc(-8632.351) == -8632.351 )
+		self.assertTrue( self.pluginobject1.variantfunc(" Test \n\r This String $%&\"") == " Test \n\r This String $%&\"")
 
 	def testObjects(self):
-		print "-----------------1"
+		print("-----------------1")
 		newobjref = self.pluginobject1.objectfunc(self.pluginobject2)
-		print "-----------------2"
-		print str(newobjref)
+		print("-----------------2")
+		print(str(newobjref))
 
 		#self.assert_( newobjref.myuniqueid == self.pluginobject2.myuniqueid )
 		#print "===========> %s" % self.pluginobject2.myName()
 
-		print "testqobject1 properties=%s" % self.testqobject1.propertyNames()
-		print "testqobject1 Q_SLOTS=%s" % self.testqobject1.slotNames()
-		print "testqobject1 Q_SIGNALS=%s" % self.testqobject1.signalNames()
-		print "-----------------3"
-		print "DIR=>%s" % dir(self.testqobject1)
+		print("testqobject1 properties=%s" % self.testqobject1.propertyNames())
+		print("testqobject1 Q_SLOTS=%s" % self.testqobject1.slotNames())
+		print("testqobject1 Q_SIGNALS=%s" % self.testqobject1.signalNames())
+		print("-----------------3")
+		print("DIR=>%s" % dir(self.testqobject1))
 
-		print "===================> slotcall-result: %s" % self.testqobject1.slot("self()")
+		print("===================> slotcall-result: %s" % self.testqobject1.slot("self()"))
 
 		#testobject = newobjref.get("TestObject")
 		#print testobject
-		print "-----------------9"
+		print("-----------------9")
 
 	def testDefaultArguments(self):
-		self.assert_( self.pluginobject1.uintfunc_defarg(98765) == 98765 )
-		self.assert_( self.pluginobject1.uintfunc_defarg() == 12345 )
-		self.assert_( self.pluginobject1.stringfunc_defarg("MyString") == "MyString" )
-		self.assert_( self.pluginobject1.stringfunc_defarg() == "MyDefaultString" )
-		self.assert_( self.pluginobject1.stringlistfunc_defarg(["s1","s2","s3"]) == ["s1","s2","s3"] )
-		self.assert_( self.pluginobject1.stringlistfunc_defarg() == ["Default1","Default2"] )
-		self.assert_( self.pluginobject1.variantfunc_defarg(822.75173) == 822.75173 )
-		self.assert_( self.pluginobject1.variantfunc_defarg() == "MyDefaultVariantString" )
+		self.assertTrue( self.pluginobject1.uintfunc_defarg(98765) == 98765 )
+		self.assertTrue( self.pluginobject1.uintfunc_defarg() == 12345 )
+		self.assertTrue( self.pluginobject1.stringfunc_defarg("MyString") == "MyString" )
+		self.assertTrue( self.pluginobject1.stringfunc_defarg() == "MyDefaultString" )
+		self.assertTrue( self.pluginobject1.stringlistfunc_defarg(["s1","s2","s3"]) == ["s1","s2","s3"] )
+		self.assertTrue( self.pluginobject1.stringlistfunc_defarg() == ["Default1","Default2"] )
+		self.assertTrue( self.pluginobject1.variantfunc_defarg(822.75173) == 822.75173 )
+		self.assertTrue( self.pluginobject1.variantfunc_defarg() == "MyDefaultVariantString" )
 
 	#def testExpectedFailures(self):
 		# to less arguments
 		#self.assertRaises(ValueError, self.pluginobject1.uintfunc)
 		#self.assert_( self.pluginobject1.uintfunc() != 8465 )
 
-print "__name__ = %s" % __name__
+print("__name__ = %s" % __name__)
 #print "self = %s" % self
 #print self.get("TestObject")