merge commit

RDFLib · Oct 10, 2021 · a77e179 · a77e179
2 parents c3edfcd + 89d5ea2
commit a77e179
Show file tree

Hide file tree

Showing 31 changed files with 1,226 additions and 1,799 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,13 @@
 Changelog
 ---------
 
+v.6.0.2 - October, 2021
+~~~~~~~~~~~~~~~~~~~~~~~
+Changes:
+
+* works with rdflib >= 6.0.2
+* replaces owl namespace element lists with those of rdflib (OWL, RDF, RDFS, XSD)
+
 v5.2.3
 ~~~~~~
 

diff --git a/README_OLD.md b/README_OLD.md
diff --git a/docs/source/DatatypeHandling.rst b/docs/source/DatatypeHandling.rst
@@ -18,47 +18,47 @@ AltXSDToPYTHON Table
 .. code-block:: python
 
     AltXSDToPYTHON = {
-        ns_xsd["language"]: lambda v: _strToVal_Regexp(v, _re_language),
-        ns_xsd["NMTOKEN"]: lambda v: _strToVal_Regexp(v, _re_NMTOKEN, re.U),
-        ns_xsd["Name"]: lambda v: _strToVal_Regexp(v, _re_NMTOKEN, re.U, _re_Name_ex),
-        ns_xsd["NCName"]: lambda v: _strToVal_Regexp(v, _re_NCName, re.U, _re_NCName_ex),
-        ns_xsd["token"]: _strToToken,
-        ns_rdf["PlainLiteral"]: _strToPlainLiteral,
-        ns_xsd["boolean"]: _strToBool,
-        ns_xsd["decimal"]: _strToDecimal,
-        ns_xsd["anyURI"]: _strToAnyURI,
-        ns_xsd["base64Binary"]: _strToBase64Binary,
-        ns_xsd["double"]: _strToDouble,
-        ns_xsd["float"]: _strToFloat,
-        ns_xsd["byte"]: lambda v: _strToBoundNumeral(v, _limits_byte, int),
-        ns_xsd["int"]: lambda v: _strToBoundNumeral(v, _limits_int, int),
-        ns_xsd["long"]: lambda v: _strToBoundNumeral(v, _limits_long, int),
-        ns_xsd["positiveInteger"]: lambda v: _strToBoundNumeral(v, _limits_positiveInteger, int),
-        ns_xsd["nonPositiveInteger"]: lambda v: _strToBoundNumeral(v, _limits_nonPositiveInteger, int),
-        ns_xsd["negativeInteger"]: lambda v: _strToBoundNumeral(v, _limits_negativeInteger, int),
-        ns_xsd["nonNegativeInteger"]: lambda v: _strToBoundNumeral(v, _limits_nonNegativeInteger, int),
-        ns_xsd["short"]: lambda v: _strToBoundNumeral(v, _limits_short, int),
-        ns_xsd["unsignedByte"]: lambda v: _strToBoundNumeral(v, _limits_unsignedByte, int),
-        ns_xsd["unsignedShort"]: lambda v: _strToBoundNumeral(v, _limits_unsignedShort, int),
-        ns_xsd["unsignedInt"]: lambda v: _strToBoundNumeral(v, _limits_unsignedInt, int),
-        ns_xsd["unsignedLong"]: lambda v: _strToBoundNumeral(v, _limits_unsignedLong, int),
-        ns_xsd["hexBinary"]: _strToHexBinary,
-        ns_xsd["dateTime"]: lambda v: _strToDateTimeAndStamp(v, False),
-        ns_xsd["dateTimeStamp"]: lambda v: _strToDateTimeAndStamp(v, True),
-        ns_rdf["XMLLiteral"]: _strToXMLLiteral,
-        ns_xsd["integer"]: int,
-        ns_xsd["string"]: lambda v: v,
-        ns_rdf["HTML"]: lambda v: v,
-        ns_xsd["normalizedString"]: lambda v: _strToVal_Regexp(v, _re_token),
+        XSD.language: lambda v: _strToVal_Regexp(v, _re_language),
+        XSD.NMTOKEN: lambda v: _strToVal_Regexp(v, _re_NMTOKEN, re.U),
+        XSD.Name: lambda v: _strToVal_Regexp(v, _re_NMTOKEN, re.U, _re_Name_ex),
+        XSD.NCName: lambda v: _strToVal_Regexp(v, _re_NCName, re.U, _re_NCName_ex),
+        XSD.token: _strToToken,
+        RDF.plainLiteral: _strToPlainLiteral,
+        XSD.boolean: _strToBool,
+        XSD.decimal: _strToDecimal,
+        XSD.anyURI: _strToAnyURI,
+        XSD.base64Binary: _strToBase64Binary,
+        XSD.double: _strToDouble,
+        XSD.float: _strToFloat,
+        XSD.byte: lambda v: _strToBoundNumeral(v, _limits_byte, int),
+        XSD.int: lambda v: _strToBoundNumeral(v, _limits_int, int),
+        XSD.long: lambda v: _strToBoundNumeral(v, _limits_long, int),
+        XSD.positiveInteger: lambda v: _strToBoundNumeral(v, _limits_positiveInteger, int),
+        XSD.nonPositiveInteger: lambda v: _strToBoundNumeral(v, _limits_nonPositiveInteger, int),
+        XSD.negativeInteger: lambda v: _strToBoundNumeral(v, _limits_negativeInteger, int),
+        XSD.nonNegativeInteger: lambda v: _strToBoundNumeral(v, _limits_nonNegativeInteger, int),
+        XSD.short: lambda v: _strToBoundNumeral(v, _limits_short, int),
+        XSD.unsignedByte: lambda v: _strToBoundNumeral(v, _limits_unsignedByte, int),
+        XSD.unsignedShort: lambda v: _strToBoundNumeral(v, _limits_unsignedShort, int),
+        XSD.unsignedInt: lambda v: _strToBoundNumeral(v, _limits_unsignedInt, int),
+        XSD.unsignedLong: lambda v: _strToBoundNumeral(v, _limits_unsignedLong, int),
+        XSD.hexBinary: _strToHexBinary,
+        XSD.dateTime: lambda v: _strToDateTimeAndStamp(v, False),
+        XSD.dateTimeStamp: lambda v: _strToDateTimeAndStamp(v, True),
+        RDF.XMLLiteral: _strToXMLLiteral,
+        XSD.integer: int,
+        XSD.string: lambda v: v,
+        RDF.HTML: lambda v: v,
+        XSD.normalizedString: lambda v: _strToVal_Regexp(v, _re_token),
 
         # These are RDFS specific...
-        ns_xsd["time"]: _strToTime,
-        ns_xsd["date"]: _strToDate,
-        ns_xsd["gYearMonth"]: _strTogYearMonth,
-        ns_xsd["gYear"]: _strTogYear,
-        ns_xsd["gMonthDay"]: _strTogMonthDay,
-        ns_xsd["gDay"]: _strTogDay,
-        ns_xsd["gMonth"]: _strTogMonth,
+        XSD.time: _strToTime,
+        XSD.date: _strToDate,
+        XSD.gYearMonth: _strTogYearMonth,
+        XSD.gYear: _strTogYear,
+        XSD.gMonthDay: _strTogMonthDay,
+        XSD.gDay: _strTogDay,
+        XSD.gMonth: _strTogMonth,
     }
 
 .. seealso:: View the source code :ref:`DatatypeHandling`.
diff --git a/docs/source/OWL.rst b/docs/source/OWL.rst
diff --git a/docs/source/RDFS.rst b/docs/source/RDFS.rst
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -12,7 +12,7 @@ OWL-RL Documentation
 
 .. toctree::
    :maxdepth: 2
-   :caption: Getting Started:
+   :caption: Getting Started
 
    installation
    usage
@@ -27,11 +27,8 @@ OWL-RL Documentation
    Closure
    CombinedClosure
    DatatypeHandling
-   Literals
-   OWL
    OWLRL
    OWLRLExtras
-   RDFS
    RDFSClosure
    RestrictedDatatype
    XsdDatatypes

diff --git a/docs/source/Literals.rst → docs/source/owlrl.rst b/docs/source/Literals.rst → docs/source/owlrl.rst
@@ -1,7 +1,7 @@
-Literals
-========
+owlrl
+=====
 
-.. automodule:: owlrl.Literals
+.. automodule:: owlrl
     :members:
     :undoc-members:
     :inherited-members: