Update python_requires in setup.py, fix hostsmanager_test and remove …

…requirements.txt
anned20 · Jun 15, 2019 · 8dfda37 · 8dfda37
1 parent 2c90fce
commit 8dfda37
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 24 deletions.
diff --git a/begoneads/hostsmanager_test.py b/begoneads/hostsmanager_test.py
@@ -19,35 +19,35 @@
 def test_has_begoneads():
     with patch('builtins.open', mock_open(read_data=without_begoneads)) as mock_file:
         hosts_manager = HostsManager('/etc/hosts')
-        mock_file.assert_called_with('/etc/hosts', 'r')
+        mock_file.assert_called_with('/etc/hosts', 'r', encoding='utf-8')
 
         assert hosts_manager.has_begoneads() == None
 
     with patch('builtins.open', mock_open(read_data=with_begoneads)) as mock_file:
         hosts_manager = HostsManager('/etc/hosts')
-        mock_file.assert_called_with('/etc/hosts', 'r')
+        mock_file.assert_called_with('/etc/hosts', 'r', encoding='utf-8')
 
-        assert str(hosts_manager.has_begoneads()).startswith('<re.Match')
+        assert hosts_manager.has_begoneads()
 
 
 def test_apply_hosts():
     with patch('builtins.open', mock_open(read_data=without_begoneads)) as mock_file:
         hosts_manager = HostsManager('/etc/hosts')
-        mock_file.assert_called_with('/etc/hosts', 'r')
+        mock_file.assert_called_with('/etc/hosts', 'r', encoding='utf-8')
 
         assert hosts_manager.has_begoneads() == None
 
         hosts_manager.apply_hosts('0.0.0.0 some.test')
 
-        assert str(hosts_manager.has_begoneads()).startswith('<re.Match')
+        assert hosts_manager.has_begoneads()
 
 
 def test_remove_begoneads():
     with patch('builtins.open', mock_open(read_data=with_begoneads)) as mock_file:
         hosts_manager = HostsManager('/etc/hosts')
-        mock_file.assert_called_with('/etc/hosts', 'r')
+        mock_file.assert_called_with('/etc/hosts', 'r', encoding='utf-8')
 
-        assert str(hosts_manager.has_begoneads()).startswith('<re.Match')
+        assert hosts_manager.has_begoneads()
 
         hosts_manager.remove_begoneads()
 

diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.py b/setup.py
@@ -8,8 +8,9 @@ def readme():
 
 setup(
     name='begoneads',
-    version='0.0.6',
+    version='0.0.7',
     description='BeGoneAds puts some popular hosts file lists into the hosts file as a adblocker measure.',
+    python_requires='>=3.6',
     long_description=readme(),
     long_description_content_type="text/markdown",
     url='http://github.com/anned20/begoneads',