added ruff SIM check (#76)

Signed-off-by: Alexander Piskun <[email protected]>

Author: bigcat88

nc_py_api/_session.py

@@ -204,12 +204,14 @@ def _ocs(self, method: str, path_params: str, headers: dict, data: Optional[byte
         response_data = loads(response.text)
         ocs_meta = response_data["ocs"]["meta"]
         if ocs_meta["status"] != "ok":
-            if not nested_req:
-                if ocs_meta["statuscode"] == 403:
-                    if str(ocs_meta["message"]).lower().find("password confirmation is required") != -1:
-                        self.adapter.close()
-                        self.init_adapter(restart=True)
-                        return self._ocs(method, path_params, headers, data, **kwargs, nested_req=True)
+            if (
+                not nested_req
+                and ocs_meta["statuscode"] == 403
+                and str(ocs_meta["message"]).lower().find("password confirmation is required") != -1
+            ):
+                self.adapter.close()
+                self.init_adapter(restart=True)
+                return self._ocs(method, path_params, headers, data, **kwargs, nested_req=True)
             if ocs_meta["statuscode"] in (404, OCSRespond.RESPOND_NOT_FOUND):
                 raise NextcloudExceptionNotFound(reason=ocs_meta["message"], info=info)
             raise NextcloudException(status_code=ocs_meta["statuscode"], reason=ocs_meta["message"], info=info)

pyproject.toml

@@ -104,7 +104,7 @@ preview = true
 [tool.ruff]
 line-length = 120
 target-version = "py39"
-select = ["A", "B", "C", "D", "E", "F", "UP", "Q", "W"]
+select = ["A", "B", "C", "D", "E", "F", "G", "I", "UP", "SIM", "Q", "W"]
 extend-ignore = ["D107", "D105", "D203", "D213", "D401"]
 
 [tool.ruff.per-file-ignores]

tests/_install_wait.py

@@ -9,9 +9,8 @@ def check_heartbeat(url: str, regexp: str, n_tries: int, wait_interval: float) -
     for _ in range(n_tries):
         try:
             result = get(url)
-            if result.text:
-                if re.search(regexp, result.text, re.IGNORECASE) is not None:
-                    return 0
+            if result.text and re.search(regexp, result.text, re.IGNORECASE) is not None:
+                return 0
         except Exception as _:
             _ = _
         sleep(wait_interval)

tests/files_sharing_test.py

@@ -1,3 +1,4 @@
+import contextlib
 import datetime
 
 import pytest
@@ -235,10 +236,8 @@ def test_get_inherited(nc):
 @pytest.mark.parametrize("nc", NC_TO_TEST)
 @pytest.mark.skipif(NC is None, reason="Usual Nextcloud mode required for the test")
 def test_share_with(nc):
-    try:
+    with contextlib.suppress(NextcloudException):
         NC.users.create(TEST_USER_NAME, password=TEST_USER_PASSWORD)
-    except NextcloudException:
-        pass
     nc_second_user = Nextcloud(nc_auth_user=TEST_USER_NAME, nc_auth_pass=TEST_USER_PASSWORD)
     assert not nc_second_user.files.sharing.get_list()
     nc.files.makedirs("test_folder1/test_subfolder", exist_ok=True)
@@ -260,7 +259,7 @@ def test_share_with(nc):
     finally:
         nc.files.delete("share_test.txt", not_fail=True)
         nc.files.delete("test_folder1", not_fail=True)
-        # NC.users.delete(TEST_USER_NAME)
+        NC.users.delete(TEST_USER_NAME)
 
 
 @pytest.mark.parametrize("nc", NC_TO_TEST)

tests/files_test.py

@@ -113,10 +113,7 @@ def test_file_download(nc):
 @pytest.mark.parametrize("chunk_size", (15, 32, 64, None))
 def test_file_download2stream(nc, data_type, chunk_size):
     srv_admin_manual_buf = MyBytesIO()
-    if data_type == "str":
-        content = "".join(choice(ascii_lowercase) for _ in range(64))
-    else:
-        content = randbytes(64)
+    content = "".join(choice(ascii_lowercase) for _ in range(64)) if data_type == "str" else randbytes(64)
     nc.files.upload("test_file.txt", content=content)
     if chunk_size is not None:
         nc.files.download2stream("/test_file.txt", srv_admin_manual_buf, chunk_size=chunk_size)
@@ -384,10 +381,7 @@ def test_move_copy_dir(nc, op_type):
     files = ("file1.txt", "file2.txt", "file3.txt")
     for n in files:
         nc.files.upload(f"{dir_name}/{n}", content=n)
-    if op_type == "move":
-        result = nc.files.move(dir_name, dest_dir_name)
-    else:
-        result = nc.files.copy(dir_name, dest_dir_name)
+    result = nc.files.move(dir_name, dest_dir_name) if op_type == "move" else nc.files.copy(dir_name, dest_dir_name)
     assert result.file_id
     assert result.is_dir
     assert nc.files.by_path(result).is_dir
@@ -509,10 +503,7 @@ def test_fs_node_fields(nc):
 
 @pytest.mark.parametrize("nc", NC_TO_TEST[:1])
 def test_makedirs(nc):
-    try:
-        nc.files.delete("abc")
-    except NextcloudException:
-        pass
+    nc.files.delete("abc", not_fail=True)
     result = nc.files.makedirs("abc/def")
     assert result.is_dir
     with pytest.raises(NextcloudException) as exc_info:

tests/gfixture.py

@@ -10,10 +10,8 @@
     environ["APP_VERSION"] = "1.0.0"
     environ["APP_SECRET"] = "12345"
 
-if environ.get("SKIP_NC_CLIENT_TESTS", False):
-    NC = None
-else:
-    NC = Nextcloud()
+
+NC = None if environ.get("SKIP_NC_CLIENT_TESTS", False) else Nextcloud()
 
 if environ.get("SKIP_AE_TESTS", False):
     NC_APP = None

tests/logs_test.py

@@ -57,7 +57,9 @@ def test_log_without_app_ecosystem_v2():
     log_lvl = srv_capabilities["app_ecosystem_v2"].pop("loglevel")
     srv_capabilities.pop("app_ecosystem_v2")
     patched_capabilities = {"capabilities": srv_capabilities, "version": srv_version}
-    with mock.patch.dict("gfixture.NC_APP._session._capabilities", patched_capabilities, clear=True):
-        with mock.patch("gfixture.NC_APP._session._ocs") as _ocs:
-            NC_APP.log(log_lvl, "will not be sent")
-            _ocs.assert_not_called()
+    with (
+        mock.patch.dict("gfixture.NC_APP._session._capabilities", patched_capabilities, clear=True),
+        mock.patch("gfixture.NC_APP._session._ocs") as _ocs,
+    ):
+        NC_APP.log(log_lvl, "will not be sent")
+        _ocs.assert_not_called()

tests/options_test.py

@@ -43,8 +43,5 @@ def test_timeouts():
 @pytest.mark.skipif(not NC_TO_TEST, reason="Need Nextcloud or NextcloudApp.")
 def test_xdebug_session():
     nc_py_api.options.XDEBUG_SESSION = "12345"
-    if isinstance(NC_TO_TEST, nc_py_api.Nextcloud):
-        new_nc = nc_py_api.Nextcloud()
-    else:
-        new_nc = nc_py_api.NextcloudApp()
+    new_nc = nc_py_api.Nextcloud() if isinstance(NC_TO_TEST[0], nc_py_api.Nextcloud) else nc_py_api.NextcloudApp()
     assert new_nc._session.adapter.cookies["XDEBUG_SESSION"] == "12345"

tests/users_groups_test.py

@@ -1,3 +1,5 @@
+import contextlib
+
 import pytest
 from gfixture import NC_APP, NC_TO_TEST
 
@@ -13,10 +15,8 @@
 @pytest.mark.parametrize("params", ((TEST_GROUP_NAME,), (TEST_GROUP_NAME, "display name")))
 def test_create_delete_group(nc, params):
     test_group_name = params[0]
-    try:
+    with contextlib.suppress(NextcloudException):
         nc.users.groups.delete(test_group_name)
-    except NextcloudException:
-        pass
     nc.users.groups.create(*params)
     with pytest.raises(NextcloudException):
         nc.users.groups.create(*params)
@@ -29,10 +29,8 @@ def test_create_delete_group(nc, params):
 @pytest.mark.parametrize("nc", NC_TO_TEST[:1])
 def test_group_get_list(nc):
     for i in (TEST_GROUP_NAME, TEST_GROUP_NAME2):
-        try:
+        with contextlib.suppress(NextcloudException):
             nc.users.groups.create(i)
-        except NextcloudException:
-            pass
     groups = nc.users.groups.get_list()
     assert isinstance(groups, list)
     assert len(groups) >= 2
@@ -58,14 +56,10 @@ def test_get_non_existing_group(nc):
 @pytest.mark.skipif(not isinstance(NC_TO_TEST[:1][0], Nextcloud), reason="Not available for NextcloudApp.")
 @pytest.mark.parametrize("nc", NC_TO_TEST[:1])
 def test_group_get_details(nc):
-    try:
+    with contextlib.suppress(NextcloudException):
         nc.users.groups.delete(TEST_GROUP_NAME)
-    except NextcloudException:
-        pass
-    try:
+    with contextlib.suppress(NextcloudException):
         nc.users.groups.create(TEST_GROUP_NAME)
-    except NextcloudException:
-        pass
     groups = nc.users.groups.get_details(mask=TEST_GROUP_NAME)
     assert len(groups) == 1
     group = groups[0]
@@ -81,10 +75,8 @@ def test_group_get_details(nc):
 @pytest.mark.skipif(not isinstance(NC_TO_TEST[:1][0], Nextcloud), reason="Not available for NextcloudApp.")
 @pytest.mark.parametrize("nc", NC_TO_TEST[:1])
 def test_group_edit(nc):
-    try:
+    with contextlib.suppress(NextcloudException):
         nc.users.groups.create(TEST_GROUP_NAME)
-    except NextcloudException:
-        pass
     nc.users.groups.edit(TEST_GROUP_NAME, display_name="earth people")
     assert nc.users.groups.get_details(mask=TEST_GROUP_NAME)[0].display_name == "earth people"
     nc.users.groups.delete(TEST_GROUP_NAME)
@@ -100,21 +92,17 @@ def test_group_edit(nc):
 @pytest.mark.skipif(not isinstance(NC_TO_TEST[:1][0], Nextcloud), reason="Not available for NextcloudApp.")
 @pytest.mark.parametrize("nc", NC_TO_TEST[:1])
 def test_group_members_promote_demote(nc):
-    try:
+    with contextlib.suppress(NextcloudException):
         nc.users.groups.create(TEST_GROUP_NAME)
-    except NextcloudException:
-        pass
     group_members = nc.users.groups.get_members(TEST_GROUP_NAME)
     assert not group_members
     assert isinstance(group_members, list)
     group_subadmins = nc.users.groups.get_subadmins(TEST_GROUP_NAME)
     assert isinstance(group_subadmins, list)
     assert not group_subadmins
     try:
-        try:
+        with contextlib.suppress(NextcloudException):
             nc.users.create("test_group_user", password="test_group_user")
-        except NextcloudException:
-            pass
         nc.users.add_to_group("test_group_user", TEST_GROUP_NAME)
         group_members = nc.users.groups.get_members(TEST_GROUP_NAME)
         assert group_members
@@ -133,10 +121,8 @@ def test_group_members_promote_demote(nc):
         assert not group_members
     finally:
         nc.users.groups.delete(TEST_GROUP_NAME)
-        try:
+        with contextlib.suppress(NextcloudException):
             nc.users.delete("test_group_user")
-        except NextcloudException:
-            pass
 
 
 @pytest.mark.skipif(NC_APP is None, reason="Test only for NextcloudApp.")

tests/users_test.py

@@ -1,3 +1,5 @@
+import contextlib
+
 import pytest
 from gfixture import NC_TO_TEST
 
@@ -38,10 +40,8 @@ def test_get_user_404(nc):
 @pytest.mark.skipif(not isinstance(NC_TO_TEST[:1][0], Nextcloud), reason="Not available for NextcloudApp.")
 @pytest.mark.parametrize("nc", NC_TO_TEST[:1])
 def test_create_user(nc):
-    try:
+    with contextlib.suppress(NextcloudException):
         nc.users.delete(TEST_USER_NAME)
-    except NextcloudException:
-        pass
     nc.users.create(TEST_USER_NAME, password=TEST_USER_PASSWORD)
     with pytest.raises(NextcloudException):
         nc.users.create(TEST_USER_NAME, password=TEST_USER_PASSWORD)
@@ -51,10 +51,8 @@ def test_create_user(nc):
 @pytest.mark.skipif(not isinstance(NC_TO_TEST[:1][0], Nextcloud), reason="Not available for NextcloudApp.")
 @pytest.mark.parametrize("nc", NC_TO_TEST[:1])
 def test_create_user_with_groups(nc):
-    try:
+    with contextlib.suppress(NextcloudException):
         nc.users.delete(TEST_USER_NAME)
-    except NextcloudException:
-        pass
     nc.users.create(TEST_USER_NAME, password=TEST_USER_PASSWORD, groups=["admin"])
     admin_group = nc.users.groups.get_members("admin")
     assert TEST_USER_NAME in admin_group
@@ -64,10 +62,8 @@ def test_create_user_with_groups(nc):
 @pytest.mark.skipif(not isinstance(NC_TO_TEST[:1][0], Nextcloud), reason="Not available for NextcloudApp.")
 @pytest.mark.parametrize("nc", NC_TO_TEST[:1])
 def test_create_user_no_name_mail(nc):
-    try:
+    with contextlib.suppress(NextcloudException):
         nc.users.delete(TEST_USER_NAME)
-    except NextcloudException:
-        pass
     with pytest.raises(ValueError):
         nc.users.create(TEST_USER_NAME)
     with pytest.raises(ValueError):
@@ -79,10 +75,8 @@ def test_create_user_no_name_mail(nc):
 @pytest.mark.skipif(not isinstance(NC_TO_TEST[:1][0], Nextcloud), reason="Not available for NextcloudApp.")
 @pytest.mark.parametrize("nc", NC_TO_TEST[:1])
 def test_delete_user(nc):
-    try:
+    with contextlib.suppress(NextcloudException):
         nc.users.create(TEST_USER_NAME, password=TEST_USER_PASSWORD)
-    except NextcloudException:
-        pass
     nc.users.delete(TEST_USER_NAME)
     with pytest.raises(NextcloudExceptionNotFound):
         nc.users.delete(TEST_USER_NAME)
@@ -91,10 +85,8 @@ def test_delete_user(nc):
 @pytest.mark.skipif(not isinstance(NC_TO_TEST[:1][0], Nextcloud), reason="Not available for NextcloudApp.")
 @pytest.mark.parametrize("nc", NC_TO_TEST[:1])
 def test_users_get_list(nc):
-    try:
+    with contextlib.suppress(NextcloudException):
         nc.users.create(TEST_USER_NAME, password=TEST_USER_PASSWORD)
-    except NextcloudException:
-        pass
     users = nc.users.get_list()
     assert isinstance(users, list)
     assert "admin" in users
@@ -109,10 +101,8 @@ def test_users_get_list(nc):
 @pytest.mark.skipif(not isinstance(NC_TO_TEST[:1][0], Nextcloud), reason="Not available for NextcloudApp.")
 @pytest.mark.parametrize("nc", NC_TO_TEST[:1])
 def test_enable_disable_user(nc):
-    try:
+    with contextlib.suppress(NextcloudException):
         nc.users.create(TEST_USER_NAME, password=TEST_USER_PASSWORD)
-    except NextcloudException:
-        pass
     nc.users.disable(TEST_USER_NAME)
     user = nc.users.get_details(TEST_USER_NAME)
     assert not user["enabled"]