From d68951ac245150eeefa6e0f4156e4c1b5c9e9325 Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Tue, 12 Nov 2019 05:27:43 +0100 Subject: Python3: resources and libraries Change-Id: I1392c06b1d64f62b141d24c0d42a8e36913b15e2 Signed-off-by: Jan Gelety --- resources/libraries/python/TrafficScriptArg.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'resources/libraries/python/TrafficScriptArg.py') diff --git a/resources/libraries/python/TrafficScriptArg.py b/resources/libraries/python/TrafficScriptArg.py index 64d0747b27..247eccbc2f 100644 --- a/resources/libraries/python/TrafficScriptArg.py +++ b/resources/libraries/python/TrafficScriptArg.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -16,7 +16,7 @@ import argparse -class TrafficScriptArg(object): +class TrafficScriptArg: """Traffic scripts argument parser. Parse arguments for traffic script. Default has two arguments '--tx_if' @@ -37,18 +37,18 @@ class TrafficScriptArg(object): def __init__(self, more_args=None, opt_args=None): parser = argparse.ArgumentParser() - parser.add_argument("--tx_if", help="interface that sends traffic") - parser.add_argument("--rx_if", help="interface that receives traffic") + parser.add_argument(u"--tx_if", help=u"interface that sends traffic") + parser.add_argument(u"--rx_if", help=u"interface that receives traffic") if more_args is not None: for arg in more_args: - arg_name = '--{0}'.format(arg) + arg_name = f"--{arg}" parser.add_argument(arg_name) if opt_args is not None: for arg in opt_args: - arg_name = '--{0}'.format(arg) - parser.add_argument(arg_name, nargs='?', default='') + arg_name = f"--{arg}" + parser.add_argument(arg_name, nargs=u"?", default=u"") self._parser = parser self._args = vars(parser.parse_args()) @@ -63,6 +63,6 @@ class TrafficScriptArg(object): """ arg_val = self._args.get(arg_name) if arg_val is None: - raise Exception("Argument '{0}' not found".format(arg_name)) + raise Exception(f"Argument '{arg_name}' not found") return arg_val -- cgit 1.2.3-korg