openstack/monasca-tempest-plugin
Code Issues Proposed changes

Remove six

Browse Source 
Remove six Replace the following items with Python 3 style code.
- six.PY3
- six.moves.urllib.parse
- six.text_type

Story: 2008305
Task: 41363
Change-Id: I864492ffcd05edf8bb803bf9fbe6c599617e749b
This commit is contained in:
wangzihao
2020-12-07 10:14:11 +08:00
parent c0c22f800b
commit a46fb59245
14 changed files with 29 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
monasca_tempest_tests/services/elasticsearch_client.py
View File

@ -14,7 +14,6 @@
from oslo_config import cfg
from oslo_serialization import jsonutils as json
from six import PY3
from tempest.lib.common import rest_client
CONF = cfg.CONF
@ -35,7 +34,7 @@ class ElasticsearchClient(rest_client.RestClient):
@staticmethod
def deserialize(body):
body = body.decode('utf-8') if PY3 else body
body = body.decode('utf-8')
return json.loads(body.replace("\n", ""))
@staticmethod

3
monasca_tempest_tests/services/log_api_v3_client.py
View File

@ -12,8 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
from urllib.parse import urlencode
from oslo_serialization import jsonutils as json
from six.moves.urllib.parse import urlencode
from tempest import config
from tempest.lib.common import rest_client

3
monasca_tempest_tests/tests/api/base.py
View File

@ -12,7 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import six.moves.urllib.parse as urlparse
import urllib.parse as urlparse
from tempest.common import credentials_factory
from tempest import config
from tempest.lib import exceptions

2
monasca_tempest_tests/tests/api/helpers.py
View File

@ -14,8 +14,8 @@
# under the License.
import datetime
import time
import urllib.parse as urlparse
import six.moves.urllib.parse as urlparse
from tempest.lib.common.utils import data_utils
NUM_ALARM_DEFINITIONS = 2

11
monasca_tempest_tests/tests/api/test_alarm_definitions.py
View File

@ -14,9 +14,8 @@
# under the License.
import time
import urllib.parse as urlparse
import six.moves.urllib.parse as urlparse
from six import PY3
from tempest.lib.common.utils import data_utils
from tempest.lib import decorators
from tempest.lib import exceptions
@ -340,8 +339,8 @@ class TestAlarmDefinitions(base.BaseMonascaTest):
@decorators.attr(type="gate")
def test_list_alarm_definitions_with_multibyte_character(self):
rand_name = data_utils.rand_name('ａｌａｒｍ＿ｄｅｆｉｎｉｔｉｏｎ')
name = rand_name if PY3 else rand_name.decode('utf8')
description = 'ｄｅｓｃｒｉｐｔｉｏｎ' if PY3 else 'ｄｅｓｃｒｉｐｔｉｏｎ'.decode('utf8')
name = rand_name
description = 'ｄｅｓｃｒｉｐｔｉｏｎ'
response_body_list = self._create_alarm_definitions(
name=name,
@ -722,8 +721,8 @@ class TestAlarmDefinitions(base.BaseMonascaTest):
def test_get_alarm_definition_with_multibyte_character(self):
# Create an alarm definition
rand_name = data_utils.rand_name('ａｌａｒｍ＿ｄｅｆｉｎｉｔｉｏｎ')
name = rand_name if PY3 else rand_name.decode('utf-8')
description = 'ｄｅｓｃｒｉｐｔｉｏｎ' if PY3 else 'ｄｅｓｃｒｉｐｔｉｏｎ'.decode('utf8')
name = rand_name
description = 'ｄｅｓｃｒｉｐｔｉｏｎ'
response_body_list = self._create_alarm_definitions(
name=name,
description=description,

3
monasca_tempest_tests/tests/api/test_alarms.py
View File

@ -13,8 +13,7 @@
# under the License.
import time
import six.moves.urllib.parse as urlparse
import urllib.parse as urlparse
from monasca_tempest_tests.tests.api import base
from monasca_tempest_tests.tests.api import constants

3
monasca_tempest_tests/tests/api/test_alarms_count.py
View File

@ -13,8 +13,7 @@
# under the License.
import time
import six.moves.urllib.parse as parse
import urllib.parse as parse
from tempest.lib.common.utils import data_utils
from tempest.lib import decorators

3
monasca_tempest_tests/tests/api/test_dimensions.py
View File

@ -14,8 +14,7 @@
# under the License.
import time
from six.moves.urllib.parse import urlencode
from urllib.parse import urlencode
from tempest.lib.common.utils import data_utils
from tempest.lib import decorators

4
monasca_tempest_tests/tests/api/test_measurements.py
View File

@ -14,8 +14,6 @@
import time
from six import text_type
from monasca_tempest_tests.tests.api import base
from monasca_tempest_tests.tests.api import constants
from monasca_tempest_tests.tests.api import helpers
@ -391,7 +389,7 @@ class TestMeasurements(base.BaseMonascaTest):
self.assertEqual(set(element),
set(['columns', 'dimensions', 'id',
'measurements', 'name']))
self.assertTrue(type(element['name']) is text_type)
self.assertTrue(type(element['name']) is str)
self.assertTrue(type(element['dimensions']) is dict)
self.assertTrue(type(element['columns']) is list)
self.assertTrue(type(element['measurements']) is list)

10
monasca_tempest_tests/tests/api/test_metrics.py
View File

@ -16,9 +16,7 @@
# TODO(RMH): Check if ' should be added in the list of INVALID_CHARS.
# TODO(RMH): test_create_metric_no_value, should return 422 if value not sent
import time
from six.moves import urllib_parse as urlparse
from six import text_type
from urllib import parse as urlparse
from tempest.lib.common.utils import data_utils
from tempest.lib import decorators
@ -618,8 +616,8 @@ class TestMetrics(base.BaseMonascaTest):
def _verify_list_metrics_element(self, element, test_key=None,
test_value=None, test_name=None):
self.assertTrue(type(element['id']) is text_type)
self.assertTrue(type(element['name']) is text_type)
self.assertTrue(type(element['id']) is str)
self.assertTrue(type(element['name']) is str)
self.assertTrue(type(element['dimensions']) is dict)
self.assertEqual(set(element), set(['dimensions', 'id', 'name']))
self.assertTrue(str(element['id']) is not None)
@ -655,7 +653,7 @@ class TestMetrics(base.BaseMonascaTest):
if elements:
dimensions = elements[0]
dimension = dimensions['dimensions']
value = dimension[text_type(key)]
value = dimension[str(key)]
self.assertEqual(value_org, value)
break
else:

3
monasca_tempest_tests/tests/api/test_metrics_names.py
View File

@ -13,8 +13,7 @@
# under the License.
import time
from six.moves.urllib.parse import urlencode
from urllib.parse import urlencode
from monasca_tempest_tests.tests.api import base
from monasca_tempest_tests.tests.api import constants

12
monasca_tempest_tests/tests/api/test_notification_methods.py
View File

@ -13,9 +13,7 @@
# under the License.
import time
import six.moves.urllib.parse as urlparse
from six import text_type
from urllib import parse as urlparse
from monasca_tempest_tests.tests.api import base
from monasca_tempest_tests.tests.api import constants
@ -319,11 +317,11 @@ class TestNotificationMethods(base.BaseMonascaTest):
element = elements[0]
self.assertTrue(set(['id', 'links', 'name', 'type', 'address', 'period']) ==
set(element))
self.assertTrue(type(element['id']) is text_type)
self.assertTrue(type(element['id']) is str)
self.assertTrue(type(element['links']) is list)
self.assertTrue(type(element['name']) is text_type)
self.assertTrue(type(element['type']) is text_type)
self.assertTrue(type(element['address']) is text_type)
self.assertTrue(type(element['name']) is str)
self.assertTrue(type(element['type']) is str)
self.assertTrue(type(element['address']) is str)
resp, response_body = self.monasca_client.\
delete_notification_method(id)

10
monasca_tempest_tests/tests/api/test_statistics.py
View File

@ -14,10 +14,8 @@
# under the License.
import time
import six.moves.urllib.parse as urlparse
from six.moves.urllib.parse import urlencode
from six import text_type
import urllib.parse as urlparse
from urllib.parse import urlencode
from monasca_tempest_tests.tests.api import base
from monasca_tempest_tests.tests.api import constants
@ -480,9 +478,9 @@ class TestStatistics(base.BaseMonascaTest):
def _verify_element(self, element):
self.assertTrue(set(['id', 'name', 'dimensions', 'columns',
'statistics']) == set(element))
self.assertTrue(type(element['id']) is text_type)
self.assertTrue(type(element['id']) is str)
self.assertTrue(element['id'] is not None)
self.assertTrue(type(element['name']) is text_type)
self.assertTrue(type(element['name']) is str)
self.assertTrue(type(element['dimensions']) is dict)
self.assertEqual(len(element['dimensions']), 0)
self.assertTrue(type(element['columns']) is list)

1
requirements.txt
View File

@ -5,7 +5,6 @@
pbr!=2.1.0,>=2.0.0 # Apache-2.0
oslo.config>=5.2.0 # Apache-2.0
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
six>=1.10.0 # MIT
oslo.utils>=3.33.0 # Apache-2.0
tempest>=17.1.0 # Apache-2.0
oslotest>=3.2.0 # Apache-2.0