From a7e7732104919d3f2ce541598ff795fa85b9f19f Mon Sep 17 00:00:00 2001 From: AJ Jordan Date: Fri, 1 Apr 2022 18:39:09 -0400 Subject: [PATCH 1/3] Run futurize --stage1 --- vigil | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/vigil b/vigil index 77b55a0..2b8d9be 100755 --- a/vigil +++ b/vigil @@ -1,5 +1,6 @@ #!/usr/bin/env python +from __future__ import print_function import re import sys import traceback @@ -57,23 +58,23 @@ def vigil_done(): with open(source_path, 'w') as f: f.writelines(cleansed) - print "" - print "" - print "------------------------------------------------------------------" - print "" - print "The ever vigilant watchers of your code have found malfeasance in:" - print "" + print("") + print("") + print("------------------------------------------------------------------") + print("") + print("The ever vigilant watchers of your code have found malfeasance in:") + print("") for fn, offense, _ in offenders: - print fn - print "Crime:", offense - print "" + print(fn) + print("Crime:", offense) + print("") - print "Each has been dealt an appropriate punishment." + print("Each has been dealt an appropriate punishment.") def vigil_uncaught(): raise_line = traceback.extract_tb(sys.exc_info()[2])[-1][1] - print "uncaught error from line ", raise_line + print("uncaught error from line ", raise_line) punish(raise_line, "Raised '%s' which was not caught." % sys.exc_info()[1]) try: From ba4399dc2d86969a1f36faa7c3b015b8e147e7a6 Mon Sep 17 00:00:00 2001 From: AJ Jordan Date: Fri, 1 Apr 2022 18:39:50 -0400 Subject: [PATCH 2/3] Run futurize --stage2 --- vigil | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vigil b/vigil index 2b8d9be..cb8d0f0 100755 --- a/vigil +++ b/vigil @@ -1,6 +1,8 @@ #!/usr/bin/env python from __future__ import print_function +from builtins import filter +from builtins import range import re import sys import traceback @@ -34,7 +36,7 @@ def punish(line, offense): # Clear the lines, but don't delete them. That way later failures will # have the right line number. - for i in xrange(start, end + 1): + for i in range(start, end + 1): source_lines[i] = '' def vigil_implore(ok, expr): @@ -54,7 +56,7 @@ def vigil_done(): return # Strip out the dirty impure lines. - cleansed = filter(len, source_lines) + cleansed = list(filter(len, source_lines)) with open(source_path, 'w') as f: f.writelines(cleansed) From ac0499f1732efbd03fefebfffb4f9a830763dce2 Mon Sep 17 00:00:00 2001 From: AJ Jordan Date: Fri, 1 Apr 2022 18:46:51 -0400 Subject: [PATCH 3/3] Fix off-by-one error --- vigil | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vigil b/vigil index cb8d0f0..72fbf2f 100755 --- a/vigil +++ b/vigil @@ -36,7 +36,7 @@ def punish(line, offense): # Clear the lines, but don't delete them. That way later failures will # have the right line number. - for i in range(start, end + 1): + for i in range(start, end): source_lines[i] = '' def vigil_implore(ok, expr):