From cfdebe3c7861d1cd756cbe68458473d288d5dc24 Mon Sep 17 00:00:00 2001 From: likui Date: Fri, 4 Sep 2020 09:13:41 +0800 Subject: [PATCH] Remove six.PY3 The Python 2.7 Support has been dropped since Ussuri. So remove hacking rules for compatibility between python 2 and 3. Change-Id: I5ec70dc8153dc0ab0bf0323ffb814822566da6cc --- osc_placement/tests/functional/base.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/osc_placement/tests/functional/base.py b/osc_placement/tests/functional/base.py index a40c291..21685d5 100644 --- a/osc_placement/tests/functional/base.py +++ b/osc_placement/tests/functional/base.py @@ -41,12 +41,8 @@ RESET_LOGGING = [ RP_PREFIX = 'osc-placement-functional-tests-' -# argparse in python 2 and 3 have different error messages -ARGUMENTS_MISSING = 'too few arguments' -ARGUMENTS_REQUIRED = 'argument %s is required' -if six.PY3: - ARGUMENTS_MISSING = 'the following arguments are required' - ARGUMENTS_REQUIRED = 'the following arguments are required: %s' +ARGUMENTS_MISSING = 'the following arguments are required' +ARGUMENTS_REQUIRED = 'the following arguments are required: %s' class CommandException(Exception):