diff options
Diffstat (limited to '_pytest/conftest.py')
| -rw-r--r-- | _pytest/conftest.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/_pytest/conftest.py b/_pytest/conftest.py index f744dae..951797a 100644 --- a/_pytest/conftest.py +++ b/_pytest/conftest.py @@ -32,6 +32,8 @@ def realish_eventrouter(mock_weechat): e = EventRouter() context = e.store_context(SlackRequest('xoxoxoxox', "rtm.start", {"meh": "blah"})) rtmstartdata = open('_pytest/data/http/rtm.start.json', 'r').read() + if sys.version_info.major == 2: + rtmstartdata = rtmstartdata.decode('utf-8') e.receive_httprequest_callback(context, 1, 0, rtmstartdata, 4) while len(e.queue): e.handle_next() |