Skip to content

Commit 6187697

Browse files
authored
[Python3] Fix test failures in update_checkout (#33141)
Use correct relative import for Python 2&3 Remove unused variable Fix import ordering per python_lint
1 parent 421ebd2 commit 6187697

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

utils/update_checkout/tests/test_update_worktree.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212

1313
import os
1414

15-
from scheme_mock import call_quietly
16-
1715
from . import scheme_mock
16+
from .scheme_mock import call_quietly
17+
1818

1919
WORKTREE_NAME = "feature"
2020

utils/update_checkout/update_checkout/update_checkout.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ def update_single_repository(pool_args):
166166
result = shell.run(['git', 'rev-parse', checkout_target])
167167
revision = result[0].strip()
168168
shell.run(['git', 'checkout', revision], echo=True)
169-
except Exception as e:
169+
except Exception:
170170
raise originalException
171171

172172
# It's important that we checkout, fetch, and rebase, in order.

0 commit comments

Comments
 (0)