diff options
| author | Stephen Finucane <sfinucan@redhat.com> | 2020-02-21 09:56:37 +0000 |
|---|---|---|
| committer | Stephen Finucane <sfinucan@redhat.com> | 2020-02-21 09:56:37 +0000 |
| commit | b9a7e03074cbaacc3f270b2b8228a5b85350a2de (patch) | |
| tree | 0542e32065b3f54624918c95d3d9a05b2c2da311 /novaclient | |
| parent | 8f50f84981f354e0dbac0af843d7d936c319b77f (diff) | |
| download | python-novaclient-b9a7e03074cbaacc3f270b2b8228a5b85350a2de.tar.gz | |
Random cleanups
Remove some cruft from Sphinx config files, drop the use of 'u' prefixed
strings, which are unnecessary in Python 3, and generally tidy stuff up.
Change-Id: Ib0f33576e160ec842d7fc82b4fcfee99829623d7
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
Diffstat (limited to 'novaclient')
| -rw-r--r-- | novaclient/tests/unit/test_utils.py | 8 | ||||
| -rw-r--r-- | novaclient/tests/unit/v2/test_hypervisors.py | 2 | ||||
| -rw-r--r-- | novaclient/tests/unit/v2/test_instance_usage_audit_log.py | 2 | ||||
| -rw-r--r-- | novaclient/tests/unit/v2/test_servers.py | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/novaclient/tests/unit/test_utils.py b/novaclient/tests/unit/test_utils.py index 0fb65c75..4a755a99 100644 --- a/novaclient/tests/unit/test_utils.py +++ b/novaclient/tests/unit/test_utils.py @@ -237,9 +237,9 @@ class PrintResultTestCase(test_utils.TestCase): @mock.patch('sys.stdout', io.StringIO()) def test_print_unicode_list(self): - objs = [_FakeResult("k", u'\u2026')] + objs = [_FakeResult("k", '\u2026')] utils.print_list(objs, ["Name", "Value"]) - s = u'\u2026' + s = '\u2026' self.assertEqual('+------+-------+\n' '| Name | Value |\n' '+------+-------+\n' @@ -314,9 +314,9 @@ class PrintResultTestCase(test_utils.TestCase): @mock.patch('sys.stdout', io.StringIO()) def test_print_unicode_dict(self): - dict = {'k': u'\u2026'} + dict = {'k': '\u2026'} utils.print_dict(dict) - s = u'\u2026' + s = '\u2026' self.assertEqual('+----------+-------+\n' '| Property | Value |\n' '+----------+-------+\n' diff --git a/novaclient/tests/unit/v2/test_hypervisors.py b/novaclient/tests/unit/v2/test_hypervisors.py index 3907687f..1c216b64 100644 --- a/novaclient/tests/unit/v2/test_hypervisors.py +++ b/novaclient/tests/unit/v2/test_hypervisors.py @@ -109,7 +109,7 @@ class HypervisorsTest(utils.FixturedTestCase): self.compare_to_expected(expected[idx], hyper) def test_hypervisor_search_unicode(self): - hypervisor_match = u'\\u5de5\\u4f5c' + hypervisor_match = '\\u5de5\\u4f5c' if self.cs.api_version >= api_versions.APIVersion('2.53'): self.assertRaises(exceptions.BadRequest, self.cs.hypervisors.search, diff --git a/novaclient/tests/unit/v2/test_instance_usage_audit_log.py b/novaclient/tests/unit/v2/test_instance_usage_audit_log.py index f3cb65cd..61b4ce73 100644 --- a/novaclient/tests/unit/v2/test_instance_usage_audit_log.py +++ b/novaclient/tests/unit/v2/test_instance_usage_audit_log.py @@ -38,6 +38,6 @@ class InstanceUsageAuditLogTests(utils.TestCase): '/os-instance_usage_audit_log/2016-12-10%2013%3A59%3A59.999999') def test_instance_usage_audit_log_with_before_unicode(self): - before = u'\\u5de5\\u4f5c' + before = '\\u5de5\\u4f5c' self.assertRaises(exceptions.BadRequest, self.cs.instance_usage_audit_log.get, before) diff --git a/novaclient/tests/unit/v2/test_servers.py b/novaclient/tests/unit/v2/test_servers.py index 6ad9df9a..d65ec145 100644 --- a/novaclient/tests/unit/v2/test_servers.py +++ b/novaclient/tests/unit/v2/test_servers.py @@ -55,7 +55,7 @@ class ServersTest(utils.FixturedTestCase): self.assertIsInstance(s, servers.Server) def test_filter_servers_unicode(self): - sl = self.cs.servers.list(search_opts={'name': u't€sting'}) + sl = self.cs.servers.list(search_opts={'name': 't€sting'}) self.assert_request_id(sl, fakes.FAKE_REQUEST_ID_LIST) self.assert_called('GET', '/servers/detail?name=t%E2%82%ACsting') for s in sl: |