diff --git a/_pytest/pastebin.py b/_pytest/pastebin.py index 02af6987a..20738134e 100644 --- a/_pytest/pastebin.py +++ b/_pytest/pastebin.py @@ -62,7 +62,7 @@ def create_new_paste(contents): } url = 'https://bpaste.net' response = urlopen(url, data=urlencode(params).encode()).read() - m = re.search(r'href="/raw/(\w+)"', response) + m = re.search(r'href="/raw/(\w+)"', response.decode()) if m: return '%s/show/%s' % (url, m.group(1)) else: diff --git a/testing/test_pastebin.py b/testing/test_pastebin.py index 70485fbba..2fe4bc137 100644 --- a/testing/test_pastebin.py +++ b/testing/test_pastebin.py @@ -1,7 +1,7 @@ import sys import pytest -class TestPasting: +class TestPasteCapture: @pytest.fixture def pastebinlist(self, monkeypatch, request): @@ -62,7 +62,7 @@ class TestPaste: class DummyFile: def read(self): # part of html of a normal response - return 'View raw.' + return b'View raw.' return DummyFile() if sys.version_info < (3, 0): @@ -78,6 +78,7 @@ class TestPaste: assert result == 'https://bpaste.net/show/3c0c6750bd' assert len(mocked_urlopen) == 1 url, data = mocked_urlopen[0] + assert type(data) is bytes lexer = 'python3' if sys.version_info[0] == 3 else 'python' assert url == 'https://bpaste.net' assert 'lexer=%s' % lexer in data.decode()