Fix flake8 issues found in cli

cli/tests/conftest.py

@@ -1,11 +1,4 @@
 import sys
-
-# Force tests to look for resources in the source code tree
-sys.onionshare_dev_mode = True
-
-# Let OnionShare know the tests are running, to avoid colliding with settings files
-sys.onionshare_test_mode = True
-
 import os
 import shutil
 import tempfile
@@ -14,6 +7,11 @@ import pytest
 
 from onionshare_cli import common, web
 
+# Force tests to look for resources in the source code tree
+sys.onionshare_dev_mode = True
+
+# Let OnionShare know the tests are running, to avoid colliding with settings files
+sys.onionshare_test_mode = True
 
 # The temporary directory for CLI tests
 test_temp_dir = None
@@ -45,7 +43,7 @@ def temp_dir():
 
 @pytest.fixture
 def temp_dir_1024(temp_dir):
-    """ Create a temporary directory that has a single file of a
+    """Create a temporary directory that has a single file of a
     particular size (1024 bytes).
     """
 
@@ -59,7 +57,7 @@ def temp_dir_1024(temp_dir):
 # pytest > 2.9 only needs @pytest.fixture
 @pytest.yield_fixture
 def temp_dir_1024_delete(temp_dir):
-    """ Create a temporary directory that has a single file of a
+    """Create a temporary directory that has a single file of a
     particular size (1024 bytes). The temporary directory (including
     the file inside) will be deleted after fixture usage.
     """
@@ -73,7 +71,7 @@ def temp_dir_1024_delete(temp_dir):
 
 @pytest.fixture
 def temp_file_1024(temp_dir):
-    """ Create a temporary file of a particular size (1024 bytes). """
+    """Create a temporary file of a particular size (1024 bytes)."""
 
     with tempfile.NamedTemporaryFile(delete=False, dir=temp_dir) as tmp_file:
         tmp_file.write(b"*" * 1024)
@@ -117,7 +115,7 @@ def default_zw():
     tmp_dir = os.path.dirname(zw.zip_filename)
     try:
         shutil.rmtree(tmp_dir, ignore_errors=True)
-    except:
+    except Exception:
         pass
 
 
@@ -189,10 +187,3 @@ def time_strftime(monkeypatch):
 @pytest.fixture
 def common_obj():
     return common.Common()
-
-
-@pytest.fixture
-def settings_obj(sys_onionshare_dev_mode, platform_linux):
-    _common = common.Common()
-    _common.version = "DUMMY_VERSION_1.2.3"
-    return settings.Settings(_common)

cli/tests/test_cli_web.py

@@ -42,7 +42,7 @@ RANDOM_STR_REGEX = re.compile(r"^[a-z2-7]+$")
 
 
 def web_obj(temp_dir, common_obj, mode, num_files=0):
-    """ Creates a Web object, in either share mode or receive mode, ready for testing """
+    """Creates a Web object, in either share mode or receive mode, ready for testing"""
     common_obj.settings = Settings(common_obj)
     mode_settings = ModeSettings(common_obj)
     web = Web(common_obj, False, mode_settings, mode)
@@ -100,7 +100,7 @@ class TestWeb:
         web = web_obj(temp_dir, common_obj, "share", 3)
         web.settings.set("share", "autostop_sharing", True)
 
-        assert web.running == True
+        assert web.running is True
 
         with web.app.test_client() as c:
             # Download the first time
@@ -112,7 +112,7 @@ class TestWeb:
                 or res.mimetype == "application/x-zip-compressed"
             )
 
-            assert web.running == False
+            assert web.running is False
 
     def test_share_mode_autostop_sharing_off(
         self, temp_dir, common_obj, temp_file_1024
@@ -120,7 +120,7 @@ class TestWeb:
         web = web_obj(temp_dir, common_obj, "share", 3)
         web.settings.set("share", "autostop_sharing", False)
 
-        assert web.running == True
+        assert web.running is True
 
         with web.app.test_client() as c:
             # Download the first time
@@ -131,7 +131,7 @@ class TestWeb:
                 res.mimetype == "application/zip"
                 or res.mimetype == "application/x-zip-compressed"
             )
-            assert web.running == True
+            assert web.running is True
 
     def test_receive_mode(self, temp_dir, common_obj):
         web = web_obj(temp_dir, common_obj, "receive")
@@ -183,7 +183,7 @@ class TestWeb:
             assert res.status_code == 200
 
             assert webhook_url == "http://127.0.0.1:1337/example"
-            assert webhook_data == "1 file uploaded to OnionShare"
+            assert webhook_data == "1 file submitted to OnionShare"
 
     def test_public_mode_on(self, temp_dir, common_obj):
         web = web_obj(temp_dir, common_obj, "receive")
@@ -192,7 +192,7 @@ class TestWeb:
         with web.app.test_client() as c:
             # Loading / should work without auth
             res = c.get("/")
-            data1 = res.get_data()
+            res.get_data()
             assert res.status_code == 200
 
     def test_public_mode_off(self, temp_dir, common_obj):

cli/tests/test_range_request.py

@@ -1,7 +1,4 @@
 import pytest
-import subprocess
-
-from tempfile import NamedTemporaryFile
 from werkzeug.exceptions import RequestedRangeNotSatisfiable
 
 from onionshare_cli.web.share_mode import parse_range_header
@@ -9,24 +6,24 @@ from onionshare_cli.web.share_mode import parse_range_header
 
 VALID_RANGES = [
     (None, 500, [(0, 499)]),
-    ('bytes=0', 500, [(0, 499)]),
-    ('bytes=100', 500, [(100, 499)]),
-    ('bytes=100-', 500, [(100, 499)]),  # not in the RFC, but how curl sends
-    ('bytes=0-99', 500, [(0, 99)]),
-    ('bytes=0-599', 500, [(0, 499)]),
-    ('bytes=0-0', 500, [(0, 0)]),
-    ('bytes=-100', 500, [(400, 499)]),
-    ('bytes=0-99,100-199', 500, [(0, 199)]),
-    ('bytes=0-100,100-199', 500, [(0, 199)]),
-    ('bytes=0-99,101-199', 500, [(0, 99), (101, 199)]),
-    ('bytes=0-199,100-299', 500, [(0, 299)]),
-    ('bytes=0-99,200-299', 500, [(0, 99), (200, 299)]),
+    ("bytes=0", 500, [(0, 499)]),
+    ("bytes=100", 500, [(100, 499)]),
+    ("bytes=100-", 500, [(100, 499)]),  # not in the RFC, but how curl sends
+    ("bytes=0-99", 500, [(0, 99)]),
+    ("bytes=0-599", 500, [(0, 499)]),
+    ("bytes=0-0", 500, [(0, 0)]),
+    ("bytes=-100", 500, [(400, 499)]),
+    ("bytes=0-99,100-199", 500, [(0, 199)]),
+    ("bytes=0-100,100-199", 500, [(0, 199)]),
+    ("bytes=0-99,101-199", 500, [(0, 99), (101, 199)]),
+    ("bytes=0-199,100-299", 500, [(0, 299)]),
+    ("bytes=0-99,200-299", 500, [(0, 99), (200, 299)]),
 ]
 
 
 INVALID_RANGES = [
-    'bytes=200-100',
-    'bytes=0-100,300-200',
+    "bytes=200-100",
+    "bytes=0-100,300-200",
 ]
 
 
@@ -38,4 +35,4 @@ def test_parse_ranges():
 
     for invalid in INVALID_RANGES:
         with pytest.raises(RequestedRangeNotSatisfiable):
-            parse_range_header(invalid, 500)
+            parse_range_header(invalid, 500)