Merge pull request #1386 from mwatts15/issue-873-rdf-namespace-does-n…

…ot-allow-rdf-seq-valid-terms Allowing Container Membership Properties in RDF namespace (#873)
RDFLib · Aug 13, 2021 · e9fea54 · e9fea54
2 parents 174c620 + 7135d38
commit e9fea54
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 66 deletions.
diff --git a/rdflib/namespace/_RDF.py b/rdflib/namespace/_RDF.py
@@ -16,6 +16,7 @@ class RDF(DefinedNamespace):
     """
 
     _fail = True
+    _underscore_num = True
 
     # http://www.w3.org/1999/02/22-rdf-syntax-ns#List
     nil: URIRef  # The empty list, with no items in it. If the rest of a list is nil then the list has no more items in it.

diff --git a/rdflib/namespace/__init__.py b/rdflib/namespace/__init__.py
@@ -288,71 +288,6 @@ def _ipython_key_completions_(self):
         return dir(self)
 
 
-class _RDFNamespace(ClosedNamespace):
-    """
-    Closed namespace for RDF terms
-    """
-
-    def __new__(cls):
-        return super().__new__(
-            cls,
-            "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
-            terms=[
-                # Syntax Names
-                "RDF",
-                "Description",
-                "ID",
-                "about",
-                "parseType",
-                "resource",
-                "li",
-                "nodeID",
-                "datatype",
-                # RDF Classes
-                "Seq",
-                "Bag",
-                "Alt",
-                "Statement",
-                "Property",
-                "List",
-                "PlainLiteral",
-                # RDF Properties
-                "subject",
-                "predicate",
-                "object",
-                "type",
-                "value",
-                "first",
-                "rest",
-                # and _n where n is a non-negative integer
-                # RDF Resources
-                "nil",
-                # Added in RDF 1.1
-                "XMLLiteral",
-                "HTML",
-                "langString",
-                # Added in JSON-LD 1.1
-                "JSON",
-                "CompoundLiteral",
-                "language",
-                "direction",
-            ],
-        )
-
-    def term(self, name):
-        # Container membership properties
-        if name.startswith("_"):
-            try:
-                i = int(name[1:])
-            except ValueError:
-                pass
-            else:
-                if i > 0:
-                    return URIRef(f"{self}_{i}")
-
-        return super().term(name)
-
-
 XMLNS = Namespace("http://www.w3.org/XML/1998/namespace")
 
 

diff --git a/test/test_namespace.py b/test/test_namespace.py
@@ -241,4 +241,7 @@ def test_contains_method(self):
         )
 
         ref = URIRef("http://www.w3.org/1999/02/22-rdf-syntax-ns#type")
-        self.assertTrue(ref in RDF, "_RDFNamespace does not include rdf:type")
+        self.assertTrue(ref in RDF, "RDF does not include rdf:type")
+
+        ref = URIRef("http://www.w3.org/1999/02/22-rdf-syntax-ns#_1")
+        self.assertTrue(ref in RDF, "RDF does not include rdf:_1")