Transition from 2to3 to use of six.py to be merged in 5.0.0-dev

.travis.yml

@@ -14,29 +14,20 @@ python:
     - 3.4
     - 3.5
     - 3.6
-    # - "pypy"
 
 before_install:
-    - pip install -U setuptools pip  # seems travis comes with a too old setuptools for html5lib
     - bash .travis.fuseki_install_optional.sh
 
 install:
-    - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '2' ]]; then pip install --default-timeout 60 -r requirements.py2.txt; fi
-    - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '3' ]]; then pip install --default-timeout 60 -r requirements.py3.txt; fi
-    # isodate0.4.8 is problematic with Pypy, use fixed version
-    - if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then pip install --upgrade "https://bitbucket.org/gjhiggins/isodate/downloads/isodate-0.4.8.tar.gz"; pip install --default-timeout 60 "elementtree"; fi
+    - pip install --default-timeout 60 -r requirements.txt
     - pip install --default-timeout 60 coverage coveralls nose-timer && export HAS_COVERALLS=1
     - python setup.py install
 
 before_script:
-    - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]] || [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then flake8 --exclude=pyRdfa,extras,host,transform,rdfs,sparql,results,pyMicrodata --exit-zero rdflib; fi
+    - flake8 --exclude=pyRdfa,extras,host,transform,rdfs,sparql,results,pyMicrodata --exit-zero rdflib
 
 script:
-    # Must run the tests in build/src so python3 doesn't get confused and run
-    # the python2 code from the current directory instead of the installed
-    # 2to3 version in build/src.
-    - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '2' ]]; then PYTHONWARNINGS=default nosetests --with-timer --timer-top-n 42 --with-coverage --cover-tests --cover-package=rdflib ; fi
-    - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '3' ]]; then PYTHONWARNINGS=default nosetests --with-timer --timer-top-n 42 --with-coverage --cover-tests --cover-package=build/src/rdflib --where=./build/src; fi
+    - PYTHONWARNINGS=default nosetests --with-timer --timer-top-n 42 --with-coverage --cover-tests --cover-package=rdflib
 
 after_success:
     - if [[ $HAS_COVERALLS ]] ; then coveralls ; fi

docs/plugintable.py

@@ -1,5 +1,5 @@
 """
-Crappy utility for generating Sphinx tables 
+Crappy utility for generating Sphinx tables
 for rdflib plugins
 """
 
@@ -11,23 +11,22 @@
 
 p = {}
 
-for (name, kind), plugin in _plugins.items(): 
+for (name, kind), plugin in _plugins.items():
     if "/" in name: continue # skip duplicate entries for mimetypes
-    if cls == kind.__name__: 
+    if cls == kind.__name__:
         p[name]="%s.%s"%(plugin.module_path, plugin.class_name)
 
 l1=max(len(x) for x in p)
 l2=max(10+len(x) for x in p.values())
 
 def hr():
-    print "="*l1,"="*l2
+    print("="*l1,"="*l2)
 
 hr()
-print "%-*s"%(l1,"Name"), "%-*s"%(l2, "Class")
+print("%-*s"%(l1,"Name"), "%-*s"%(l2, "Class"))
 hr()
 
-for n in sorted(p): 
-    print "%-*s"%(l1,n), ":class:`~%s`"%p[n]
+for n in sorted(p):
+    print("%-*s"%(l1,n), ":class:`~%s`"%p[n])
 hr()
-print 
-
+print()

examples/conjunctive_graphs.py

@@ -53,6 +53,6 @@
 
     # query the conjunction of all graphs
 
-    print 'Mary loves:'
+    print('Mary loves:')
     for x in g[mary : ns.loves/ns.hasName]:
-        print x
+        print(x)

examples/custom_datatype.py

@@ -1,6 +1,6 @@
 """
 
-RDFLib can map between data-typed literals and python objects. 
+RDFLib can map between data-typed literals and python objects.
 
 Mapping for integers, floats, dateTimes, etc. are already added, but
 you can also add your own.
@@ -17,9 +17,9 @@
 if __name__=='__main__':
 
     # complex numbers are not registered by default
-    # no custom constructor/serializer needed since 
+    # no custom constructor/serializer needed since
     # complex('(2+3j)') works fine
-    bind(XSD.complexNumber, complex) 
+    bind(XSD.complexNumber, complex)
 
     ns=Namespace("urn:my:namespace:")
 
@@ -39,8 +39,6 @@
 
     l2=list(g2)[0][2]
 
-    print l2 
-
-    print l2.value == c # back to a python complex object
-
+    print(l2)
 
+    print(l2.value == c) # back to a python complex object

examples/custom_eval.py

@@ -65,4 +65,4 @@ def customEval(ctx, part):
     # Find all FOAF Agents
     for x in g.query(
             'PREFIX foaf: <%s> SELECT * WHERE { ?s a foaf:Agent . }' % FOAF):
-        print x
+        print(x)

examples/film.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-""" 
+"""
 
 film.py: a simple tool to manage your movies review
 Simon Rozet, http://atonie.org/
@@ -10,7 +10,7 @@
 - handle non IMDB uri
 - markdown support in comment
 
-Requires download and import of Python imdb library from 
+Requires download and import of Python imdb library from
 http://imdbpy.sourceforge.net/ - (warning: installation
 will trigger automatic installation of several other packages)
 
@@ -25,14 +25,14 @@
 """
 import datetime, os, sys, re, time
 
-try: 
+try:
     import imdb
-except ImportError: 
+except ImportError:
     imdb = None
 
 from rdflib import BNode, ConjunctiveGraph, URIRef, Literal, Namespace, RDF
 from rdflib.namespace import FOAF, DC
-
+from six.moves import input
 
 storefn = os.path.expanduser('~/movies.n3')
 #storefn = '/home/simon/codes/film.dev/movies.n3'
@@ -53,10 +53,10 @@ def __init__(self):
         self.graph.bind('foaf', FOAF)
         self.graph.bind('imdb', IMDB)
         self.graph.bind('rev', 'http://purl.org/stuff/rev#')
-    
+
     def save(self):
         self.graph.serialize(storeuri, format='n3')
-    
+
     def who(self, who=None):
         if who is not None:
             name, email = (r_who.match(who).group(1), r_who.match(who).group(2))
@@ -67,14 +67,14 @@ def who(self, who=None):
             self.save()
         else:
             return self.graph.objects(URIRef(storeuri+'#author'), FOAF['name'])
-        
+
     def new_movie(self, movie):
         movieuri = URIRef('http://www.imdb.com/title/tt%s/' % movie.movieID)
         self.graph.add((movieuri, RDF.type, IMDB['Movie']))
         self.graph.add((movieuri, DC['title'], Literal(movie['title'])))
         self.graph.add((movieuri, IMDB['year'], Literal(int(movie['year']))))
         self.save()
-    
+
     def new_review(self, movie, date, rating, comment=None):
         review = BNode() # @@ humanize the identifier (something like #rev-$date)
         movieuri = URIRef('http://www.imdb.com/title/tt%s/' % movie.movieID)
@@ -91,7 +91,7 @@ def new_review(self, movie, date, rating, comment=None):
 
     def movie_is_in(self, uri):
         return (URIRef(uri), RDF.type, IMDB['Movie']) in self.graph
-        
+
 def help():
     print(__doc__.split('--')[1])
 
@@ -121,22 +121,22 @@ def main(argv=None):
             rating = None
             while not rating or (rating > 5 or rating <= 0):
                 try:
-                    rating = int(raw_input('Rating (on five): '))
+                    rating = int(input('Rating (on five): '))
                 except ValueError:
                     rating = None
             date = None
             while not date:
                 try:
-                    i = raw_input('Review date (YYYY-MM-DD): ')
+                    i = input('Review date (YYYY-MM-DD): ')
                     date = datetime.datetime(*time.strptime(i, '%Y-%m-%d')[:6])
                 except:
                     date = None
-            comment = raw_input('Comment: ')
+            comment = input('Comment: ')
             s.new_review(movie, date, rating, comment)
     else:
         help()
 
 if __name__ == '__main__':
-    if not imdb: 
+    if not imdb:
         raise Exception('This example requires the IMDB library! Install with "pip install imdbpy"')
     main()

examples/foafpaths.py

@@ -4,7 +4,7 @@
 in triple-patterns.
 
 We overload some python operators on URIRefs to allow creating path
-operators directly in python. 
+operators directly in python.
 
 ============ =========================================
 Operator     Path
@@ -13,7 +13,7 @@
 ``p1 | p2``  Path alternative
 ``p1 * '*'`` chain of 0 or more p's
 ``p1 * '+'`` chain of 1 or more p's
-``p1 * '?'`` 0 or 1 p 
+``p1 * '?'`` 0 or 1 p
 ``~p1``      p1 inverted, i.e. (s p1 o) <=> (o ~p1 s)
 ``-p1``      NOT p1, i.e. any property but p1
 ============ =========================================
@@ -38,7 +38,7 @@
 
     tim = URIRef("http://www.w3.org/People/Berners-Lee/card#i")
 
-    print "Timbl knows:"
+    print("Timbl knows:")
 
     for o in g.objects(tim, FOAF.knows / FOAF.name):
-        print o
+        print(o)

examples/graph_digest_benchmark.py

@@ -1,20 +1,25 @@
 #!/usr/bin/env python
 
+
 '''
 This benchmark will produce graph digests for all of the
 downloadable ontologies available in Bioportal.
 '''
 
-from rdflib import *
+from __future__ import print_function
+
+from rdflib import Namespace, Graph
 from rdflib.compare import to_isomorphic
+from six.moves.urllib.request import urlopen
+from six.moves import queue
 import sys, csv
-from urllib import *
+
 from io import StringIO
 from collections import defaultdict
-from urllib2 import urlopen
 
-from multiprocessing import *
-from Queue import Empty
+
+from multiprocessing import Process, Semaphore, Queue
+
 
 bioportal_query = '''
 PREFIX metadata: <http://data.bioontology.org/metadata/>
@@ -63,18 +68,18 @@ def worker(q, finished_tasks, dl_lock):
                 og = Graph()
                 try:
                     og.load(stats['download_url'])
-                    print stats['ontology'], stats['id']
+                    print(stats['ontology'], stats['id'])
                     ig = to_isomorphic(og)
                     graph_digest = ig.graph_digest(stats)
                     finished_tasks.put(stats)
                 except Exception as e:
-                    print 'ERROR', stats['id'], e
+                    print('ERROR', stats['id'], e)
                     stats['error'] = str(e)
                     finished_tasks.put(stats)
-        except Empty:
+        except queue.Empty:
             pass
     for i in range(int(threads)):
-        print "Starting worker", i
+        print("Starting worker", i)
         t = Process(target=worker, args=[tasks, finished_tasks, dl_lock])
         t.daemon = True
         t.start()
@@ -100,7 +105,7 @@ def bioportal_benchmark(apikey, output_file, threads):
     metadata = Namespace("http://data.bioontology.org/metadata/")
     url = 'http://data.bioontology.org/ontologies?apikey=%s' % apikey
     ontology_graph = Graph()
-    print url
+    print(url)
     ontology_list_json = urlopen(url).read()
     ontology_graph.parse(StringIO(unicode(ontology_list_json)), format="json-ld")
     ontologies = ontology_graph.query(bioportal_query)
@@ -123,18 +128,18 @@ def worker(q, finished_tasks, dl_lock):
                         og.load(stats['download_url'] + "?apikey=%s" % apikey)
                     finally:
                         dl_lock.release()
-                    print stats['ontology'], stats['id']
+                    print(stats['ontology'], stats['id'])
                     ig = to_isomorphic(og)
                     graph_digest = ig.graph_digest(stats)
                     finished_tasks.put(stats)
                 except Exception as e:
-                    print 'ERROR', stats['id'], e
+                    print('ERROR', stats['id'], e)
                     stats['error'] = str(e)
                     finished_tasks.put(stats)
         except Empty:
             pass
     for i in range(int(threads)):
-        print "Starting worker", i
+        print("Starting worker", i)
         t = Process(target=worker, args=[tasks, finished_tasks, dl_lock])
         t.daemon = True
         t.start()

examples/prepared_query.py

@@ -4,7 +4,7 @@
 SPARQL Queries be prepared (i.e parsed and translated to SPARQL algebra)
 by the :meth:`rdflib.plugins.sparql.prepareQuery` method.
 
-When executing, variables can be bound with the 
+When executing, variables can be bound with the
 ``initBindings`` keyword parameter
 
 
@@ -17,7 +17,7 @@
 if __name__=='__main__':
 
     q = prepareQuery(
-        'SELECT ?s WHERE { ?person foaf:knows ?s .}', 
+        'SELECT ?s WHERE { ?person foaf:knows ?s .}',
         initNs = { "foaf": FOAF })
 
     g = rdflib.Graph()
@@ -26,4 +26,4 @@
     tim = rdflib.URIRef("http://www.w3.org/People/Berners-Lee/card#i")
 
     for row in g.query(q, initBindings={'person': tim}):
-        print row
+        print(row)

examples/rdfa_example.py

@@ -1,5 +1,5 @@
 """
- 
+
 A simple example showing how to process RDFa from the web
 
 """
@@ -11,12 +11,12 @@
 
     g.parse('http://www.worldcat.org/title/library-of-babel/oclc/44089369', format='rdfa')
 
-    print "Books found:"
+    print("Books found:")
 
-    for row in g.query("""SELECT ?title ?author WHERE { 
-       [ a schema:Book ; 
+    for row in g.query("""SELECT ?title ?author WHERE {
+       [ a schema:Book ;
          schema:author [ rdfs:label ?author ] ;
          schema:name ?title ]
        FILTER (LANG(?title) = 'en') } """):
 
-        print "%s by %s"%(row.title, row.author)
+        print("%s by %s"%(row.title, row.author))