Skip to content

Commit 0748912

Browse files
authored
Merge pull request #18
Send custom user agent (issue #14)
2 parents 5c0eebb + 9ffe346 commit 0748912

7 files changed

+10
-5
lines changed

README.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Ubersmith API Client for Python
99

1010
Usage
1111
-----
12+
1213
.. code:: python
1314
1415
import ubersmith_client
@@ -20,7 +21,7 @@ Usage
2021
>>> 1265
2122
2223
API
23-
---------
24+
---
2425

2526
**ubersmith_client.api.init(url, user, password, timeout, use_http_get)**
2627
:url:

tests/ubersmith_request_form_encoding_test.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ def setUp(self):
2626
sentinel.module, sentinel.timeout)
2727
self._standard_kwargs = dict(auth=(sentinel.username, sentinel.password),
2828
timeout=sentinel.timeout,
29-
url=sentinel.url)
29+
url=sentinel.url,
30+
headers={'user-agent': 'python-ubersmithclient'})
3031

3132
@patch('ubersmith_client.ubersmith_request_get.requests')
3233
def test_get_with_list(self, request_mock):

tests/ubersmith_request_get_test.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ def expect_a_ubersmith_call(self, requests_mock, returning=None, **kwargs):
7272
response.json = MagicMock(return_value=returning)
7373

7474
def assert_called_with():
75-
requests_mock.get.assert_called_with(auth=self.auth, params=kwargs, timeout=self.timeout, url=self.url)
75+
requests_mock.get.assert_called_with(auth=self.auth, params=kwargs, timeout=self.timeout, url=self.url,
76+
headers={'user-agent': 'python-ubersmithclient'})
7677
response.json.assert_called_with()
7778

7879
return assert_called_with

tests/ubersmith_request_post_test.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ def expect_a_ubersmith_call_post(self, requests_mock, returning=None, status_cod
8383
response.json = MagicMock(return_value=returning)
8484

8585
def assert_called_with():
86-
requests_mock.post.assert_called_with(auth=self.auth, timeout=self.timeout, url=self.url, data=kwargs)
86+
requests_mock.post.assert_called_with(auth=self.auth, timeout=self.timeout, url=self.url, data=kwargs,
87+
headers={'user-agent': 'python-ubersmithclient'})
8788
response.json.assert_called_with()
8889

8990
return assert_called_with

ubersmith_client/ubersmith_request.py

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ def __call__(self, **kwargs):
3838
def _process_request(self, method, **kwargs):
3939
try:
4040
return method(**kwargs)
41-
4241
except ConnectionError:
4342
raise exceptions.UbersmithConnectionError(self.url)
4443
except Timeout:

ubersmith_client/ubersmith_request_get.py

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ def __call__(self, **kwargs):
2727
url=self.url,
2828
auth=(self.user, self.password),
2929
timeout=self.timeout,
30+
headers={'user-agent': 'python-ubersmithclient'},
3031
params=params)
3132

3233
return UbersmithRequest.process_ubersmith_response(response)

ubersmith_client/ubersmith_request_post.py

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ def __call__(self, **kwargs):
2727
url=self.url,
2828
auth=(self.user, self.password),
2929
timeout=self.timeout,
30+
headers={'user-agent': 'python-ubersmithclient'},
3031
data=params)
3132

3233
return UbersmithRequest.process_ubersmith_response(response)

0 commit comments

Comments
 (0)