Merge pull request #864 from RDFLib/python-3.7

3.7 for travis

Author: gromgull

.travis.yml

@@ -15,6 +15,12 @@ python:
     - 3.5
     - 3.6
 
+matrix:
+  include:
+    - python: 3.7
+      dist: xenial
+      sudo: true
+
 before_install:
     - pip install -U setuptools pip  # seems travis comes with a too old setuptools for html5lib
     - bash .travis.fuseki_install_optional.sh

docs/developers.rst

@@ -56,7 +56,7 @@ If you make a pull-request to RDFLib on GitHub, travis will automatically test y
 Compatibility
 -------------
 
-RDFLib>=5.0.0 tries to be compatible with python versions 2.7, 3.5, 3.6.
+RDFLib>=5.0.0 tries to be compatible with python versions 2.7, 3.5, 3.6, 3.7.
 
 
 Releasing

rdflib/plugins/sparql/evaluate.py

@@ -15,6 +15,7 @@
 """
 
 import collections
+import itertools
 
 from rdflib import Variable, Graph, BNode, URIRef, Literal
 from six import iteritems, itervalues
@@ -321,22 +322,9 @@ def evalOrderBy(ctx, part):
 
 
 def evalSlice(ctx, slice):
-    # import pdb; pdb.set_trace()
     res = evalPart(ctx, slice.p)
-    i = 0
-    while i < slice.start:
-        next(res)
-        i += 1
-    i = 0
-    for x in res:
-        i += 1
-        if slice.length is None:
-            yield x
-        else:
-            if i <= slice.length:
-                yield x
-            else:
-                break
+
+    return itertools.islice(res, slice.start, slice.start+slice.length if slice.length is not None else None)
 
 
 def evalReduced(ctx, part):

rdflib/query.py

@@ -3,6 +3,7 @@
 from __future__ import print_function
 
 import os
+import itertools
 import shutil
 import tempfile
 import warnings
@@ -185,7 +186,7 @@ def _get_bindings(self):
         return self._bindings
 
     def _set_bindings(self, b):
-        if isinstance(b, types.GeneratorType):
+        if isinstance(b, (types.GeneratorType, itertools.islice)):
             self._genbindings = b
             self._bindings = []
         else:

setup.py

@@ -46,6 +46,7 @@ def find_version(filename):
             "Programming Language :: Python :: 3.4",
             "Programming Language :: Python :: 3.5",
             "Programming Language :: Python :: 3.6",
+            "Programming Language :: Python :: 3.7",
             "License :: OSI Approved :: BSD License",
             "Topic :: Software Development :: Libraries :: Python Modules",
             "Operating System :: OS Independent",