From 3426b4e201cf03b78d2a3f144876955fcda2f66b Mon Sep 17 00:00:00 2001
From: Matthias Baumgartner <dev@igsor.net>
Date: Thu, 15 Dec 2022 17:17:53 +0100
Subject: extractor interface revision * schema as property * predicates ->
 principals

---
 bsie/extractor/generic/constant.py | 8 +++-----
 bsie/extractor/generic/path.py     | 7 +++----
 bsie/extractor/generic/stat.py     | 7 +++----
 3 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'bsie/extractor/generic')

diff --git a/bsie/extractor/generic/constant.py b/bsie/extractor/generic/constant.py
index f9e3415..cdb2ef6 100644
--- a/bsie/extractor/generic/constant.py
+++ b/bsie/extractor/generic/constant.py
@@ -9,8 +9,6 @@ import typing
 
 # bsie imports
 from bsie.base import extractor
-from bsie.utils.bsfs import URI, schema as _schema
-from bsie.utils.node import Node
 from bsie.utils import bsfs, node
 
 # exports
@@ -50,10 +48,10 @@ class Constant(extractor.Extractor):
             self,
             subject: node.Node,
             content: None,
-            predicates: typing.Iterable[_schema.Predicate],
-            ) -> typing.Iterator[typing.Tuple[Node, _schema.Predicate, typing.Any]]:
+            principals: typing.Iterable[bsfs.schema.Predicate],
+            ) -> typing.Iterator[typing.Tuple[node.Node, bsfs.schema.Predicate, typing.Any]]:
         for pred, value in self._tuples:
-            if pred in predicates:
+            if pred in principals:
                 yield subject, pred, value
 
 ## EOF ##
diff --git a/bsie/extractor/generic/path.py b/bsie/extractor/generic/path.py
index 00165e3..23ae80b 100644
--- a/bsie/extractor/generic/path.py
+++ b/bsie/extractor/generic/path.py
@@ -10,7 +10,6 @@ import typing
 
 # bsie imports
 from bsie.base import extractor
-from bsie.utils.bsfs import schema
 from bsie.utils import bsfs, node, ns
 
 # exports
@@ -46,9 +45,9 @@ class Path(extractor.Extractor):
             self,
             subject: node.Node,
             content: str,
-            predicates: typing.Iterable[schema.Predicate],
-            ) -> typing.Iterator[typing.Tuple[node.Node, schema.Predicate, typing.Any]]:
-        for pred in predicates:
+            principals: typing.Iterable[bsfs.schema.Predicate],
+            ) -> typing.Iterator[typing.Tuple[node.Node, bsfs.schema.Predicate, typing.Any]]:
+        for pred in principals:
             # find callback
             clbk = self._callmap.get(pred)
             if clbk is None:
diff --git a/bsie/extractor/generic/stat.py b/bsie/extractor/generic/stat.py
index 0f4267f..1dcfedf 100644
--- a/bsie/extractor/generic/stat.py
+++ b/bsie/extractor/generic/stat.py
@@ -10,7 +10,6 @@ import typing
 
 # bsie imports
 from bsie.base import extractor
-from bsie.utils.bsfs import schema as _schema
 from bsie.utils import bsfs, node, ns
 
 # exports
@@ -46,9 +45,9 @@ class Stat(extractor.Extractor):
             self,
             subject: node.Node,
             content: os.stat_result,
-            predicates: typing.Iterable[_schema.Predicate],
-            ) -> typing.Iterator[typing.Tuple[node.Node, _schema.Predicate, typing.Any]]:
-        for pred in predicates:
+            principals: typing.Iterable[bsfs.schema.Predicate],
+            ) -> typing.Iterator[typing.Tuple[node.Node, bsfs.schema.Predicate, typing.Any]]:
+        for pred in principals:
             # find callback
             clbk = self._callmap.get(pred)
             if clbk is None:
-- 
cgit v1.2.3