raise instead of return NotBoundError exception and adapted handling codefix_sparql_raise_unbound

2 files changed, 8 insertions, 7 deletions

diff --git a/rdflib/plugins/sparql/aggregates.py b/rdflib/plugins/sparql/aggregates.py
index 86bfb25a..571bac4f 100644
--- a/rdflib/plugins/sparql/aggregates.py
+++ b/rdflib/plugins/sparql/aggregates.py
@@ -83,13 +83,13 @@ def agg_Max(a, group, bindings):
 
 
 def agg_Count(a, group, bindings):
-
     c = 0
     for x in group:
         try:
             if a.vars != '*':
-                val = _eval(a.vars, x)
-                if isinstance(val, NotBoundError):
+                try:
+                    _eval(a.vars, x)
+                except NotBoundError:
                     continue
             c += 1
         except:
@@ -101,10 +101,11 @@ def agg_Count(a, group, bindings):
 
 def agg_Sample(a, group, bindings):
     for ctx in group:
-        val = _eval(a.vars, ctx)
-        if not isinstance(val, NotBoundError):
-            bindings[a.res] = val
+        try:
+            bindings[a.res] = _eval(a.vars, ctx)
             break
+        except NotBoundError:
+            pass
 
 
 def agg_GroupConcat(a, group, bindings):
diff --git a/rdflib/plugins/sparql/evalutils.py b/rdflib/plugins/sparql/evalutils.py
index 77fe33ef..b1e500bb 100644
--- a/rdflib/plugins/sparql/evalutils.py
+++ b/rdflib/plugins/sparql/evalutils.py
@@ -70,7 +70,7 @@ def _eval(expr, ctx):
         try:
             return ctx[expr]
         except KeyError:
-            return NotBoundError("Variable %s is not bound" % expr)
+            raise NotBoundError("Variable %s is not bound" % expr)
     elif isinstance(expr, CompValue):
         raise Exception(
             "Weird - _eval got a CompValue without evalfn! %r" % expr)