From d4136cf02410e64972346301edcbd5ceb9c2962e Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sat, 11 Jan 2020 16:26:43 +0100 Subject: [PATCH] Remove six usage This repo does not support Python 2 anymore, so we don't need six for compatibility between Python2 and 3, convert six usage to Python 3 code. Change-Id: I48967b4e792dccade818389bf43707cde2e15c2b --- blazar_dashboard/test/test_data/exceptions.py | 5 ----- lower-constraints.txt | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/blazar_dashboard/test/test_data/exceptions.py b/blazar_dashboard/test/test_data/exceptions.py index 9f9610e..5e7c559 100644 --- a/blazar_dashboard/test/test_data/exceptions.py +++ b/blazar_dashboard/test/test_data/exceptions.py @@ -12,7 +12,6 @@ from openstack_dashboard.test.test_data import exceptions from openstack_dashboard.test.test_data import utils -import six import blazarclient.exception as blazar_exceptions @@ -38,12 +37,8 @@ def create_stubbed_exception(cls, status_code=500): def fake_str(self): return str(self.message) - def fake_unicode(self): - return six.text_type(self.message) - cls.__init__ = fake_init_exception cls.__str__ = fake_str - cls.__unicode__ = fake_unicode cls.silence_logging = True return cls(status_code, msg) diff --git a/lower-constraints.txt b/lower-constraints.txt index 786c360..6da9068 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -14,7 +14,7 @@ Django==2.2 extras==1.0.0 fixtures==3.0.0 flake8==2.5.5 -hacking==0.12.0 +hacking==1.1.0 horizon==17.1.0 idna==2.6 iso8601==0.1.12 @@ -54,7 +54,6 @@ rcssmin==1.0.6 requests==2.18.4 rfc3986==1.1.0 rjsmin==1.0.12 -six==1.11.0 stevedore==1.28.0 termcolor==1.1.0 testtools==2.2.0