Merge pull request #24 from easy-as-python/fix-stored-source-data-type

Fix stored source data type

Author: daneah

setup.cfg

@@ -13,9 +13,6 @@ classifiers =
     Development Status :: 5 - Production/Stable
     Intended Audience :: Developers
     Framework :: Django
-    Framework :: Django :: 1.11
-    Framework :: Django :: 2.0
-    Framework :: Django :: 2.1
     Framework :: Django :: 2.2
     Framework :: Django :: 3.0
     Framework :: Django :: 3.1
@@ -32,7 +29,7 @@ classifiers =
 package_dir = =src
 packages = find:
 install_requires =
-    Django>=1.8.2
+    Django>=2.2.0
     requests>=2.7.0
 
 [options.packages.find]
@@ -72,15 +69,13 @@ python_files =
 addopts = -ra -q --cov=webmention
 
 [tox:tox]
-envlist = {py36,py37,py38}-django{1.11,2.1,2.2,3.0,3.1}
+envlist = {py36,py37,py38}-django{2.2,3.0,3.1}
 
 [testenv]
 extras = test
 commands =
     pytest {posargs}
 deps =
-    django1.11: Django>=1.11,<2
-    django2.1: Django>=2.1,<2.2
     django2.2: Django>=2.2,<2.3
     django3.0: Django>=3.0,<3.1
     django3.1: Django>=3.1,<3.2

src/webmention/resolution.py

@@ -19,8 +19,8 @@ def url_resolves(url):
 def fetch_and_validate_source(source, target):
     response = requests.get(source)
     if response.status_code == 200:
-        if target in str(response.content):
-            return response.content
+        if target in response.text:
+            return response.text
         else:
             raise TargetNotFoundError("Source URL did not contain target URL")
     else:

tests/test_resolution.py

@@ -26,10 +26,10 @@ def test_url_resolves_when_does_not_resolve(mock_resolve):
 def test_fetch_and_validate_source_happy_path(mock_get, test_source, test_target):
     mock_response = Mock()
     mock_response.status_code = 200
-    mock_response.content = '<a href="{href}">{href}</a>'.format(href=test_target)
+    mock_response.text = '<a href="{href}">{href}</a>'.format(href=test_target)
     mock_get.return_value = mock_response
 
-    assert fetch_and_validate_source(test_source, test_target) == mock_response.content
+    assert fetch_and_validate_source(test_source, test_target) == mock_response.text
 
 
 @patch("requests.get")
@@ -46,7 +46,7 @@ def test_fetch_and_validate_source_when_source_unavailable(mock_get, test_source
 def test_fetch_and_validate_source_when_source_does_not_contain_target(mock_get, test_source, test_target):
     mock_response = Mock()
     mock_response.status_code = 200
-    mock_response.content = "foo"
+    mock_response.text = "foo"
     mock_get.return_value = mock_response
 
     with pytest.raises(TargetNotFoundError):