Skip to content

Commit 61dc82c

Browse files
author
jacky06
committed
Remove six
We don't need this in a Python 3-only world. Change-Id: Ibeb506281e88b44d454497d06f9187308859ac9c
1 parent f4b1a3f commit 61dc82c

4 files changed

Lines changed: 4 additions & 10 deletions

File tree

cloudkittyclient/common/base.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@
1212
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
1313
# License for the specific language governing permissions and limitations
1414
# under the License.
15-
#
16-
from string import Formatter as StringFormatter
1715

18-
from six import add_metaclass
19-
from six.moves.urllib.parse import urlencode
16+
from string import Formatter as StringFormatter
17+
from urllib.parse import urlencode
2018

2119
from cloudkittyclient import utils
2220

@@ -31,8 +29,7 @@ def __new__(cls, *args, **kwargs):
3129
)
3230

3331

34-
@add_metaclass(HttpDecoratorMeta)
35-
class BaseManager(object):
32+
class BaseManager(object, metaclass=HttpDecoratorMeta):
3633
"""Base class for Endpoint Manager objects."""
3734

3835
url = ''

cloudkittyclient/v2/dataframes.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
# under the License.
1414
#
1515
import json
16-
import six
1716

1817
from cloudkittyclient.common import base
1918
from cloudkittyclient import exc
@@ -36,7 +35,7 @@ def add_dataframes(self, **kwargs):
3635
if not dataframes:
3736
raise exc.ArgumentRequired("'dataframes' argument is required")
3837

39-
if not isinstance(dataframes, six.string_types):
38+
if not isinstance(dataframes, str):
4039
try:
4140
dataframes = json.dumps(dataframes)
4241
except TypeError:

lower-constraints.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ oslo.utils==3.35 # Apache-2.0
66
oslo.log==3.36 # Apache-2.0
77
PyYAML==3.12 # MIT
88
jsonpath-rw-ext==1.0 # Apache-2.0
9-
six==1.11 # MIT
109
os-client-config==1.29.0 # Apache-2.0
1110
osc-lib==1.12.1 # Apache-2.0
1211

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ oslo.utils>=3.35 # Apache-2.0
99
oslo.log>=3.36 # Apache-2.0
1010
PyYAML>=3.12 # MIT
1111
jsonpath-rw-ext>=1.0 # Apache-2.0
12-
six>=1.11 # MIT
1312
os-client-config>=1.29.0 # Apache-2.0
1413
osc-lib>=1.12.1 # Apache-2.0

0 commit comments

Comments
 (0)