Merge pull request #7 from Marx314/mock_and_post_readme

Rework test without flexmock, request_mock

Author: fguillot

README.rst

@@ -4,16 +4,16 @@ 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
 -----
 .. code:: python
 
     import ubersmith_client
 
-    api = ubersmith_client.api.init('http://ubersmith.com/api/2.0/', 'username', 'password')
+    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()
@@ -22,7 +22,7 @@ Usage
 API
 ---------
 
-**ubersmith_client.api.init(url, user, password, timeout, use_http_post)**
+**ubersmith_client.api.init(url, user, password, timeout, use_http_get)**
  :url:
    URL of your API
 
@@ -33,7 +33,7 @@ API
  :timeout: api timeout given to requests
 
    *Default:* ``60``
- :use_http_post:
-   Use `POST` requests instead of `GET`
+ :use_http_get:
+   Use `GET` requests instead of `POST`
 
    *Default:* ``False``

requirements.txt

@@ -1,2 +1 @@
 requests<=2.9.1
-six>=1.10.0

test-requirements.txt

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

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