diff --git a/python_http_client/__init__.py b/python_http_client/__init__.py index 58f663b..d7052b8 100644 --- a/python_http_client/__init__.py +++ b/python_http_client/__init__.py @@ -1,5 +1,5 @@ -from .client import Client -from .exceptions import ( +from .client import Client # noqa +from .exceptions import ( # noqa HTTPError, BadRequestsError, UnauthorizedError, diff --git a/python_http_client/client.py b/python_http_client/client.py index ba22eaf..dcdc626 100644 --- a/python_http_client/client.py +++ b/python_http_client/client.py @@ -125,8 +125,7 @@ def _build_url(self, query_params): if self._version: url = self._build_versioned_url(url) else: - url = self.host + url - + self.host + url return url def _update_headers(self, request_headers): @@ -220,12 +219,11 @@ def http_request(*_, **kwargs): if 'request_body' not in kwargs: data = None else: - - # Don't serialize to a JSON formatted str - # if we don't have a JSON Content-Type + # Don't serialize to a JSON formatted str if we don't have + # a JSON Content-Type if 'Content-Type' in self.request_headers: - if self.request_headers['Content-Type'] != 'application\ - /json': + if (self.request_headers['Content-Type'] != + 'application/json'): data = kwargs['request_body'].encode('utf-8') else: data = json.dumps( @@ -233,12 +231,9 @@ def http_request(*_, **kwargs): else: data = json.dumps( kwargs['request_body']).encode('utf-8') - + params = None if 'query_params' in kwargs: params = kwargs['query_params'] - else: - params = None - opener = urllib.build_opener() request = urllib.Request(self._build_url(params), data=data) if self.request_headers: diff --git a/register.py b/register.py index dd1fadb..f42994f 100644 --- a/register.py +++ b/register.py @@ -1,5 +1,4 @@ import pypandoc -import os output = pypandoc.convert('README.md', 'rst') @@ -7,17 +6,19 @@ with open('README.txt', 'w+') as f: f.write(output) -with open('./README.txt') as f: - readme_rst = f.read() +readme_rst = open('./README.txt').read() -replace = ('[SendGrid Logo]\n' - '(https://uiux.s3.amazonaws.com/2016-logos/email-logo%402x.png)') +replace = """\ +[SendGrid Logo] +(https://uiux.s3.amazonaws.com/2016-logos/email-logo%402x.png)""" -replacement = ('|SendGrid Logo|\n\n.. |SendGrid Logo| image:: ' - 'https://uiux.s3.amazonaws.com/2016-logos/email-logo%402x.png' - '\n :target: https://www.sendgrid.com') +replacement = """\ +|SendGrid Logo| -final_text = readme_rst.replace(replace, replacement) +.. |SendGrid Logo| image:: \ +https://uiux.s3.amazonaws.com/2016-logos/email-logo%402x.png + :target: https://www.sendgrid.com""" +final_text = readme_rst.replace(replace, replacement) with open('./README.txt', 'w') as f: f.write(final_text) diff --git a/setup.py b/setup.py index 042727c..6f73998 100755 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ long_description = open('README.txt').read() -def getRequires(): +def get_requires(): deps = [] if (2, 6) <= sys.version_info < (2, 7): deps.append('unittest2') @@ -28,7 +28,7 @@ def getRequires(): license='MIT', description='HTTP REST client, simplified for Python', long_description=long_description, - install_requires=getRequires(), + install_requires=get_requires(), keywords=[ 'REST', 'HTTP', diff --git a/tests/test_unit.py b/tests/test_unit.py index cc76521..b5c7d04 100644 --- a/tests/test_unit.py +++ b/tests/test_unit.py @@ -63,7 +63,7 @@ def __init__(self, host, response_code, timeout=None): Client.__init__(self, host) def _make_request(self, opener, request, timeout=None): - if 200 <= self.response_code < 299: # if successsful code + if 200 <= self.response_code < 299: # if successful code return MockResponse(self.response_code) else: raise handle_error(MockException(self.response_code)) @@ -117,13 +117,12 @@ def test__build_url(self): self.client._url_path = self.client._url_path + ['there'] self.client._url_path = self.client._url_path + [1] self.client._version = 3 - - url = '{0}/v{1}{2}'.format(self.host, - str(self.client._version), - '/here/there/1?hello=0&' + - 'world=1&ztest=0&ztest=1') + url = '{0}/v{1}{2}'.format( + self.host, + str(self.client._version), + '/here/there/1?hello=0&world=1&ztest=0&ztest=1' + ) query_params = {'hello': 0, 'world': 1, 'ztest': [0, 1]} - built_url = self.client._build_url(query_params) self.assertEqual(built_url, url)