Merge pull request #10 from edquist/derorable

decommission the adorable rorable

Author: edquist

.github/workflows/python-linters.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Set up Python 3.6
       uses: actions/setup-python@v2
       with:
-        python-version: 3.6
+        python-version: 3.6.15
 
     - uses: actions/cache@v2
       with:
@@ -51,7 +51,7 @@ jobs:
     - name: Set up Python 3.6
       uses: actions/setup-python@v2
       with:
-        python-version: 3.6
+        python-version: 3.6.15
 
     - uses: actions/cache@v2
       with:

create_project.py

@@ -137,32 +137,23 @@ def get_co_person_identifiers(pid):
 
 
 def get_co_group(gid):
-    grouplist = call_api("co_groups/%s.json" % gid) | get_datalist("CoGroups")
+    resp_data = call_api("co_groups/%s.json" % gid)
+    grouplist = get_datalist(resp_data, "CoGroups")
     if not grouplist:
         raise RuntimeError("No such CO Group Id: %s" % gid)
     return grouplist[0]
 
 
 def get_identifier(id_):
-    idfs = call_api("identifiers/%s.json" % id_) | get_datalist("Identifiers")
+    resp_data = call_api("identifiers/%s.json" % id_)
+    idfs = get_datalist(resp_data, "Identifiers")
     if not idfs:
         raise RuntimeError("No such Identifier Id: %s" % id_)
     return idfs[0]
 
 
-# @rorable
-# def foo(x): ...
-# x | foo -> foo(x)
-class rorable:
-    def __init__(self, f): self.f = f
-    def __call__(self, *a, **kw): return self.f(*a, **kw)
-    def __ror__ (self, x): return self.f(x)
-
-
-def get_datalist(listname):
-    def get(data):
-        return data[listname] if data else []
-    return rorable(get)
+def get_datalist(data, listname):
+    return data[listname] if data else []
 
 
 # script-specific functions
@@ -191,7 +182,8 @@ def add_identifier_to_group(gid, type_, identifier_name):
 
 
 def gname_to_gid(gname):
-    groups = get_osg_co_groups() | get_datalist("CoGroups")
+    resp_data = get_osg_co_groups()
+    groups = get_datalist(resp_data, "CoGroups")
     matching = [ g for g in groups if g["Name"] == gname ]
 
     if len(matching) > 1:

group_fixup.py

@@ -148,25 +148,15 @@ def get_co_person_identifiers(pid):
 
 
 def get_co_group(gid):
-    grouplist = call_api("co_groups/%s.json" % gid) | get_datalist("CoGroups")
+    resp_data = call_api("co_groups/%s.json" % gid)
+    grouplist = get_datalist(resp_data, "CoGroups")
     if not grouplist:
         raise RuntimeError("No such CO Group Id: %s" % gid)
     return grouplist[0]
 
 
-# @rorable
-# def foo(x): ...
-# x | foo -> foo(x)
-class rorable:
-    def __init__(self, f): self.f = f
-    def __call__(self, *a, **kw): return self.f(*a, **kw)
-    def __ror__ (self, x): return self.f(x)
-
-
-def get_datalist(listname):
-    def get(data):
-        return data[listname] if data else []
-    return rorable(get)
+def get_datalist(data, listname):
+    return data[listname] if data else []
 
 
 # api call results massagers
@@ -241,7 +231,8 @@ def show_misnamed_unixcluster_groups():
 
 
 def show_group_identifiers(gid):
-    identifiers = get_co_group_identifiers(gid) | get_datalist("Identifiers")
+    resp_data = get_co_group_identifiers(gid)
+    identifiers = get_datalist(resp_data, "Identifiers")
     for i in identifiers:
         print('   - Identifier {Id}: ({Type}) "{Identifier}"'.format(**i))
 
@@ -289,7 +280,8 @@ def fixup_unixcluster_group(gid):
     group = get_co_group(gid)
     oldname = group["Name"]
     newname = get_fixed_unixcluster_group_name(oldname)
-    identifiers = get_co_group_identifiers(gid) | get_datalist("Identifiers")
+    resp_data = get_co_group_identifiers(gid)
+    identifiers = get_datalist(resp_data, "Identifiers")
     ids_to_delete = get_identifiers_to_delete(identifiers)
 
     show_misnamed_unixcluster_group(group)

osg-comanage-project-usermap.py

@@ -108,44 +108,37 @@ def get_co_person_identifiers(pid):
     return call_api("identifiers.json", copersonid=pid)
 
 
-# @rorable
-# def foo(x): ...
-# x | foo -> foo(x)
-class rorable:
-    def __init__(self, f): self.f = f
-    def __call__(self, *a, **kw): return self.f(*a, **kw)
-    def __ror__ (self, x): return self.f(x)
-
-
-def get_datalist(listname):
-    def get(data):
-        return data[listname] if data else []
-    return rorable(get)
+def get_datalist(data, listname):
+    return data[listname] if data else []
 
 
 # api call results massagers
 
 def get_osg_co_groups__map():
     #print("get_osg_co_groups__map()")
-    data = get_osg_co_groups() | get_datalist("CoGroups")
+    resp_data = get_osg_co_groups()
+    data = get_datalist(resp_data, "CoGroups")
     return { g["Id"]: g["Name"] for g in data }
 
 
 def co_group_is_ospool(gid):
     #print(f"co_group_is_ospool({gid})")
-    data = get_co_group_identifiers(gid) | get_datalist("Identifiers")
+    resp_data = get_co_group_identifiers(gid)
+    data = get_datalist(resp_data, "Identifiers")
     return any( i["Type"] == "ospoolproject" for i in data )
 
 
 def get_co_group_members__pids(gid):
     #print(f"get_co_group_members__pids({gid})")
-    data = get_co_group_members(gid) | get_datalist("CoGroupMembers")
+    resp_data = get_co_group_members(gid)
+    data = get_datalist(resp_data, "CoGroupMembers")
     return [ m["Person"]["Id"] for m in data ]
 
 
 def get_co_person_osguser(pid):
     #print(f"get_co_person_osguser({pid})")
-    data = get_co_person_identifiers(pid) | get_datalist("Identifiers")
+    resp_data = get_co_person_identifiers(pid)
+    data = get_datalist(resp_data, "Identifiers")
     typemap = { i["Type"]: i["Identifier"] for i in data }
     return typemap.get("osguser")