fix dependency "multidimensional_urlencode" for python 3

Author: josiasmontag

cloudconvert/api.py

@@ -3,7 +3,7 @@
 
 from requests import request, Session
 from requests.exceptions import RequestException
-from multidimensional_urlencode import urlencode
+from .urlencoder import urlencode
 
 from .process import Process
 from .exceptions import (

cloudconvert/urlencoder.py

@@ -0,0 +1,78 @@
+"""
+source: https://github.com/udemy/multidimensional_urlencode
+should be changed to install requirement of "multidimensional_urlencode" as soon as https://github.com/uber/multidimensional_urlencode/pull/5 is merged
+
+"""
+
+
+try:
+    from urllib.parse import urlencode as urllib_urlencode
+except ImportError:
+    from urllib import urlencode as urllib_urlencode
+
+
+def flatten(d):
+    """Return a dict as a list of lists.
+    >>> flatten({"a": "b"})
+    [['a', 'b']]
+    >>> flatten({"a": [1, 2, 3]})
+    [['a', [1, 2, 3]]]
+    >>> flatten({"a": {"b": "c"}})
+    [['a', 'b', 'c']]
+    >>> flatten({"a": {"b": {"c": "e"}}})
+    [['a', 'b', 'c', 'e']]
+    >>> sorted(flatten({"a": {"b": "c", "d": "e"}}))
+    [['a', 'b', 'c'], ['a', 'd', 'e']]
+    >>> sorted(flatten({"a": {"b": "c", "d": "e"}, "b": {"c": "d"}}))
+    [['a', 'b', 'c'], ['a', 'd', 'e'], ['b', 'c', 'd']]
+    """
+
+    if not isinstance(d, dict):
+        return [[d]]
+
+    returned = []
+    for key, value in list(d.items()):
+        # Each key, value is treated as a row.
+        nested = flatten(value)
+        for nest in nested:
+            current_row = [key]
+            current_row.extend(nest)
+            returned.append(current_row)
+
+    return returned
+
+
+def parametrize(params):
+    """Return list of params as params.
+    >>> parametrize(['a'])
+    'a'
+    >>> parametrize(['a', 'b'])
+    'a[b]'
+    >>> parametrize(['a', 'b', 'c'])
+    'a[b][c]'
+    """
+    returned = str(params[0])
+    returned += "".join("[" + str(p) + "]" for p in params[1:])
+    return returned
+
+
+def urlencode(params):
+    """Urlencode a multidimensional dict."""
+
+    # Not doing duck typing here. Will make debugging easier.
+    if not isinstance(params, dict):
+        raise TypeError("Only dicts are supported.")
+
+    params = flatten(params)
+
+    url_params = {}
+    for param in params:
+        value = param.pop()
+
+        name = parametrize(param)
+        if isinstance(value, (list, tuple)):
+            name += "[]"
+
+        url_params[name] = value
+
+    return urllib_urlencode(url_params, doseq=True)

setup.cfg

@@ -1,18 +1,36 @@
-#!/usr/bin/env python
 
-try:
-    from setuptools import setup
-except ImportError:
-    from distribute_setup import use_setuptools
-    use_setuptools()
-    from setuptools import setup
+
+from __future__ import print_function
+
+from setuptools import setup
+
 
 setup(
-    setup_requires=['d2to1'],
-    d2to1=True,
-    tests_require=[
-        "coverage==3.7.1",
-        "nose==1.3.3",
-        "yanc==0.2.4",
-    ],
+    name='cloudconvert',
+    version='1.0.0',
+    url='https://github.com/cloudconvert/cloudconvert-python',
+    license='MIT',
+    author='Josias Montag',
+    tests_require=['nosetests'],
+    author_email='info@cloudconvert.com',
+    description='Official CloudConvert API wrapper',
+    packages=['cloudconvert'],
+    include_package_data=True,
+    platforms='any',
+    zip_safe=False,
+    keywords=["cloudconvert", "convert"],
+    install_requires = ['requests>=2.3.0'],
+    classifiers=[
+        "License :: OSI Approved :: BSD License",
+        "Development Status :: 4 - Beta",
+        "Intended Audience :: Developers",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3.2",
+        "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
+        "Topic :: Software Development :: Libraries :: Python Modules",
+        "Topic :: System :: Archiving :: Packaging",
+        ],
 )