From 81e10cc16d6d8f99c3eeb85bd9af5a863ae07729 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Tue, 12 Mar 2019 08:22:21 +0100 Subject: [PATCH] PAPI: Use Python3 for PapiProvider Change-Id: I39e237db5cba8311ae11fd709b10a17297f3a729 Signed-off-by: Tibor Frank --- resources/libraries/python/PapiExecutor.py | 2 +- resources/tools/papi/vpp_papi_provider.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 resources/tools/papi/vpp_papi_provider.py diff --git a/resources/libraries/python/PapiExecutor.py b/resources/libraries/python/PapiExecutor.py index a51cb76654..1971e62d95 100644 --- a/resources/libraries/python/PapiExecutor.py +++ b/resources/libraries/python/PapiExecutor.py @@ -341,7 +341,7 @@ class PapiExecutor(object): api_data_processed = self._process_api_data(api_data) json_data = json.dumps(api_data_processed) - cmd = "python {fw_dir}/{papi_provider} --json_data '{json}'".format( + cmd = "{fw_dir}/{papi_provider} --json_data '{json}'".format( fw_dir=Constants.REMOTE_FW_DIR, papi_provider=Constants.RESOURCES_PAPI_PROVIDER, json=json_data) diff --git a/resources/tools/papi/vpp_papi_provider.py b/resources/tools/papi/vpp_papi_provider.py old mode 100644 new mode 100755 index e5e030c6ab..d41c4fbe54 --- a/resources/tools/papi/vpp_papi_provider.py +++ b/resources/tools/papi/vpp_papi_provider.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (c) 2019 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); @@ -185,7 +185,7 @@ def main(): api_args_unicode = data['api_args'] api_reply = dict(api_name=api_name) api_args = dict() - for a_k, a_v in api_args_unicode.iteritems(): + for a_k, a_v in api_args_unicode.items(): value = binascii.unhexlify(a_v) if isinstance(a_v, unicode) else a_v api_args[str(a_k)] = value try: -- 2.16.6