Skip to content

Commit 0dd0d32

Browse files
authored
Merge pull request #12 from phantomii/new-req
Upgrade requirements
2 parents b1524c3 + e3f2347 commit 0dd0d32

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

requirements.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
pbr==3.1.1
2-
webob==1.3.1
3-
six==1.10.0
1+
pbr==5.1.1
2+
webob==1.8.4
3+
six==1.12.0
44
SQLAlchemy==1.0.13
55
requests==2.20.0
66
mysql-connector==2.1.3
7-
oslo.config==5.2.0
8-
-e git+https://github.com/phantomii/[email protected].1#egg=bazooka
9-
-e git+https://github.com/phantomii/[email protected].1#egg=pyretries
7+
oslo.config==6.7.0
8+
-e git+https://github.com/phantomii/[email protected].3#egg=bazooka
9+
-e git+https://github.com/phantomii/[email protected].3#egg=pyretries

restalchemy/api/controllers.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import logging
2020

21+
import six
2122
import webob
2223

2324
from restalchemy.api import packers
@@ -63,7 +64,7 @@ def create_response(body, status, headers):
6364
body = packer.pack(body)
6465

6566
return webob.Response(
66-
body=body,
67+
body=six.b(body or ''),
6768
status=status,
6869
content_type=headers.get('Content-Type', None),
6970
headerlist=[(k, v) for k, v in headers.items()])

0 commit comments

Comments
 (0)