From 94afdabcf72b04445d75a8322c11c97d704b109d Mon Sep 17 00:00:00 2001
From: Rinke Hoekstra <r.hoekstra@elsevier.com>
Date: Wed, 3 Jul 2019 10:50:32 +0200
Subject: [PATCH 1/2] Added code that tries to parse JSON-LD contained in HTML
 <script> elements with appropriate mime type set. This should turn
 rdflib-jsonld into a full processor as defined in the JSON-LD 1.1 WD at
 https://w3c.github.io/json-ld-syntax/#processor-levels

---
 rdflib_jsonld/util.py | 54 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/rdflib_jsonld/util.py b/rdflib_jsonld/util.py
index 698cac0..861f4a6 100644
--- a/rdflib_jsonld/util.py
+++ b/rdflib_jsonld/util.py
@@ -6,6 +6,9 @@
 
 from six import PY3
 
+if PY3:
+    from html.parser import HTMLParser
+
 from os import sep
 from os.path import normpath
 if PY3:
@@ -18,6 +21,41 @@
     from io import StringIO
 
 
+class HTMLJSONParser(HTMLParser):
+    def __init__(self):
+        super().__init__()
+        self.json = []
+        self.contains_json = False
+
+    def handle_starttag(self, tag, attrs):
+        self.contains_json = False
+
+        # Only set self. contains_json to True if the
+        # type is 'application/ld+json'
+        if tag == "script":
+            for (attr, value) in attrs:
+                if attr == 'type' and value == 'application/ld+json':
+                    self.contains_json = True
+                else:
+                    # Nothing to do
+                    continue
+
+    def handle_data(self, data):
+        # Only do something when we know the context is a
+        # script element containing application/ld+json
+
+        if self.contains_json is True:
+            if data.strip() == "":
+                # skip empty data elements
+                return
+
+            # Try to parse the json
+            self.json.append(json.loads(data))
+
+    def get_json(self):
+        return self.json
+
+
 def source_to_json(source):
     # TODO: conneg for JSON (fix support in rdflib's URLInputSource!)
     source = create_input_source(source, format='json-ld')
@@ -28,6 +66,22 @@ def source_to_json(source):
             return json.load(StringIO(stream.read().decode('utf-8')))
         else:
             return json.load(stream)
+    except json.JSONDecodeError as e:
+        # The document is not a JSON document, let's see whether we can parse
+        # it as HTML
+
+        # Reset stream pointer to 0
+        stream.seek(0)
+        if PY3:
+            # Only do this when in Python 3
+            parser = HTMLJSONParser()
+            parser.feed(stream.read().decode('utf-8'))
+
+            return parser.get_json()
+        else:
+            # If not PY3, then we're just going to continue with the original
+            # parse exception
+            raise e
     finally:
         stream.close()
 

From 6975d55e3ea035475b56ef162ea4c0d0a260daf9 Mon Sep 17 00:00:00 2001
From: Nicholas Car <nicholas.car@surroundaustralia.com>
Date: Thu, 8 Jul 2021 00:07:33 +1000
Subject: [PATCH 2/2] remove PY3 testing as Py3 only supported now

---
 rdflib_jsonld/util.py | 33 ++++++++-------------------------
 1 file changed, 8 insertions(+), 25 deletions(-)

diff --git a/rdflib_jsonld/util.py b/rdflib_jsonld/util.py
index 861f4a6..cd6fd46 100644
--- a/rdflib_jsonld/util.py
+++ b/rdflib_jsonld/util.py
@@ -4,21 +4,13 @@
 except ImportError:
     import simplejson as json
 
-from six import PY3
-
-if PY3:
-    from html.parser import HTMLParser
+from html.parser import HTMLParser
 
 from os import sep
 from os.path import normpath
-if PY3:
-    from urllib.parse import urljoin, urlsplit, urlunsplit
-else:
-    from urlparse import urljoin, urlsplit, urlunsplit
-
+from urllib.parse import urljoin, urlsplit, urlunsplit
 from rdflib.parser import create_input_source
-if PY3:
-    from io import StringIO
+from io import StringIO
 
 
 class HTMLJSONParser(HTMLParser):
@@ -62,26 +54,17 @@ def source_to_json(source):
 
     stream = source.getByteStream()
     try:
-        if PY3:
-            return json.load(StringIO(stream.read().decode('utf-8')))
-        else:
-            return json.load(stream)
+        return json.load(StringIO(stream.read().decode('utf-8')))
     except json.JSONDecodeError as e:
         # The document is not a JSON document, let's see whether we can parse
         # it as HTML
 
         # Reset stream pointer to 0
         stream.seek(0)
-        if PY3:
-            # Only do this when in Python 3
-            parser = HTMLJSONParser()
-            parser.feed(stream.read().decode('utf-8'))
-
-            return parser.get_json()
-        else:
-            # If not PY3, then we're just going to continue with the original
-            # parse exception
-            raise e
+        parser = HTMLJSONParser()
+        parser.feed(stream.read().decode('utf-8'))
+
+        return parser.get_json()
     finally:
         stream.close()