diff options
author | William S Fulton <wsf@fultondesigns.co.uk> | 2020-08-15 19:03:38 +0100 |
---|---|---|
committer | William S Fulton <wsf@fultondesigns.co.uk> | 2020-08-15 19:03:38 +0100 |
commit | baec830f75f24cdebfde4103fd3799f1de51bd6c (patch) | |
tree | 550c8a6dd5bea1d2595a8db1176b87a46f67e456 /Examples/python/smartptr | |
parent | cc94e5168f0853fcb7d95ea04cb93388df7d2b4d (diff) | |
parent | ec2b47ef2a4e5c879dde9eac8872db479ac55e74 (diff) | |
download | swig-baec830f75f24cdebfde4103fd3799f1de51bd6c.tar.gz |
Merge branch 'remove-dependency-on-2to3'
* remove-dependency-on-2to3:
Remove need for Python 2to3
Modify examples to be both Python 2 and 3 compatible
Remove python3 specific runme3.py test files
Convert python tests using 2to3
Convert python test scripts to be Python 2 and 3 compatible
Convert swigobject python test to be python 2 and 3 compatible
Convert two tests to work with both Python 2 and 3
Improve director_exception Python test
Remove further print statements from Python tests
Improve Python testing catching exceptions
Improve contract Python testcase testing
Remove print statements from Python tests
Diffstat (limited to 'Examples/python/smartptr')
-rw-r--r-- | Examples/python/smartptr/runme.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Examples/python/smartptr/runme.py b/Examples/python/smartptr/runme.py index 5f8b73476..f01636ad6 100644 --- a/Examples/python/smartptr/runme.py +++ b/Examples/python/smartptr/runme.py @@ -7,17 +7,17 @@ import example # ----- Object creation ----- -print "Creating some objects:" +print("Creating some objects:") cc = example.Circle(10) c = example.ShapePtr(cc) -print " Created circle", c +print(" Created circle %s" % c) ss = example.Square(10) s = example.ShapePtr(ss) -print " Created square", s +print(" Created square %s" % s) # ----- Access a static member ----- -print "\nA total of", example.cvar.Shape_nshapes, "shapes were created" +print("\nA total of %s shapes were created" % example.cvar.Shape_nshapes) # ----- Member data access ----- @@ -29,19 +29,19 @@ c.y = 30 s.x = -10 s.y = 5 -print "\nHere is their current position:" -print " Circle = (%f, %f)" % (c.x, c.y) -print " Square = (%f, %f)" % (s.x, s.y) +print("\nHere is their current position:") +print(" Circle = (%f, %f)" % (c.x, c.y)) +print(" Square = (%f, %f)" % (s.x, s.y)) # ----- Call some methods ----- -print "\nHere are some properties of the shapes:" +print("\nHere are some properties of the shapes:") for o in [c, s]: - print " ", o - print " area = ", o.area() - print " perimeter = ", o.perimeter() + print(" %s" % o) + print(" area = %s" % o.area()) + print(" perimeter = %s" % o.perimeter()) -print "\nGuess I'll clean up now" +print("\nGuess I'll clean up now") # Note: this invokes the virtual destructor del c @@ -50,5 +50,5 @@ del cc del ss s = 3 -print example.cvar.Shape_nshapes, "shapes remain" -print "Goodbye" +print("%d shapes remain" % example.cvar.Shape_nshapes) +print("Goodbye") |