Skip to content

Commit 5e18bf5

Browse files
authored
Fix exception handling in python3 (#1324)
**- What I did** In python3, message is not an attribute of Exception. As a result, another exception will be thrown in exception handling code. ``` "Traceback (most recent call last):", " File \"/usr/local/bin/fdbshow\", line 154, in <module>", " main()", " File \"/usr/local/bin/fdbshow\", line 150, in main", " print(e.message)", "AttributeError: 'RuntimeError' object has no attribute 'message'" ``` This commit addressed the issue. **- How I did it** Relpace `e.message` with `str(e)`. Signed-off-by: bingwang <[email protected]>
1 parent b6221f4 commit 5e18bf5

12 files changed

+13
-13
lines changed

scripts/aclshow

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ def main():
212212
acls.previous_counters()
213213
acls.display_acl_stat(args.all)
214214
except Exception as e:
215-
print(e.message, file=sys.stderr)
215+
print(str(e), file=sys.stderr)
216216
sys.exit(1)
217217

218218
if __name__ == "__main__":

scripts/ecnconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ def main():
326326
sys.exit(1)
327327

328328
except Exception as e:
329-
print("Exception caught: ", e.message, file=sys.stderr)
329+
print("Exception caught: ", str(e), file=sys.stderr)
330330
sys.exit(1)
331331

332332
if __name__ == "__main__":

scripts/fdbclear

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def main():
5050
fdb.send_notification("ALL", "ALL")
5151
print("FDB entries are cleared.")
5252
except Exception as e:
53-
print(e.message)
53+
print(str(e))
5454
sys.exit(1)
5555

5656
if __name__ == "__main__":

scripts/fdbshow

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def main():
147147
fdb = FdbShow()
148148
fdb.display(args.vlan, args.port)
149149
except Exception as e:
150-
print(e.message)
150+
print(str(e))
151151
sys.exit(1)
152152

153153
if __name__ == "__main__":

scripts/lldpshow

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ def main():
201201
lldp.parse_info(lldp_detail_info)
202202
lldp.display_sum(lldp_detail_info)
203203
except Exception as e:
204-
print(e.message, file=sys.stderr)
204+
print(str(e), file=sys.stderr)
205205
sys.exit(1)
206206

207207

scripts/mmuconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def main(config):
151151
sys.exit(1)
152152

153153
except Exception as e:
154-
print("Exception caught:", e.message, file=sys.stderr)
154+
print("Exception caught:", str(e), file=sys.stderr)
155155
sys.exit(1)
156156

157157
if __name__ == "__main__":

scripts/natclear

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def main():
6363
nat.send_statistics_notification("STATISTICS", "ALL")
6464
print("\nNAT statistics are cleared.")
6565
except Exception as e:
66-
print(e.message)
66+
print(str(e))
6767
sys.exit(1)
6868

6969
if __name__ == "__main__":

scripts/natconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ def main():
367367
nat.fetch_nat_zone()
368368
nat.display_nat_zone()
369369
except Exception as e:
370-
print(e.message)
370+
print(str(e))
371371
sys.exit(1)
372372

373373
if __name__ == "__main__":

scripts/natshow

+1-1
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ def main():
404404
nat.display_count()
405405

406406
except Exception as e:
407-
print(e.message)
407+
print(str(e))
408408
sys.exit(1)
409409

410410
if __name__ == "__main__":

scripts/nbrshow

+1-1
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ def main():
261261
arp.display()
262262

263263
except Exception as e:
264-
print(e.message)
264+
print(str(e))
265265
sys.exit(1)
266266

267267

scripts/portconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def main():
9999
sys.exit(1)
100100

101101
except Exception as e:
102-
print(e.message, file=sys.stderr)
102+
print(str(e), file=sys.stderr)
103103
sys.exit(1)
104104

105105
if __name__ == "__main__":

scripts/sonic_sku_create.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ def create_sku_dir(self):
631631
try:
632632
shutil.copytree(self.base_sku_dir, self.new_sku_dir)
633633
except OSError as e:
634-
print(e.message, file=sys.stderr)
634+
print(str(e), file=sys.stderr)
635635

636636
def remove_sku_dir(self):
637637
# remove SKU directory
@@ -653,7 +653,7 @@ def remove_sku_dir(self):
653653
else:
654654
print("SKU directory: "+ self.new_sku_dir + " was NOT removed")
655655
except OSError as e:
656-
print(e.message, file=sys.stderr)
656+
print(str(e), file=sys.stderr)
657657

658658
def platform_specific(self):
659659
# Function that checks for Platform specific restrictions

0 commit comments

Comments
 (0)