diff options
| author | Yilin Yang <kerker@google.com> | 2020-09-22 14:59:00 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-09-24 07:19:04 +0000 |
| commit | 1577603a46906a17525d75aaf502a3b821736b2b (patch) | |
| tree | 76d61a08b37cab0948219ed1a2087501340e38e2 /extra | |
| parent | dec322f3a3d908564e9e9f4a1ffc418d9e061c0f (diff) | |
| download | chrome-ec-1577603a46906a17525d75aaf502a3b821736b2b.tar.gz | |
usb_power: Migrate powerlog.py to python2/3 compatible
BUG=chromium:1031705
BRANCH=master
TEST=`python3 powerlog_unittest.py` pass
TEST=`python2 powerlog_unittest.py` pass
Signed-off-by: kerker <kerker@chromium.org>
Change-Id: I8507a1a5dd4ad06c6311a7d9259a23b8a6377f6a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2422063
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Diffstat (limited to 'extra')
| -rwxr-xr-x | extra/usb_power/powerlog.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/extra/usb_power/powerlog.py b/extra/usb_power/powerlog.py index 10183a20dd..c7fe7477a7 100755 --- a/extra/usb_power/powerlog.py +++ b/extra/usb_power/powerlog.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python # Copyright 2016 The Chromium OS Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -7,6 +7,8 @@ or other usb device that exports a USB power logging interface. """ +# Note: This is a py2/3 compatible file. + from __future__ import print_function import argparse import array @@ -312,7 +314,7 @@ class Spower(object): """Clear pending reads on the stm32""" try: while True: - ret = self.wr_command("", read_count=512, rtimeout=100, wtimeout=50) + ret = self.wr_command(b"", read_count=512, rtimeout=100, wtimeout=50) self._logger.debug("Try Clear: read %s", "success" if ret == 0 else "failure") except: @@ -456,7 +458,7 @@ class Spower(object): datasize = self.report_header_size() + ina_count * record # Round to multiple of 4 bytes. - datasize = int(((datasize + 3) / 4) * 4) + datasize = int(((datasize + 3) // 4) * 4) return datasize @@ -485,7 +487,7 @@ class Spower(object): self._logger.debug("READ LINE WARNING: expected %d, got %d", expected_bytes, len(bytesread)) - packet_count = len(bytesread) / expected_bytes + packet_count = len(bytesread) // expected_bytes values = [] for i in range(0, packet_count): @@ -634,7 +636,7 @@ class powerlog(object): "sweetberry, or bad board file?)" % name) # Evict unused boards. - for key in self._pwr.keys(): + for key in list(self._pwr.keys()): if key not in used_boards: self._pwr.pop(key) |