ruff recommended

Author: d-w-moore

irods/access.py

@@ -6,19 +6,19 @@
 
 
 _ichmod_listed_permissions = (
-            "own",
-            "delete_object",
-            "write",
-            "modify_object",
-            "create_object",
-            "delete_metadata",
-            "modify_metadata",
-            "create_metadata",
-            "read",
-            "read_object",
-            "read_metadata",
-            "null",
-            )
+    "own",
+    "delete_object",
+    "write",
+    "modify_object",
+    "create_object",
+    "delete_metadata",
+    "modify_metadata",
+    "create_metadata",
+    "read",
+    "read_object",
+    "read_metadata",
+    "null",
+)
 
 
 class _Access_LookupMeta(type):
@@ -93,16 +93,11 @@ def __init__(self, access_name, path, user_name="", user_zone="", user_type=None
         self.user_type = user_type
 
     def __lt__(self, other):
-        return (
-            self.access_name,
-            self.user_name,
-            self.user_zone,
-            iRODSPath(self.path)
-        ) < (
+        return (self.access_name, self.user_name, self.user_zone, iRODSPath(self.path)) < (
             other.access_name,
             other.user_name,
             other.user_zone,
-            iRODSPath(other.path)
+            iRODSPath(other.path),
         )
 
     def __eq__(self, other):
@@ -142,8 +137,7 @@ def __repr__(self):
 
 
 class ACLOperation(iRODSAccess):
-
-    def __init__(self, access_name: str, user_name: str="", user_zone: str=""):
+    def __init__(self, access_name: str, user_name: str = "", user_zone: str = ""):
         super().__init__(
             access_name=access_name,
             path="",
@@ -177,17 +171,19 @@ def __repr__(self):
         return f"<ACLOperation {self.access_name} {self.user_name} {self.user_zone}>"
 
 
-(_ichmod_synonym_mapping := {
-            # syn : canonical
-            "write": "modify_object",
-            "read":  "read_object"
-        }).update(
-            (key.replace("_"," "),key) for key in iRODSAccess.codes.keys())
+(
+    _ichmod_synonym_mapping := {
+        # syn : canonical
+        "write": "modify_object",
+        "read": "read_object",
+    }
+).update((key.replace("_", " "), key) for key in iRODSAccess.codes.keys())
 
 
-all_permissions = { **iRODSAccess.codes,
-                    **{key:iRODSAccess.codes[_ichmod_synonym_mapping[key]]
-                    for key in _ichmod_synonym_mapping}}
+all_permissions = {
+    **iRODSAccess.codes,
+    **{key: iRODSAccess.codes[_ichmod_synonym_mapping[key]] for key in _ichmod_synonym_mapping},
+}
 
 
 class _iRODSAccess_pre_4_3_0(iRODSAccess):

irods/manager/access_manager.py

@@ -37,23 +37,19 @@ def users_by_ids(session, ids=()):
 
 
 class AccessManager(Manager):
-
     @staticmethod
     def _to_acl_operation_json(op_input: iRODSAccess):
         return {
             "acl": op_input.access_name,
             "entity_name": op_input.user_name,
-            **(
-                {} if not (z := op_input.user_zone)
-                else {"zone": z}
-            )
+            **({} if not (z := op_input.user_zone) else {"zone": z}),
         }
 
-    def apply_atomic_operations(self, logical_path : str, *operations, admin=False):
+    def apply_atomic_operations(self, logical_path: str, *operations, admin=False):
         request_text = {
             "logical_path": logical_path,
             "admin_mode": admin,
-            "operations": [self._to_acl_operation_json(op) for op in operations]
+            "operations": [self._to_acl_operation_json(op) for op in operations],
         }
 
         with self.sess.pool.get_connection() as conn:

irods/test/access_test.py

@@ -501,17 +501,17 @@ def test_atomic_acls_505(self):
         ses = self.sess
         zone = user1 = user2 = user3 = group = None
         try:
-            zone = ses.zones.create("twilight","remote")
+            zone = ses.zones.create("twilight", "remote")
             user1 = ses.users.create("test_user_505", "rodsuser")
             user2 = ses.users.create("rod_serling_505#twilight", "rodsuser")
             user3 = ses.users.create("local_test_user_505", "rodsuser")
             group = ses.groups.create("test_group_505")
             ses.acls.apply_atomic_operations(
                 self.coll_path,
-                a1:=ACLOperation("write", user1.name, user1.zone),
-                a2:=ACLOperation("read", user2.name, user2.zone),
-                a3:=ACLOperation("read", user3.name, user3.zone),
-                a4:=ACLOperation("read", group.name),
+                a1 := ACLOperation("write", user1.name, user1.zone),
+                a2 := ACLOperation("read", user2.name, user2.zone),
+                a3 := ACLOperation("read", user3.name, user3.zone),
+                a4 := ACLOperation("read", group.name),
             )
 
             normalize = lambda access: access.copy(decanonicalize=True, implied_zone=ses.zone)
@@ -536,6 +536,7 @@ def test_atomic_acls_505(self):
             if zone:
                 zone.remove()
 
+
 if __name__ == "__main__":
     # let the tests find the parent irods lib
     sys.path.insert(0, os.path.abspath("../.."))