minor code improvements

Author: mielvds

lib/pyld/iri_resolver.py

@@ -123,14 +123,14 @@ def remove_dot_segments_of_path(iri: str, colon_position: int) -> str:
 
 
 def resolve(relative_iri: str, base_iri: str = None) -> str:
-    #     """
-    #     Resolves a given relative IRI to an absolute IRI.
+    """
+    Resolves a given relative IRI to an absolute IRI.
 
-    #     :param base_iri: the base IRI.
-    #     :param relative_iri: the relative IRI.
+    :param base_iri: the base IRI.
+    :param relative_iri: the relative IRI.
 
-    #     :return: the absolute IRI.
-    #     """
+    :return: the absolute IRI.
+    """
     base_iri = base_iri or ''
     base_fragment_pos = base_iri.find("#")
 
@@ -289,7 +289,7 @@ def unresolve(absolute_iri: str, base_iri: str = ""):
         rval = './' + rval
 
     # build relative IRI using urlunparse with empty scheme/netloc
-    return urlunparse(('', '', rval, '', rel.query or '', rel.fragment or '')) or './'
+    return urlunparse(('', '', rval, '', rel.query, rel.fragment)) or './'
 
 
 def parse_authority(parsed_iri: ParseResult) -> str:

lib/pyld/jsonld.py

@@ -1309,12 +1309,9 @@ def remove_value(subject, property, value, options=None):
             options = {}
         options.setdefault('propertyIsArray', False)
 
-        # filter out value
-        def filter_value(e):
-            return not JsonLdProcessor.compare_values(e, value)
-
         values = JsonLdProcessor.get_values(subject, property)
-        values = list(filter(filter_value, values))
+        # filter out value
+        values = [e for e in values if not JsonLdProcessor.compare_values(e, value)]
 
         if len(values) == 0:
             JsonLdProcessor.remove_property(subject, property)
@@ -1686,7 +1683,7 @@ def _compact(self, active_ctx, active_property, element, options):
                             )
                             del compacted_value[compacted_property]
 
-                    if len(compacted_value.keys()) > 0:
+                    if compacted_value:
                         # use keyword alias and add value
                         alias = self._compact_iri(active_ctx, expanded_property)
                         JsonLdProcessor.add_value(rval, alias, compacted_value)
@@ -1999,7 +1996,7 @@ def _compact(self, active_ctx, active_property, element, options):
                             # whose key maps to @id, recompact without @type
                             if (
                                 _is_object(compacted_item)
-                                and len(compacted_item.keys()) == 1
+                                and len(compacted_item) == 1
                                 and '@id' in expanded_item
                             ):
                                 compacted_item = self._compact(
@@ -3040,7 +3037,7 @@ def _from_rdf(self, dataset: Dataset, options):
                 # 3. Have an array for rdf:rest that has 1 item
                 # 4. Have no keys other than: @id, rdf:first, rdf:rest
                 #   and, optionally, @type where the value is rdf:List.
-                node_key_count = len(node.keys())
+                node_key_count = len(node)
                 while (
                     property == str(RDF.rest)
                     and _is_object(referenced_once.get(node['@id']))
@@ -3066,7 +3063,7 @@ def _from_rdf(self, dataset: Dataset, options):
                     node = usage['node']
                     property = usage['property']
                     head = usage['value']
-                    node_key_count = len(node.keys())
+                    node_key_count = len(node)
 
                     # if node is not a blank node, then list head found
                     if not node['@id'].startswith('_:'):
@@ -4920,11 +4917,7 @@ def _remove_embed(self, state, id_):
         def remove_dependents(id_):
             # get embed keys as a separate array to enable deleting keys
             # in map
-            try:
-                ids = list(embeds.iterkeys())
-            except AttributeError:
-                ids = list(embeds.keys())
-            for next in ids:
+            for next in list(embeds):
                 if (
                     next in embeds
                     and _is_object(embeds[next]['parent'])
@@ -6502,7 +6495,8 @@ def _is_graph(v):
     return (
         _is_object(v)
         and '@graph' in v
-        and len([k for k, vv in v.items() if (k != '@id' and k != '@index')]) == 1
+        # count non-@id/@index keys
+        and set(v) <= {'@graph', '@id', '@index'}
     )