File upload

.travis.yml

@@ -1,11 +1,17 @@
 language: python
+
 python:
-- '2.7'
-- '3.4'
+  - '2.7'
+  - '3.4'
+
 install:
-- pip install -r requirements.txt
-- pip install -r test-requirements.txt
-script: nosetests
+  - pip install -r requirements.txt
+  - pip install -r test-requirements.txt
+
+script:
+  - nosetests
+  - flake8
+
 deploy:
   provider: pypi
   user: internaphosting

README.rst

@@ -1,16 +1,40 @@
-# Ubersmith API Client for Python
+Ubersmith API Client for Python
+===============================
 
 .. image:: https://travis-ci.org/internap/python-ubersmithclient.svg?branch=master
     :target: https://travis-ci.org/internap/python-ubersmithclient
 
-.. image:: https://img.shields.io/pypi/v/ubersmith_client.svg?style=flat
-    :target: https://pypi.python.org/pypi/ubersmith_client
+.. image:: https://img.shields.io/pypi/v/python-ubersmithclient.svg?style=flat
+    :target: https://pypi.python.org/pypi/python-ubersmithclient
 
-# Usage
+Usage
+-----
 
-    >>> import ubersmith_client
-    >>> api = ubersmith_client.api.init('http://ubersmith.com/api/2.0/', 'username', 'password')
-    >>> api.client.count()
-    u'264'
-    >>> api.client.latest_client()
-    1265
+.. code:: python
+
+    import ubersmith_client
+
+    api = ubersmith_client.api.init(url='http://ubersmith.com/api/2.0/', user='username', password='password')
+    api.client.count()
+     >>> u'264'
+    api.client.latest_client()
+     >>> 1265
+
+API
+---
+
+**ubersmith_client.api.init(url, user, password, timeout, use_http_get)**
+ :url:
+   URL of your API
+
+   *Example:* ``http://ubersmith.example.org/api/2.0/``
+
+ :user: API username
+ :password: API Password or token
+ :timeout: api timeout given to requests (type: float)
+
+   *Default:* ``60``
+ :use_http_get:
+   Use `GET` requests instead of `POST`
+
+   *Default:* ``False``

requirements.txt

@@ -1 +1,2 @@
-requests<=2.9.1
+pbr>=1.8
+requests

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
-name = ubersmith_client
-url = https://github.com/Marx314/python-ubersmithclient
+name = python-ubersmithclient
+url = https://github.com/internap/python-ubersmithclient
 author = Internap
 author-email = [email protected]
 summary = Another ubersmith lib

setup.py

@@ -1,5 +1,4 @@
-
-# Copyright 2016 Internap
+# Copyright 2017 Internap.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,10 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#!/usr/bin/env python
 from setuptools import setup
 
 setup(
-    setup_requires=["pbr>=1.8"],
+    setup_requires=['pbr'],
     pbr=True,
 )

test-requirements.txt

@@ -1,3 +1,4 @@
 nose==1.2.1
-requests-mock==0.7.0
-pyhamcrest==1.8.1
+pyhamcrest==1.8.1
+mock==1.3.0
+flake8

tests/__init__.py

@@ -11,10 +11,3 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-def apply_kwargs(kwargs, default_kwargs):
-    for k, v in kwargs.items():
-        if isinstance(v, dict):
-            default_kwargs[k] = apply_kwargs(v, default_kwargs[k])
-        else:
-            default_kwargs[k] = v
-    return default_kwargs