From bf9e73cb0cb5ff383f7306d154b39e6ba7ac163c Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Mon, 27 Jul 2020 14:41:08 -0700 Subject: [PATCH 1/3] Use correct relative import for Python 2&3 --- utils/update_checkout/tests/test_update_worktree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/update_checkout/tests/test_update_worktree.py b/utils/update_checkout/tests/test_update_worktree.py index bed64b03c583e..bc51901880a80 100644 --- a/utils/update_checkout/tests/test_update_worktree.py +++ b/utils/update_checkout/tests/test_update_worktree.py @@ -12,7 +12,7 @@ import os -from scheme_mock import call_quietly +from .scheme_mock import call_quietly from . import scheme_mock From c7358fc7be7dcd030c03d48c5b6e347c30e87126 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Mon, 27 Jul 2020 14:41:27 -0700 Subject: [PATCH 2/3] Remove unused variable --- utils/update_checkout/update_checkout/update_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/update_checkout/update_checkout/update_checkout.py b/utils/update_checkout/update_checkout/update_checkout.py index 0f1f38dfb0ccc..2528873925d2c 100755 --- a/utils/update_checkout/update_checkout/update_checkout.py +++ b/utils/update_checkout/update_checkout/update_checkout.py @@ -166,7 +166,7 @@ def update_single_repository(pool_args): result = shell.run(['git', 'rev-parse', checkout_target]) revision = result[0].strip() shell.run(['git', 'checkout', revision], echo=True) - except Exception as e: + except Exception: raise originalException # It's important that we checkout, fetch, and rebase, in order. From 488a5eab4fccf6a0632b9f3d007a681210fffc59 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Mon, 27 Jul 2020 18:01:36 -0700 Subject: [PATCH 3/3] Fix import ordering per python_lint --- utils/update_checkout/tests/test_update_worktree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/update_checkout/tests/test_update_worktree.py b/utils/update_checkout/tests/test_update_worktree.py index bc51901880a80..0426c94b2ee1c 100644 --- a/utils/update_checkout/tests/test_update_worktree.py +++ b/utils/update_checkout/tests/test_update_worktree.py @@ -12,9 +12,9 @@ import os +from . import scheme_mock from .scheme_mock import call_quietly -from . import scheme_mock WORKTREE_NAME = "feature"