Remove six

We don't need this in a Python 3-only world.

Change-Id: Ibeb506281e88b44d454497d06f9187308859ac9c
This commit is contained in:
jacky06 2020-05-10 23:05:04 +08:00
parent f4b1a3f224
commit 61dc82cb54
4 changed files with 4 additions and 10 deletions

View File

@ -12,11 +12,9 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
from string import Formatter as StringFormatter
from six import add_metaclass
from six.moves.urllib.parse import urlencode
from string import Formatter as StringFormatter
from urllib.parse import urlencode
from cloudkittyclient import utils
@ -31,8 +29,7 @@ class HttpDecoratorMeta(type):
)
@add_metaclass(HttpDecoratorMeta)
class BaseManager(object):
class BaseManager(object, metaclass=HttpDecoratorMeta):
"""Base class for Endpoint Manager objects."""
url = ''

View File

@ -13,7 +13,6 @@
# under the License.
#
import json
import six
from cloudkittyclient.common import base
from cloudkittyclient import exc
@ -36,7 +35,7 @@ class DataframesManager(base.BaseManager):
if not dataframes:
raise exc.ArgumentRequired("'dataframes' argument is required")
if not isinstance(dataframes, six.string_types):
if not isinstance(dataframes, str):
try:
dataframes = json.dumps(dataframes)
except TypeError:

View File

@ -6,7 +6,6 @@ oslo.utils==3.35 # Apache-2.0
oslo.log==3.36 # Apache-2.0
PyYAML==3.12 # MIT
jsonpath-rw-ext==1.0 # Apache-2.0
six==1.11 # MIT
os-client-config==1.29.0 # Apache-2.0
osc-lib==1.12.1 # Apache-2.0

View File

@ -9,6 +9,5 @@ oslo.utils>=3.35 # Apache-2.0
oslo.log>=3.36 # Apache-2.0
PyYAML>=3.12 # MIT
jsonpath-rw-ext>=1.0 # Apache-2.0
six>=1.11 # MIT
os-client-config>=1.29.0 # Apache-2.0
osc-lib>=1.12.1 # Apache-2.0