From 1f0298dd1b1a939cb215e7b474178b217f8347f4 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Tue, 24 Jan 2012 11:54:54 +1100 Subject: python: Change except: statement to except Exception: This way we only catch true exceptions and keyboard interrupts are not caught here. Autobuild-User: Amitay Isaacs Autobuild-Date: Tue Jan 24 03:32:40 CET 2012 on sn-devel-104 --- source4/scripting/devel/repl_cleartext_pwd.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/scripting/devel/repl_cleartext_pwd.py') diff --git a/source4/scripting/devel/repl_cleartext_pwd.py b/source4/scripting/devel/repl_cleartext_pwd.py index 840d281a6e..5eebc8689d 100755 --- a/source4/scripting/devel/repl_cleartext_pwd.py +++ b/source4/scripting/devel/repl_cleartext_pwd.py @@ -101,7 +101,7 @@ if __name__ == "__main__": if len(args) >= 7: try: attid = int(args[4], 16) - except: + except Exception: attid = int(args[4]) attname = args[5] attmode = args[6] @@ -145,7 +145,7 @@ if __name__ == "__main__": assert store_dn == dn #print "%s" % ndr_print(store_hwm) #print "%s" % ndr_print(store_utdv) - except: + except Exception: store_dn = dn store_hwm = drsuapi.DsReplicaHighWaterMark() store_hwm.tmp_highest_usn = 0 @@ -325,7 +325,7 @@ if __name__ == "__main__": cleartext_unicode = unicode(cleartext_utf16, 'utf-16-le') cleartext_utf8 = cleartext_unicode.encode('utf-8') gls.add_attr(obj.identifier.dn, clear_utf8_name, [cleartext_utf8]) - except: + except Exception: pass if attvals is not None: -- cgit