Reland "[Autotest] Python3 files/server/* migration"
Fixed the division errors
This is a reland of b05fb5a3dd205d085395c3e2f7d05127cabd07ec
TEST=network_WiFi_ChannelHop && network_WiFi_SimpleConnect.wifi_check24HT20
Original change's description:
> [Autotest] Python3 files/server/* migration
>
> Does not include subdirs
> TEST=applicable unittests, compiling in py2 and py3
> BUG=chromium:990593
>
> Change-Id: I668c7531e7fc926f9a20c3bf2bab0d62eb3e3926
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2318565
> Commit-Queue: Derek Beckett <[email protected]>
> Tested-by: Derek Beckett <[email protected]>
> Reviewed-by: Greg Edelston <[email protected]>
Bug: chromium:990593
Change-Id: I912aa024130987af313dc472a273267669e6b69c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2373204
Commit-Queue: Derek Beckett <[email protected]>
Tested-by: Derek Beckett <[email protected]>
Reviewed-by: Greg Edelston <[email protected]>
Reviewed-by: Gregory Nisbet <[email protected]>
Auto-Submit: Derek Beckett <[email protected]>
diff --git a/server/profiler.py b/server/profiler.py
index 38bc9b5..f206f6c 100644
--- a/server/profiler.py
+++ b/server/profiler.py
@@ -1,5 +1,10 @@
+# Lint as: python2, python3
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
import itertools
import common
+import six
def _get_unpassable_types(arg):
@@ -7,12 +12,12 @@
unpassable. If arg is an atomic type (e.g. int) it either returns an
empty set (if the type is passable) or a singleton of the type (if the
type is not passable). """
- if isinstance(arg, (basestring, int, long)):
+ if isinstance(arg, (six.string_types, int, int)):
return set()
elif isinstance(arg, (list, tuple, set, frozenset, dict)):
if isinstance(arg, dict):
# keys and values must both be passable
- parts = itertools.chain(arg.iterkeys(), arg.itervalues())
+ parts = itertools.chain(six.iterkeys(arg), six.itervalues(arg))
else:
# for all other containers we just iterate
parts = iter(arg)
