Skip to content

Commit 616ace6

Browse files
sbinetsbinet
committed
gopy,_examples: use py2/py3 compatible syntax where possible
This CL makes sure we are more or less ready for python3. - import __future__.print_function so python2 can use the same print(foo, bar) syntax than python3 - use the python3 syntax for catching exceptions
1 parent 4eac7b0 commit 616ace6

File tree

3 files changed

+145
-139
lines changed

3 files changed

+145
-139
lines changed

‎_examples/hi/test.py

Lines changed: 135 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -2,254 +2,258 @@
22
# Use of this source code is governed by a BSD-style
33
# license that can be found in the LICENSE file.
44

5+
from __future__ import print_function
6+
57
import hi
68

7-
print "--- doc(hi)..."
8-
print hi.__doc__
9+
print("--- doc(hi)...")
10+
print(hi.__doc__)
911

10-
print "--- hi.GetUniverse():", hi.GetUniverse()
11-
print "--- hi.GetVersion():", hi.GetVersion()
12+
print("--- hi.GetUniverse():", hi.GetUniverse())
13+
print("--- hi.GetVersion():", hi.GetVersion())
1214

13-
print "--- hi.GetDebug():",hi.GetDebug()
14-
print "--- hi.SetDebug(true)"
15+
print("--- hi.GetDebug():",hi.GetDebug())
16+
print("--- hi.SetDebug(true)")
1517
hi.SetDebug(True)
16-
print "--- hi.GetDebug():",hi.GetDebug()
17-
print "--- hi.SetDebug(false)"
18+
print("--- hi.GetDebug():",hi.GetDebug())
19+
print("--- hi.SetDebug(false)")
1820
hi.SetDebug(False)
19-
print "--- hi.GetDebug():",hi.GetDebug()
21+
print("--- hi.GetDebug():",hi.GetDebug())
2022

21-
print "--- hi.GetAnon():",hi.GetAnon()
23+
print("--- hi.GetAnon():",hi.GetAnon())
2224
anon = hi.NewPerson('you',24)
23-
print "--- new anon:",anon
24-
print "--- hi.SetAnon(hi.NewPerson('you', 24))..."
25+
print("--- new anon:",anon)
26+
print("--- hi.SetAnon(hi.NewPerson('you', 24))...")
2527
hi.SetAnon(anon)
26-
print "--- hi.GetAnon():",hi.GetAnon()
28+
print("--- hi.GetAnon():",hi.GetAnon())
2729

28-
print "--- doc(hi.Hi)..."
29-
print hi.Hi.__doc__
30+
print("--- doc(hi.Hi)...")
31+
print(hi.Hi.__doc__)
3032

31-
print "--- hi.Hi()..."
33+
print("--- hi.Hi()...")
3234
hi.Hi()
3335

34-
print "--- doc(hi.Hello)..."
35-
print hi.Hello.__doc__
36+
print("--- doc(hi.Hello)...")
37+
print(hi.Hello.__doc__)
3638

37-
print "--- hi.Hello('you')..."
39+
print("--- hi.Hello('you')...")
3840
hi.Hello("you")
3941

40-
print "--- doc(hi.Add)..."
41-
print hi.Add.__doc__
42+
print("--- doc(hi.Add)...")
43+
print(hi.Add.__doc__)
4244

43-
print "--- hi.Add(1, 41)..."
44-
print hi.Add(1,41)
45+
print("--- hi.Add(1, 41)...")
46+
print(hi.Add(1,41))
4547

46-
print "--- hi.Concat('4', '2')..."
47-
print hi.Concat("4","2")
48+
print("--- hi.Concat('4', '2')...")
49+
print(hi.Concat("4","2"))
4850

49-
print "--- hi.LookupQuestion(42)..."
50-
print hi.LookupQuestion(42)
51+
print("--- hi.LookupQuestion(42)...")
52+
print(hi.LookupQuestion(42))
5153

52-
print "--- hi.LookupQuestion(12)..."
54+
print("--- hi.LookupQuestion(12)...")
5355
try:
5456
hi.LookupQuestion(12)
55-
print "*ERROR* no exception raised!"
56-
except Exception, err:
57-
print "caught:", err
57+
print("*ERROR* no exception raised!")
58+
except Exception as err:
59+
print("caught:", err)
5860
pass
5961

60-
print "--- doc(hi.Person):"
61-
print hi.Person.__doc__
62+
print("--- doc(hi.Person):")
63+
print(hi.Person.__doc__)
6264

63-
print "--- p = hi.Person()..."
65+
print("--- p = hi.Person()...")
6466
p = hi.Person()
65-
print dir(p)
66-
print "--- p:", p
67+
print(dir(p))
68+
print("--- p:", p)
6769

68-
print "--- p.Name:", p.Name
69-
print "--- p.Age:",p.Age
70+
print("--- p.Name:", p.Name)
71+
print("--- p.Age:",p.Age)
7072

71-
print "--- doc(hi.Greet):"
72-
print p.Greet.__doc__
73-
print "--- p.Greet()..."
74-
print p.Greet()
73+
print("--- doc(hi.Greet):")
74+
print(p.Greet.__doc__)
75+
print("--- p.Greet()...")
76+
print(p.Greet())
7577

76-
print "--- p.String()..."
77-
print p.String()
78+
print("--- p.String()...")
79+
print(p.String())
7880

79-
print "--- doc(p):"
80-
print p.__doc__
81+
print("--- doc(p):")
82+
print(p.__doc__)
8183

82-
print "--- p.Name = \"foo\"..."
84+
print("--- p.Name = \"foo\"...")
8385
p.Name = "foo"
8486

85-
print "--- p.Age = 42..."
87+
print("--- p.Age = 42...")
8688
p.Age = 42
8789

88-
print "--- p.String()..."
89-
print p.String()
90-
print "--- p.Age:", p.Age
91-
print "--- p.Name:",p.Name
90+
print("--- p.String()...")
91+
print(p.String())
92+
print("--- p.Age:", p.Age)
93+
print("--- p.Name:",p.Name)
9294

93-
print "--- p.Work(2)..."
95+
print("--- p.Work(2)...")
9496
p.Work(2)
9597

96-
print "--- p.Work(24)..."
98+
print("--- p.Work(24)...")
9799
try:
98100
p.Work(24)
99-
print "*ERROR* no exception raised!"
100-
except Exception, err:
101-
print "caught:", err
101+
print("*ERROR* no exception raised!")
102+
except Exception as err:
103+
print("caught:", err)
102104
pass
103105

104-
print "--- p.Salary(2):", p.Salary(2)
106+
print("--- p.Salary(2):", p.Salary(2))
105107
try:
106-
print "--- p.Salary(24):",p.Salary(24)
107-
print "*ERROR* no exception raised!"
108-
except Exception, err:
109-
print "caught:", err
108+
print("--- p.Salary(24):",p.Salary(24))
109+
print("*ERROR* no exception raised!")
110+
except Exception as err:
111+
print("--- p.Salary(24): caught:", err)
110112
pass
111113

112114
## test ctor args
113-
print "--- Person.__init__"
115+
print("--- Person.__init__")
114116
try:
115117
hi.Person(1)
116-
print "*ERROR* no exception raised!"
117-
except Exception, err:
118-
print "caught:", err, "| err-type:",type(err)
118+
print("*ERROR* no exception raised!")
119+
except Exception as err:
120+
print("caught:", err, "| err-type:",type(err))
119121
pass
120122

121123
try:
122124
hi.Person("name","2")
123-
print "*ERROR* no exception raised!"
124-
except Exception, err:
125-
print "caught:", err, "| err-type:",type(err)
125+
print("*ERROR* no exception raised!")
126+
except Exception as err:
127+
print("caught:", err, "| err-type:",type(err))
126128
pass
127129

128130
try:
129131
hi.Person("name",2,3)
130-
print "*ERROR* no exception raised!"
131-
except Exception, err:
132-
print "caught:", err, "| err-type:",type(err)
132+
print("*ERROR* no exception raised!")
133+
except Exception as err:
134+
print("caught:", err, "| err-type:",type(err))
133135
pass
134136

135137
p = hi.Person("name")
136-
print p
138+
print(p)
137139
p = hi.Person("name", 42)
138-
print p
140+
print(p)
139141
p = hi.Person(Name="name", Age=42)
140-
print p
142+
print(p)
141143
p = hi.Person(Age=42, Name="name")
142-
print p
144+
print(p)
143145

144146
## test ctors
145-
print "--- hi.NewPerson('me', 666):", hi.NewPerson("me", 666)
146-
print "--- hi.NewPersonWithAge(666):", hi.NewPersonWithAge(666)
147-
print "--- hi.NewActivePerson(4):", hi.NewActivePerson(4)
147+
print("--- hi.NewPerson('me', 666):", hi.NewPerson("me", 666))
148+
print("--- hi.NewPersonWithAge(666):", hi.NewPersonWithAge(666))
149+
print("--- hi.NewActivePerson(4):")
150+
p = hi.NewActivePerson(4)
151+
print(p)
148152

149153
## test Couple
150-
print "--- c = hi.Couple()..."
154+
print("--- c = hi.Couple()...")
151155
c = hi.Couple()
152-
print c
153-
print "--- c.P1:", c.P1
156+
print(c)
157+
print("--- c.P1:", c.P1)
154158
c.P1 = hi.NewPerson("tom", 5)
155159
c.P2 = hi.NewPerson("bob", 2)
156-
print "--- c:", c
160+
print("--- c:", c)
157161

158-
print "--- c = hi.NewCouple(tom, bob)..."
162+
print("--- c = hi.NewCouple(tom, bob)...")
159163
c = hi.NewCouple(hi.NewPerson("tom", 50), hi.NewPerson("bob", 41))
160-
print c
164+
print(c)
161165
c.P1.Name = "mom"
162166
c.P2.Age = 51
163-
print c
167+
print(c)
164168

165169
## test Couple.__init__
166-
print "--- Couple.__init__"
170+
print("--- Couple.__init__")
167171
c = hi.Couple(hi.Person("p1", 42))
168-
print c
172+
print(c)
169173
c = hi.Couple(hi.Person("p1", 42), hi.Person("p2", 52))
170-
print c
174+
print(c)
171175
c = hi.Couple(P1=hi.Person("p1", 42), P2=hi.Person("p2", 52))
172-
print c
176+
print(c)
173177
c = hi.Couple(P2=hi.Person("p1", 42), P1=hi.Person("p2", 52))
174-
print c
178+
print(c)
175179

176180
try:
177181
hi.Couple(1)
178-
print "*ERROR* no exception raised!"
179-
except Exception, err:
180-
print "caught:", err, "| err-type:",type(err)
182+
print("*ERROR* no exception raised!")
183+
except Exception as err:
184+
print("caught:", err, "| err-type:",type(err))
181185
pass
182186

183187
try:
184188
hi.Couple(1,2)
185-
print "*ERROR* no exception raised!"
186-
except Exception, err:
187-
print "caught:", err, "| err-type:",type(err)
189+
print("*ERROR* no exception raised!")
190+
except Exception as err:
191+
print("caught:", err, "| err-type:",type(err))
188192
pass
189193

190194
try:
191195
hi.Couple(P2=1)
192-
print "*ERROR* no exception raised!"
193-
except Exception, err:
194-
print "caught:", err, "| err-type:",type(err)
196+
print("*ERROR* no exception raised!")
197+
except Exception as err:
198+
print("caught:", err, "| err-type:",type(err))
195199
pass
196200

197201
### test gc
198-
print "--- testing GC..."
202+
print("--- testing GC...")
199203
NMAX = 100000
200204
objs = []
201205
for i in range(NMAX):
202206
p1 = hi.NewPerson("p1-%d" % i, i)
203207
p2 = hi.NewPerson("p2-%d" % i, i)
204208
objs.append(hi.NewCouple(p1,p2))
205209
pass
206-
print "--- len(objs):",len(objs)
210+
print("--- len(objs):",len(objs))
207211
vs = []
208212
for i,o in enumerate(objs):
209213
v = "%d: %s" % (i, o)
210214
vs.append(v)
211215
pass
212-
print "--- len(vs):",len(vs)
216+
print("--- len(vs):",len(vs))
213217
del objs
214-
print "--- testing GC... [ok]"
218+
print("--- testing GC... [ok]")
215219

216-
print "--- testing array..."
220+
print("--- testing array...")
217221
arr = hi.GetIntArray()
218-
print "arr:",arr
219-
print "len(arr):",len(arr)
220-
print "arr[0]:",arr[0]
221-
print "arr[1]:",arr[1]
222+
print("arr:",arr)
223+
print("len(arr):",len(arr))
224+
print("arr[0]:",arr[0])
225+
print("arr[1]:",arr[1])
222226
try:
223-
print "arr[2]:", arr[2]
224-
print "*ERROR* no exception raised!"
225-
except Exception, err:
226-
print "caught:",err
227+
print("arr[2]:", arr[2])
228+
print("*ERROR* no exception raised!")
229+
except Exception as err:
230+
print("arr[2]: caught:",err)
227231
pass
228232
arr[1] = 42
229-
print "arr:",arr
230-
print "len(arr):",len(arr)
233+
print("arr:",arr)
234+
print("len(arr):",len(arr))
231235
try:
232-
print "mem(arr):",len(memoryview(arr))
233-
except Exception, err:
234-
print "caught:",err
236+
print("mem(arr):",len(memoryview(arr)))
237+
except Exception as err:
238+
print("mem(arr): caught:",err)
235239
pass
236240

237-
print "--- testing slice..."
241+
print("--- testing slice...")
238242
s = hi.GetIntSlice()
239-
print "slice:",s
240-
print "len(slice):",len(s)
241-
print "slice[0]:",s[0]
242-
print "slice[1]:",s[1]
243+
print("slice:",s)
244+
print("len(slice):",len(s))
245+
print("slice[0]:",s[0])
246+
print("slice[1]:",s[1])
243247
try:
244-
print "slice[2]:", s[2]
245-
print "*ERROR* no exception raised!"
246-
except Exception, err:
247-
print "caught:",err
248+
print("slice[2]:", s[2])
249+
print("*ERROR* no exception raised!")
250+
except Exception as err:
251+
print("slice[2]: caught:",err)
248252
pass
249253
s[1] = 42
250-
print "slice:",s
251-
print "len(slice):",len(s)
254+
print("slice:",s)
255+
print("len(slice):",len(s))
252256
try:
253-
print "mem(slice):",len(memoryview(s))
257+
print("mem(slice):",len(memoryview(s)))
254258
except Exception as err:
255-
print "caught:",err
259+
print("mem(slice): caught:",err)

0 commit comments

Comments
 (0)