Removed six from requirements, as Blender isn't shipped with it.

This commit is contained in:
2016-03-08 16:01:22 +01:00
parent 8a29a20462
commit 87ebdb0b2f
3 changed files with 10 additions and 4 deletions

View File

@@ -1,6 +1,6 @@
import json
import re
import six
import sys
from datetime import datetime
try:
@@ -8,6 +8,13 @@ try:
except ImportError:
from urllib import urlencode
# from six:
PY3 = sys.version_info[0] == 3
if PY3:
text_type = str
else:
text_type = unicode
def join_url(url, *paths):
"""
@@ -38,7 +45,7 @@ def join_url_params(url, params):
def convert_to_string(param):
if isinstance(param, dict):
return json.dumps(param)
if isinstance(param, six.text_type):
if isinstance(param, text_type):
return param.encode('utf-8')
return param

View File

@@ -1,6 +1,5 @@
pyOpenSSL==0.15.1
requests==2.9.1
six==1.10.0
tox>=2.3.1
wheel>=0.29.0

View File

@@ -16,7 +16,7 @@ setup(
license='BSD License',
description='The Pillar REST SDK provides Python APIs to communicate to the Pillar webservices.',
long_description=long_description,
install_requires=['requests>=1.0.0', 'six>=1.0.0', 'pyopenssl>=0.14'],
install_requires=['requests>=1.0.0', 'pyopenssl>=0.14'],
test_requires=['tox', 'coverage', 'pytest', 'pytest-xdist', 'pytest-cov'],
classifiers=[
'Intended Audience :: Developers',