Skip to content

Commit e033dbf

Browse files
committed
Fix UTF-8 issue and bump version
1 parent a7db7ff commit e033dbf

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

amadeus/mixins/parser.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ def __parse_body_and_headers(self, http_response, client):
6565
self.headers = http_response.info() or self.headers
6666
if hasattr(http_response, 'read'):
6767
self.body = http_response.read()
68+
if hasattr(self.body, 'decode'):
69+
self.body = self.body.decode('utf8')
6870

6971
# Tries to parse the JSON, if there is any
7072
def __parse_json(self, client):

amadeus/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version_info = (1, 0, '0b6')
1+
version_info = (1, 0, '0b7')
22
version = '.'.join(str(v) for v in version_info)

specs/mixins/parser_spec.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@
4646
http_response.getheaders().returns(
4747
[('Content-Type', 'plain/text')]
4848
)
49-
http_response.read().returns('Hello World')
49+
http_response.read().returns(u'Hello World')
5050

5151
response = Response(http_response, self.request)
5252
response._parse(self.client)
53-
expect(response.body).to(be('Hello World'))
53+
expect(response.body).to(equal('Hello World'))
5454
expect(response.result).to(be(None))
5555
expect(response.data).to(be(None))
5656

@@ -62,7 +62,7 @@
6262

6363
response = Response(http_response, self.request)
6464
response._parse(self.client)
65-
expect(response.body).to(be('Hello World'))
65+
expect(response.body).to(equal('Hello World'))
6666
expect(response.result).to(be(None))
6767
expect(response.data).to(be(None))
6868

0 commit comments

Comments
 (0)