From ea2e330e43c182dc16b0111ebc69ee5a71ee4ce1 Mon Sep 17 00:00:00 2001 From: Gavin Mak Date: Sat, 11 Mar 2023 06:46:20 +0000 Subject: Format codebase with black and check formatting in CQ Apply rules set by https://gerrit-review.googlesource.com/c/git-repo/+/362954/ across the codebase and fix any lingering errors caught by flake8. Also check black formatting in run_tests (and CQ). Bug: b/267675342 Change-Id: I972d77649dac351150dcfeb1cd1ad0ea2efc1956 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/363474 Reviewed-by: Mike Frysinger Tested-by: Gavin Mak Commit-Queue: Gavin Mak --- fetch.py | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) (limited to 'fetch.py') diff --git a/fetch.py b/fetch.py index c954a9c2..31f8152f 100644 --- a/fetch.py +++ b/fetch.py @@ -21,25 +21,29 @@ from urllib.request import urlopen def fetch_file(url, verbose=False): - """Fetch a file from the specified source using the appropriate protocol. + """Fetch a file from the specified source using the appropriate protocol. - Returns: - The contents of the file as bytes. - """ - scheme = urlparse(url).scheme - if scheme == 'gs': - cmd = ['gsutil', 'cat', url] - try: - result = subprocess.run( - cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, - check=True) - if result.stderr and verbose: - print('warning: non-fatal error running "gsutil": %s' % result.stderr, - file=sys.stderr) - return result.stdout - except subprocess.CalledProcessError as e: - print('fatal: error running "gsutil": %s' % e.stderr, - file=sys.stderr) - sys.exit(1) - with urlopen(url) as f: - return f.read() + Returns: + The contents of the file as bytes. + """ + scheme = urlparse(url).scheme + if scheme == "gs": + cmd = ["gsutil", "cat", url] + try: + result = subprocess.run( + cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=True + ) + if result.stderr and verbose: + print( + 'warning: non-fatal error running "gsutil": %s' + % result.stderr, + file=sys.stderr, + ) + return result.stdout + except subprocess.CalledProcessError as e: + print( + 'fatal: error running "gsutil": %s' % e.stderr, file=sys.stderr + ) + sys.exit(1) + with urlopen(url) as f: + return f.read() -- cgit v1.2.3-54-g00ecf