rename turtle2 longturtle; update parser & plubing docco

9 files changed, 25 insertions, 32 deletions

diff --git a/docs/plugin_parsers.rst b/docs/plugin_parsers.rst
index 81ab7ae6..a89e08fa 100644
--- a/docs/plugin_parsers.rst
+++ b/docs/plugin_parsers.rst
@@ -13,23 +13,18 @@ The ``html`` parser will auto-detect RDFa, HTurtle or Microdata.
 
 It is also possible to pass a mime-type for the ``format`` parameter::
     
-  graph.parse(my_url, format='application/rdf+xml')
+	graph.parse(my_url, format='application/rdf+xml')
 
 If you are not sure what format your file will be, you can use :func:`rdflib.util.guess_format` which will guess based on the file extension. 
 
 ========= ====================================================================
 Name      Class                                                               
 ========= ====================================================================
+json-ld   :class:`~rdflib.plugins.parsers.jsonld.JsonLDParser`
 html      :class:`~rdflib.plugins.parsers.structureddata.StructuredDataParser`
-hturtle   :class:`~rdflib.plugins.parsers.hturtle.HTurtleParser`
-mdata     :class:`~rdflib.plugins.parsers.structureddata.MicrodataParser`
-microdata :class:`~rdflib.plugins.parsers.structureddata.MicrodataParser`
 n3        :class:`~rdflib.plugins.parsers.notation3.N3Parser`
 nquads    :class:`~rdflib.plugins.parsers.nquads.NQuadsParser`
 nt        :class:`~rdflib.plugins.parsers.ntriples.NTParser`
-rdfa      :class:`~rdflib.plugins.parsers.structureddata.RDFaParser`
-rdfa1.0   :class:`~rdflib.plugins.parsers.structureddata.RDFa10Parser`
-rdfa1.1   :class:`~rdflib.plugins.parsers.structureddata.RDFaParser`
 trix      :class:`~rdflib.plugins.parsers.trix.TriXParser`
 turtle    :class:`~rdflib.plugins.parsers.notation3.TurtleParser`
 xml       :class:`~rdflib.plugins.parsers.rdfxml.RDFXMLParser`
diff --git a/docs/plugin_serializers.rst b/docs/plugin_serializers.rst
index 0aedd566..9da4f7ac 100644
--- a/docs/plugin_serializers.rst
+++ b/docs/plugin_serializers.rst
@@ -11,11 +11,12 @@ passing the name to a graph's :meth:`~rdflib.graph.Graph.serialize` method::
 
 It is also possible to pass a mime-type for the ``format`` parameter::
     
-  graph.serialize(my_url, format='application/rdf+xml')
+	graph.serialize(my_url, format='application/rdf+xml')
 
 ========== ===============================================================
 Name       Class                                                          
 ========== ===============================================================
+json-ld    :class:`~rdflib.plugins.serializers.jsonld.JsonLDSerializer`
 n3         :class:`~rdflib.plugins.serializers.n3.N3Serializer`
 nquads     :class:`~rdflib.plugins.serializers.nquads.NQuadsSerializer`
 nt         :class:`~rdflib.plugins.serializers.nt.NTSerializer`
@@ -23,6 +24,6 @@ pretty-xml :class:`~rdflib.plugins.serializers.rdfxml.PrettyXMLSerializer`
 trig       :class:`~rdflib.plugins.serializers.trig.TrigSerializer`
 trix       :class:`~rdflib.plugins.serializers.trix.TriXSerializer`
 turtle     :class:`~rdflib.plugins.serializers.turtle.TurtleSerializer`
+longturtle :class:`~rdflib.plugins.serializers.turtle.LongTurtleSerializer`
 xml        :class:`~rdflib.plugins.serializers.rdfxml.XMLSerializer`
 ========== ===============================================================
-
diff --git a/rdflib/plugin.py b/rdflib/plugin.py
index 22293d13..63c3ead7 100644
--- a/rdflib/plugin.py
+++ b/rdflib/plugin.py
@@ -263,18 +263,18 @@ register(
     "TurtleSerializer",
 )
 register(
-    "turtle2",
-    Serializer,
-    "rdflib.plugins.serializers.turtle2",
-    "TurtleSerializer2",
-)
-register(
     "ttl",
     Serializer,
     "rdflib.plugins.serializers.turtle",
     "TurtleSerializer",
 )
 register(
+    "longturtle",
+    Serializer,
+    "rdflib.plugins.serializers.longturtle",
+    "LongTurtleSerializer",
+)
+register(
     "application/n-triples",
     Serializer,
     "rdflib.plugins.serializers.nt",
diff --git a/rdflib/plugins/serializers/turtle2.py b/rdflib/plugins/serializers/longturtle.py
index 49e9cbad..0d50e47a 100644
--- a/rdflib/plugins/serializers/turtle2.py
+++ b/rdflib/plugins/serializers/longturtle.py
@@ -1,8 +1,8 @@
 """
-Turtle2 RDF graph serializer for RDFLib.
+LongTurtle RDF graph serializer for RDFLib.
 See <http://www.w3.org/TeamSubmission/turtle/> for syntax specification.
 
-This variant, turtle2 as opposed to just turtle, makes some small format changes
+This variant, longturtle as opposed to just turtle, makes some small format changes
 to turtle - the original turtle serializer. It:
 
 * uses PREFIX instead of @prefix
@@ -21,7 +21,7 @@ from rdflib.exceptions import Error
 from .turtle import RecursiveSerializer
 from rdflib.namespace import RDF
 
-__all__ = ["TurtleSerializer2"]
+__all__ = ["LongTurtleSerializer"]
 
 SUBJECT = 0
 VERB = 1
@@ -31,14 +31,14 @@ _GEN_QNAME_FOR_DT = False
 _SPACIOUS_OUTPUT = False
 
 
-class TurtleSerializer2(RecursiveSerializer):
+class LongTurtleSerializer(RecursiveSerializer):
 
-    short_name = "turtle2"
+    short_name = "longturtle"
     indentString = "    "
 
     def __init__(self, store):
         self._ns_rewrite = {}
-        super(TurtleSerializer2, self).__init__(store)
+        super(LongTurtleSerializer, self).__init__(store)
         self.keywords = {RDF.type: "a"}
         self.reset()
         self.stream = None
@@ -66,11 +66,11 @@ class TurtleSerializer2(RecursiveSerializer):
 
             prefix = self._ns_rewrite.get(prefix, prefix)
 
-        super(TurtleSerializer2, self).addNamespace(prefix, namespace)
+        super(LongTurtleSerializer, self).addNamespace(prefix, namespace)
         return prefix
 
     def reset(self):
-        super(TurtleSerializer2, self).reset()
+        super(LongTurtleSerializer, self).reset()
         self._shortNames = {}
         self._started = False
         self._ns_rewrite = {}
@@ -78,7 +78,7 @@ class TurtleSerializer2(RecursiveSerializer):
     def serialize(self, stream, base=None, encoding=None, spacious=None, **args):
         self.reset()
         self.stream = stream
-        # if base is given here, use that, if not and a base is set for the graph use that
+        # if base is given here, use, if not and a base is set for the graph use that
         if base is not None:
             self.base = base
         elif self.store.base is not None:
@@ -107,7 +107,7 @@ class TurtleSerializer2(RecursiveSerializer):
         self.base = None
 
     def preprocessTriple(self, triple):
-        super(TurtleSerializer2, self).preprocessTriple(triple)
+        super(LongTurtleSerializer, self).preprocessTriple(triple)
         for i, node in enumerate(triple):
             if node in self.keywords:
                 continue
@@ -123,12 +123,9 @@ class TurtleSerializer2(RecursiveSerializer):
         if not isinstance(uri, URIRef):
             return None
 
-        parts = None
-
         try:
             parts = self.store.compute_qname(uri, generate=gen_prefix)
         except:
-
             # is the uri a namespace in itself?
             pfx = self.store.store.prefix(uri)
 
diff --git a/test/test_rdfxml.py b/test/test_rdfxml.py
index b0b222dc..e695355c 100644
--- a/test/test_rdfxml.py
+++ b/test/test_rdfxml.py
@@ -84,7 +84,7 @@ RDFCOREBASE = "http://www.w3.org/2000/10/rdf-tests/rdfcore/"
 
 
 def relative(url):
-    return url[len(RDFCOREBASE) :]
+    return url[len(RDFCOREBASE):]
 
 
 def resolve(rel):
diff --git a/test/test_turtle2.py b/test/test_serialize_longturtle.py
index fef0efab..cc184787 100644
--- a/test/test_turtle2.py
+++ b/test/test_serialize_longturtle.py
@@ -1,9 +1,9 @@
-# tests for the turtle2 serializer
+# tests for the longturtle Serializer
 
 from rdflib import Graph
 
 
-def test_turtle2():
+def test_longturtle():
     g = Graph()
 
     g.parse(
@@ -86,7 +86,7 @@ def test_turtle2():
         """,
         format="turtle",
     )
-    s = g.serialize(format="turtle2")
+    s = g.serialize(format="longturtle")
     lines = s.split("\n")
 
     assert "ex:b" in lines
diff --git a/test/test_trix_serialize.py b/test/test_serialize_trix.py
index d0824aa9..d0824aa9 100644
--- a/test/test_trix_serialize.py
+++ b/test/test_serialize_trix.py
diff --git a/test/test_turtle_serialize.py b/test/test_serialize_turtle.py
index b17492e0..b17492e0 100644
--- a/test/test_turtle_serialize.py
+++ b/test/test_serialize_turtle.py
diff --git a/test/test_serializexml.py b/test/test_serialize_xml.py
index 6ca25a92..6ca25a92 100644
--- a/test/test_serializexml.py
+++ b/test/test_serialize_xml.py