[Autotest][PY3] Migrating client/cros (debugd_util -> kernel_config)
Migrating client/cros from debugd_util.py -> kernel_config.py to python3.
BUG=chromium:990593
TEST= py_compile in py2 and py3. CQ. dummy_Pass. policy_ tests for httpd
Change-Id: I565e11a7d4e18fa9414928df2fd184be1786506e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2487216
Reviewed-by: Greg Edelston <[email protected]>
Commit-Queue: Derek Beckett <[email protected]>
Tested-by: Derek Beckett <[email protected]>
diff --git a/client/cros/dhcp_packet.py b/client/cros/dhcp_packet.py
index bff9aa4..695fe1e 100644
--- a/client/cros/dhcp_packet.py
+++ b/client/cros/dhcp_packet.py
@@ -1,3 +1,4 @@
+# Lint as: python2, python3
# Copyright (c) 2012 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.
@@ -27,9 +28,14 @@
file still pass.
"""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
import collections
import logging
import random
+from six.moves import range
import socket
import struct
@@ -717,7 +723,7 @@
@returns The MessageType for this packet, or MESSAGE_TYPE_UNKNOWN.
"""
- if (self._options.has_key(OPTION_DHCP_MESSAGE_TYPE) and
+ if (OPTION_DHCP_MESSAGE_TYPE in self._options and
self._options[OPTION_DHCP_MESSAGE_TYPE] > 0 and
self._options[OPTION_DHCP_MESSAGE_TYPE] < len(MESSAGE_TYPE_BY_NUM)):
return MESSAGE_TYPE_BY_NUM[self._options[OPTION_DHCP_MESSAGE_TYPE]]
