From 4a038e54cf95515f5d02d5dd88d240fe5fb5204e Mon Sep 17 00:00:00 2001
From: Trygve Aaberge <trygveaa@gmail.com>
Date: Thu, 28 Mar 2019 15:57:48 +0100
Subject: Use StringIO from io

This is compatible with python 3, which StringIO from StringIO or
cStringIO is not.
---
 _pytest/conftest.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to '_pytest/conftest.py')

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()
-- 
cgit