Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

handle encoding of base64Binary Literals #1258

Merged
merged 2 commits into from
May 15, 2021
Merged

handle encoding of base64Binary Literals #1258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a11438a
handle encoding of base64Binary Literals
delocalizer Feb 19, 2021
31a3d16
test case for #1257
delocalizer Feb 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions rdflib/term.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import warnings
import math

import base64
import xml.dom.minidom

from datetime import date, time, datetime, timedelta
Expand All @@ -53,6 +52,7 @@
parse_duration,
duration_isoformat,
)
from base64 import b64decode, b64encode
from binascii import hexlify, unhexlify

import rdflib
Expand Down Expand Up @@ -1435,6 +1435,7 @@ def _parseBoolean(value):
_XSD_YEARMONTHDURATION = URIRef(_XSD_PFX + "yearMonthDuration")

_OWL_RATIONAL = URIRef("http://www.w3.org/2002/07/owl#rational")
_XSD_B64BINARY = URIRef(_XSD_PFX + "base64Binary")
_XSD_HEXBINARY = URIRef(_XSD_PFX + "hexBinary")
# TODO: gYearMonth, gYear, gMonthDay, gDay, gMonth

Expand Down Expand Up @@ -1559,6 +1560,8 @@ def _castPythonToLiteral(obj, datatype):
_SpecificPythonToXSDRules = [
((str, _XSD_HEXBINARY), hexlify),
((bytes, _XSD_HEXBINARY), hexlify),
((str, _XSD_B64BINARY), b64encode),
((bytes, _XSD_B64BINARY), b64encode),
]

XSDToPython = {
Expand Down Expand Up @@ -1593,7 +1596,7 @@ def _castPythonToLiteral(obj, datatype):
URIRef(_XSD_PFX + "unsignedByte"): int,
URIRef(_XSD_PFX + "float"): float,
URIRef(_XSD_PFX + "double"): float,
URIRef(_XSD_PFX + "base64Binary"): lambda s: base64.b64decode(s),
URIRef(_XSD_PFX + "base64Binary"): b64decode,
URIRef(_XSD_PFX + "anyURI"): None,
_RDF_XMLLITERAL: _parseXML,
_RDF_HTMLLITERAL: _parseHTML,
Expand Down
29 changes: 29 additions & 0 deletions test/test_b64_binary.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# -*- coding: utf-8 -*-

import unittest
import base64
from rdflib import Literal, XSD


class B64BinaryTestCase(unittest.TestCase):

def test_unicode(self):
str1 = "Test utf-8 string éàë"
# u b64string
b64_str1 = base64.b64encode(str1.encode("utf-8")).decode()
l1 = Literal(b64_str1, datatype=XSD.base64Binary)
b_str1 = l1.toPython()
self.assertEqual(b_str1.decode("utf-8"), str1)
self.assertEqual(str(l1), b64_str1)

# b b64string
b64_str1b = base64.b64encode(str1.encode("utf-8"))
l1b = Literal(b64_str1b, datatype=XSD.base64Binary)
b_str1b = l1b.toPython()
self.assertEqual(b_str1, b_str1b)
self.assertEqual(b_str1b.decode("utf-8"), str1)
self.assertEqual(str(l1b), b64_str1)


if __name__ == "__main__":
unittest.main()