Browse Source

Fixes for Py v23.

Hans Petter Langtangen 10 years ago
parent
commit
abe0388a72

+ 1 - 1
doc/src/tut/src-tut/vehicle0.py

@@ -45,7 +45,7 @@ drawing_tool.display()
 drawing_tool.savefig('tmp2.png')
 drawing_tool.savefig('tmp2.pdf')
 
-print fig
+print(fig)
 fig.recurse('fig')
 fig.graphviz_dot('fig', False)
 

+ 1 - 1
doc/src/tut/src-tut/vehicle0_dim.py

@@ -54,6 +54,6 @@ drawing_tool.display()
 drawing_tool.savefig('tmp1.png')
 drawing_tool.savefig('tmp1.pdf')
 
-print fig
+print(fig)
 
 raw_input()

+ 1 - 1
doc/src/tut/src-tut/vehicle1.py

@@ -35,7 +35,7 @@ drawing_tool.display()
 drawing_tool.savefig('tmp1.png')
 drawing_tool.savefig('tmp1.pdf')
 
-print fig
+print(fig)
 
 import time
 time.sleep(1)

+ 1 - 1
doc/src/tut/src-tut/vehicle2.py

@@ -42,7 +42,7 @@ def _test():
     vehicle = Vehicle0(w_1, R, L, H)
     vehicle.draw()
     drawing_tool.display()
-    print vehicle
+    print(vehicle)
     vehicle.graphviz_dot('Vehicle0', classname=False)
     vehicle.recurse('vehicle')
 

+ 0 - 1
examples/flow_over_gaussian.py

@@ -31,7 +31,6 @@ symmetry_line.set_linestyle('dashed')
 outlet = Line((W+L,0), (W+L,H))
 outlet.set_linestyle('dashed')
 
-#print repr(inlet_profile)
 fig = Composition({
     'bottom': wall,
     'inlet': inlet_profile,

+ 2 - 2
examples/wheel_on_inclined_plane.py

@@ -93,8 +93,8 @@ def inclined_plane():
     animate(fig, time_points, move, pause_per_frame=0,
             dt=time_points[1]-time_points[0])
 
-    print str(fig)
-    print repr(fig)
+    print(str(fig))
+    print(repr(fig))
 
 inclined_plane()
 raw_input()

+ 1 - 1
pysketcher/MatplotlibDraw.py

@@ -277,7 +277,7 @@ ax.set_aspect('equal')
         if fillcolor or fillpattern:
             if fillpattern != '':
                 fillcolor = 'white'
-            #print '%d coords, fillcolor="%s" linecolor="%s" fillpattern="%s"' % (x.size, fillcolor, linecolor, fillpattern)
+            #print('%d coords, fillcolor="%s" linecolor="%s" fillpattern="%s"' % (x.size, fillcolor, linecolor, fillpattern))
             [line] = self.ax.fill(x, y, fillcolor, edgecolor=linecolor,
                                   linewidth=linewidth, hatch=fillpattern)
             if self.instruction_file:

+ 2 - 2
pysketcher/tests/test_pysketcher.py

@@ -12,7 +12,7 @@ from pysketcher import *
 def equal_dict(d1, d2):
     """Return True if nested dicts d1 and d2 are equal."""
     for k in d1:
-        #print 'comparing', k
+        #print('comparing', k)
         if k not in d2:
             return False
         else:
@@ -24,7 +24,7 @@ def equal_dict(d1, d2):
                 d1_k = d1[k].replace("u'", "'")
                 d2_k = d2[k].replace("u'", "'")
                 if d1_k != d2_k:
-                    #print 'values differ: [%s] vs [%s]' % (d1_k, d2_k)
+                    #print('values differ: [%s] vs [%s]' % (d1_k, d2_k))
                     return False
     return True