[autotest] Make server/site_tests python-3 compatible syntax-wise
Make the remaining files in server/site_tests compile as Python 3.
BUG=chromium:990593
TEST=python3 -m py_compile audio_AudioBasicBluetoothPlaybackRecord.py THROUGH tast/testdata/fake_tast.py
Change-Id: I5276ba4e250be8eede9604c744727c2a037243f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2302661
Commit-Queue: Gregory Nisbet <[email protected]>
Tested-by: Gregory Nisbet <[email protected]>
Reviewed-by: Hidehiko Abe <[email protected]>
Reviewed-by: Ilja H. Friedel <[email protected]>
diff --git a/server/site_tests/audio_AudioBasicBluetoothPlaybackRecord/audio_AudioBasicBluetoothPlaybackRecord.py b/server/site_tests/audio_AudioBasicBluetoothPlaybackRecord/audio_AudioBasicBluetoothPlaybackRecord.py
index 8e88948..805fceb 100644
--- a/server/site_tests/audio_AudioBasicBluetoothPlaybackRecord/audio_AudioBasicBluetoothPlaybackRecord.py
+++ b/server/site_tests/audio_AudioBasicBluetoothPlaybackRecord/audio_AudioBasicBluetoothPlaybackRecord.py
@@ -314,14 +314,14 @@
audio_test_utils.check_recorded_frequency(
golden_file, playback_recorder, check_anomaly=check_quality,
second_peak_ratio=playback_second_peak_ratio)
- except error.TestFail, e:
+ except error.TestFail as e:
error_messages += str(e)
try:
audio_test_utils.check_recorded_frequency(
golden_file, record_recorder, check_anomaly=check_quality,
second_peak_ratio=record_second_peak_ratio)
- except error.TestFail, e:
+ except error.TestFail as e:
error_messages += str(e)
if error_messages:
diff --git a/server/site_tests/firmware_Cr50ECReset/firmware_Cr50ECReset.py b/server/site_tests/firmware_Cr50ECReset/firmware_Cr50ECReset.py
index 3696957..57801bb 100644
--- a/server/site_tests/firmware_Cr50ECReset/firmware_Cr50ECReset.py
+++ b/server/site_tests/firmware_Cr50ECReset/firmware_Cr50ECReset.py
@@ -137,7 +137,7 @@
"""Verify EC hibernate"""
try:
self.ec_hibernate()
- except error.TestError, e:
+ except error.TestError as e:
if 'Could not put the EC into hibernate' in str(e):
raise error.TestNAError("EC hibernate doesn't work.")
finally:
diff --git a/server/site_tests/firmware_Cr50USB/firmware_Cr50USB.py b/server/site_tests/firmware_Cr50USB/firmware_Cr50USB.py
index 6374c0d..bdcb712 100644
--- a/server/site_tests/firmware_Cr50USB/firmware_Cr50USB.py
+++ b/server/site_tests/firmware_Cr50USB/firmware_Cr50USB.py
@@ -60,7 +60,7 @@
try:
# Run usb_updater command.
result = self.host.run("usb_updater -f")
- except Exception, e:
+ except Exception as e:
failed_runs.append(str(i))
fail_count += 1
logging.debug(e)
diff --git a/server/site_tests/platform_KernelErrorPaths/platform_KernelErrorPaths.py b/server/site_tests/platform_KernelErrorPaths/platform_KernelErrorPaths.py
index 3b3513b..3e9e641 100644
--- a/server/site_tests/platform_KernelErrorPaths/platform_KernelErrorPaths.py
+++ b/server/site_tests/platform_KernelErrorPaths/platform_KernelErrorPaths.py
@@ -24,7 +24,7 @@
# connection wedged for a long time.
self.client.run(
'sh -c "sync; sleep 1; %s" >/dev/null 2>&1 &' % command)
- except error.AutoservRunError, e:
+ except error.AutoservRunError as e:
# It is expected that this will cause a non-zero exit status.
pass
diff --git a/server/site_tests/tast/testdata/fake_tast.py b/server/site_tests/tast/testdata/fake_tast.py
index cb24151..5ffa223 100755
--- a/server/site_tests/tast/testdata/fake_tast.py
+++ b/server/site_tests/tast/testdata/fake_tast.py
@@ -58,7 +58,7 @@
for path, data in cmd['files_to_write'].iteritems():
dirname = os.path.dirname(path)
if not os.path.exists(dirname):
- os.makedirs(dirname, 0755)
+ os.makedirs(dirname, 0o0755)
with open(path, 'w') as f:
f.write(data)
