From 0f99d1742ef412781fd9737915e1cd1737186dec Mon Sep 17 00:00:00 2001
From: Sven Knebel <sknebel@users.noreply.github.com>
Date: Wed, 12 Sep 2018 21:55:29 +0200
Subject: [PATCH 001/123] longitude/latitude was removed from hentry backcompat
 long ago

http://microformats.org/wiki/index.php?title=h-entry&diff=next&oldid=60791
---
 mf2py/backcompat-rules/hentry.json | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/mf2py/backcompat-rules/hentry.json b/mf2py/backcompat-rules/hentry.json
index aa7b8be..4eaa52d 100644
--- a/mf2py/backcompat-rules/hentry.json
+++ b/mf2py/backcompat-rules/hentry.json
@@ -11,10 +11,7 @@
         ], 
         "published": [
             "dt-published"
-        ], 
-        "latitude": [
-            "p-latitude"
-        ], 
+        ],
         "entry-content": [
             "e-content"
         ], 
@@ -31,9 +28,6 @@
         ], 
         "updated": [
             "dt-updated"
-        ], 
-        "longitude": [
-            "p-longitude"
         ]
     },
     "rels": {

From ed9dc761b6557ca63cc5ef417c177c297282efe3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <support@dependabot.com>
Date: Mon, 1 Oct 2018 16:05:46 +0000
Subject: [PATCH 002/123] Bump requests from 2.18.4 to 2.19.1

Bumps [requests](https://github.com/requests/requests) from 2.18.4 to 2.19.1.
- [Release notes](https://github.com/requests/requests/releases)
- [Changelog](https://github.com/requests/requests/blob/master/HISTORY.md)
- [Commits](https://github.com/requests/requests/compare/v2.18.4...v2.19.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 85b8953..134db66 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,6 +3,6 @@ html5lib==1.0.1
 nose==1.3.0
 mock==1.3.0
 lxml==4.2.4
-requests==2.18.4
+requests==2.19.1
 BeautifulSoup4==4.6.0
 -e .

From 96d108ff8891bcf16cd46f36ef01221a7b754462 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <support@dependabot.com>
Date: Mon, 1 Oct 2018 16:12:37 +0000
Subject: [PATCH 003/123] Bump beautifulsoup4 from 4.6.0 to 4.6.3

Bumps [beautifulsoup4](http://www.crummy.com/software/BeautifulSoup/bs4/) from 4.6.0 to 4.6.3.

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 134db66..45378b3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,5 +4,5 @@ nose==1.3.0
 mock==1.3.0
 lxml==4.2.4
 requests==2.19.1
-BeautifulSoup4==4.6.0
+BeautifulSoup4==4.6.3
 -e .

From f4ad1ec45492e5256d7830f05025364b5691f3db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <support@dependabot.com>
Date: Mon, 1 Oct 2018 16:21:40 +0000
Subject: [PATCH 004/123] Bump lxml from 4.2.4 to 4.2.5

Bumps [lxml](https://github.com/lxml/lxml) from 4.2.4 to 4.2.5.
- [Release notes](https://github.com/lxml/lxml/releases)
- [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
- [Commits](https://github.com/lxml/lxml/compare/lxml-4.2.4...lxml-4.2.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 45378b3..d063c45 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
 html5lib==1.0.1
 nose==1.3.0
 mock==1.3.0
-lxml==4.2.4
+lxml==4.2.5
 requests==2.19.1
 BeautifulSoup4==4.6.3
 -e .

From a51bd81b488fc55de09cbbba4a8d46877cd543be Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <support@dependabot.com>
Date: Mon, 1 Oct 2018 16:32:12 +0000
Subject: [PATCH 005/123] Bump mock from 1.3.0 to 2.0.0

Bumps [mock](https://github.com/testing-cabal/mock) from 1.3.0 to 2.0.0.
- [Release notes](https://github.com/testing-cabal/mock/releases)
- [Changelog](https://github.com/testing-cabal/mock/blob/master/NEWS)
- [Commits](https://github.com/testing-cabal/mock/compare/1.3.0...2.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index d063c45..b9c89b4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 # Keep in sync with setup.py's install_requires!
 html5lib==1.0.1
 nose==1.3.0
-mock==1.3.0
+mock==2.0.0
 lxml==4.2.5
 requests==2.19.1
 BeautifulSoup4==4.6.3

From 1121e30b0db24c2aac46208de38e7709ca74830c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <support@dependabot.com>
Date: Mon, 1 Oct 2018 16:36:53 +0000
Subject: [PATCH 006/123] Bump nose from 1.3.0 to 1.3.7

Bumps [nose](https://github.com/nose-devs/nose) from 1.3.0 to 1.3.7.
- [Release notes](https://github.com/nose-devs/nose/releases)
- [Changelog](https://github.com/nose-devs/nose/blob/master/CHANGELOG)
- [Commits](https://github.com/nose-devs/nose/compare/release_1.3.0...release_1.3.7)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index b9c89b4..d9b375d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 # Keep in sync with setup.py's install_requires!
 html5lib==1.0.1
-nose==1.3.0
+nose==1.3.7
 mock==2.0.0
 lxml==4.2.5
 requests==2.19.1

From 3a534cd3c3daf13325d8e5c0c756c4b33fa580c8 Mon Sep 17 00:00:00 2001
From: Sven Knebel <sknebel@users.noreply.github.com>
Date: Tue, 2 Oct 2018 18:40:58 +0200
Subject: [PATCH 007/123] Fix #135: reduce cases of implied photo according to
 spec change

---
 mf2py/parser.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mf2py/parser.py b/mf2py/parser.py
index 1cf07b1..d28bbac 100644
--- a/mf2py/parser.py
+++ b/mf2py/parser.py
@@ -192,7 +192,7 @@ def handle_microformat(root_class_names, el, value_property=None,
                 if "name" not in properties and parsed_types_aggregation.isdisjoint("peh"):
                     properties["name"] = [implied_properties.name(el, base_url=self.__url__)]
 
-                if "photo" not in properties:
+                if "photo" not in properties and parsed_types_aggregation.isdisjoint("uh"):
                     x = implied_properties.photo(el, self.dict_class, self.__img_with_alt__, base_url=self.__url__)
                     if x is not None:
                         properties["photo"] = [x]

From 919cb25a4d01febe613c6e711f58a1336442da6d Mon Sep 17 00:00:00 2001
From: Sven Knebel <sknebel@users.noreply.github.com>
Date: Wed, 17 Oct 2018 20:41:55 +0200
Subject: [PATCH 008/123] resolve relative URLs always, as per upcoming spec
 change.

Also add a test case covering the various options for u- properties.
---
 mf2py/parse_property.py        | 15 +++++------
 test/examples/u_all_cases.html | 48 ++++++++++++++++++++++++++++++++++
 test/test_parser.py            | 12 ++++++++-
 3 files changed, 65 insertions(+), 10 deletions(-)
 create mode 100644 test/examples/u_all_cases.html

diff --git a/mf2py/parse_property.py b/mf2py/parse_property.py
index 2d72259..21731b1 100644
--- a/mf2py/parse_property.py
+++ b/mf2py/parse_property.py
@@ -49,21 +49,18 @@ def url(el, dict_class, img_with_alt, base_url=''):
     if prop_value is None:
         prop_value = get_attr(el, "data", check_name="object")
 
-    if prop_value is not None:
-        return try_urljoin(base_url, prop_value)
-
-    # handle value-class-pattern
-    prop_value = value_class_pattern.text(el)
-    if prop_value is not None:
-        return prop_value
+    if prop_value is None:
+        # handle value-class-pattern
+        prop_value = value_class_pattern.text(el)
 
-    prop_value = get_attr(el, "title", check_name="abbr")
+    if prop_value is None:
+        prop_value = get_attr(el, "title", check_name="abbr")
     if prop_value is None:
         prop_value = get_attr(el, "value", check_name=("data", "input"))
     if prop_value is None:
         prop_value = get_textContent(el)
 
-    return prop_value
+    return try_urljoin(base_url, prop_value)
 
 
 def datetime(el, default_date=None):
diff --git a/test/examples/u_all_cases.html b/test/examples/u_all_cases.html
new file mode 100644
index 0000000..dedd056
--- /dev/null
+++ b/test/examples/u_all_cases.html
@@ -0,0 +1,48 @@
+<html>
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8">
+  <title>Hello World</title>
+  <base href="http://example.com/" />
+</head>
+<body>
+<article class="h-entry">
+    <h1><a  class="p-name">Testing variations of u-properties</a></h1>
+        <ul>
+            <!--if a.u-x[href] or area.u-x[href] or link.u-x[href], then get the href attribute -->
+            <li><a class="u-url" href="/test"></a></li>
+            <li><a class="u-url" href="http://example.com/test"></a></li>
+            <li><area class="u-url" href="/test"></li>
+            <li><area class="u-url" href="http://example.com/test"></li>
+            <li><link class="u-url" href="/test"></li>
+            <li><link class="u-url" href="http://example.com/test"></li>
+            <!--else if img.u-x[src] or audio.u-x[src] or video.u-x[src] or source.u-x[src] or iframe.u-x[src], then get the src attribute-->
+            <li><img class="u-url" src="/test"></li>
+            <li><img class="u-url" src="http://example.com/test"></li>
+            <li><audio class="u-url" src="/test"></audio></li>
+            <li><audio class="u-url" src="http://example.com/test"></audio></li>
+            <li><video class="u-url" src="/test"><source class="u-url" src="/test"></video></li>
+            <li><video class="u-url" src="http://example.com/test"><source class="u-url" src="http://example.com/test"></video></li>
+            <!--else if video.u-x[poster], then get the poster attribute-->
+            <li><video class="u-url" poster="/test"></video></li>
+            <li><video class="u-url" poster="http://example.com/test"></video></li>
+            <!--else if object.u-x[data], then get the data attribute-->
+            <li><object class="u-url" data="/test"></object></li>
+            <li><object class="u-url" data="http://example.com/test"></object></li>
+            <!-- else parse the element for the value-class-pattern. If a value is found, get it-->
+            <!-- no test case -->
+            <!-- else if abbr.u-x[title], then get the title attribute-->
+            <li><abbr class="u-url" title="/test">CHEESE</abbr></li>
+            <li><abbr class="u-url" title="http://example.com/test">CHEESE</abbr></li>
+            <!-- else if data.u-x[value] or input.u-x[value], then get the value attribute-->
+            <li><data class="u-url" value="/test"></data></li>
+            <li><data class="u-url" value="http://example.com/test"></data></li>
+            <li><input class="u-url" value="/test"></li>
+            <li><input class="u-url" value="http://example.com/test"></li>
+            <!-- else get the textContent of the element after removing all leading/trailing whitespace and nested <script> & <style> elements-->
+            <li><p class="u-url">/test</p></li>
+            <li><p class="u-url">http://example.com/test</p></li>
+            <li><p class="u-url">       /test        </p></li>
+            <li><p class="u-url">       /test<script>dsjfskjflkds</script>        </p></li>
+        </ul>
+</article>
+</body>
diff --git a/test/test_parser.py b/test/test_parser.py
index 505a4be..3283b3f 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -905,4 +905,14 @@ def test_input_tree_integrity():
 def make_labelled_cmp(label):
     f = lambda html1, html2: assert_equal(html1,html2)
     f.description = label
-    return f
\ No newline at end of file
+    return f
+
+def test_all_u_cases():
+    """ test variations of u- parsing and that relative urls are always resolved """
+
+    URL_COUNT = 28
+    result = parse_fixture("u_all_cases.html")
+
+    assert_equal(URL_COUNT, len(result['items'][0]['properties']['url']))
+    for i in range(URL_COUNT):
+        yield make_labelled_cmp("all_u_cases_" + str(i)), "http://example.com/test", result['items'][0]['properties']['url'][i]

From 7dd6cd5d9d25ebde6f73e7eac623788385cbc462 Mon Sep 17 00:00:00 2001
From: Sven Knebel <sknebel@users.noreply.github.com>
Date: Sun, 18 Nov 2018 18:07:34 +0100
Subject: [PATCH 009/123] VCP now handles tz offsets without leading zeros

---
 mf2py/datetime_helpers.py    |  2 +-
 test/examples/datetimes.html | 33 +++++++++++++++++++++++++++++++++
 test/test_parser.py          | 10 +++++++++-
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/mf2py/datetime_helpers.py b/mf2py/datetime_helpers.py
index 02b5321..95e1093 100644
--- a/mf2py/datetime_helpers.py
+++ b/mf2py/datetime_helpers.py
@@ -10,7 +10,7 @@
 SEC_RE = r'(:(?P<second>\d{2})(\.\d+)?)'
 RAWTIME_RE = r'(?P<hour>\d{1,2})(:(?P<minute>\d{2})%s?)?' % (SEC_RE)
 AMPM_RE = r'am|pm|a\.m\.|p\.m\.|AM|PM|A\.M\.|P\.M\.'
-TIMEZONE_RE = r'Z|[+-]\d{2}:?\d{2}?'
+TIMEZONE_RE = r'Z|[+-]\d{1,2}:?\d{2}?'
 TIME_RE = (r'(?P<rawtime>%s)( ?(?P<ampm>%s))?( ?(?P<tz>%s))?' %
            (RAWTIME_RE, AMPM_RE, TIMEZONE_RE))
 DATETIME_RE = (r'(?P<date>%s)(?P<separator>[T ])(?P<time>%s)'
diff --git a/test/examples/datetimes.html b/test/examples/datetimes.html
index cfd9f57..3e1deb1 100644
--- a/test/examples/datetimes.html
+++ b/test/examples/datetimes.html
@@ -140,5 +140,38 @@ <h1 class="p-name">Ordinal date</h1>
    </p>
  </div>
 
+ <div class="h-entry">
+   <!-- wiki event with UTC offset without leading zero -->
+   <span class="dt-start">
+     <span class="value" title="June 1, 2014">2014-06-01</span>
+     <span class="value" title="12:30">12:30<span style="display: none;">-6:00</span></span>
+   </span>
+ </div>
+
+ <div class="h-entry">
+   <!-- wiki event with positive UTC offset without leading zero-->
+   <span class="dt-start">
+     <span class="value" title="June 1, 2014">2014-06-01</span>
+     <span class="value" title="12:30">12:30<span style="display: none;">+6:00</span></span>
+   </span>
+ </div>
+
+<div class="h-entry">
+   <!-- wiki event with Zulu time-->
+   <span class="dt-start">
+     <span class="value" title="June 1, 2014">2014-06-01</span>
+     <span class="value" title="12:30">12:30<span style="display: none;">Z</span></span>
+   </span>
+ </div>
+
+ <div class="h-entry">
+   <!-- with UTC offset without leading zero in extra value part -->
+   <span class="dt-start">
+     <span class="value" title="June 1, 2014">2014-06-01</span>
+     <span class="value" title="12:30">12:30</span><span class="value">-6:00</span></span>
+   </span>
+ </div>
+
+
 </body>
 </html>
diff --git a/test/test_parser.py b/test/test_parser.py
index 505a4be..821cdfe 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -160,6 +160,7 @@ def test_datetime_parsing():
 
 def test_datetime_vcp_parsing():
     result = parse_fixture("datetimes.html")
+    assert_equal(len(result['items']), 16)
     assert_equal(result["items"][1]["properties"]["published"][0],
                  "3014-01-01 01:21Z")
     assert_equal(result["items"][2]["properties"]["updated"][0],
@@ -184,7 +185,14 @@ def test_datetime_vcp_parsing():
                  "2014-06-01 12:15")
     assert_equal(result["items"][11]["properties"]["start"][0],
                  "2016-03-02 00:30-06:00")
-
+    assert_equal(result["items"][12]["properties"]["start"][0],
+                 "2014-06-01 12:30-6:00")
+    assert_equal(result["items"][13]["properties"]["start"][0],
+                 "2014-06-01 12:30+6:00")
+    assert_equal(result["items"][14]["properties"]["start"][0],
+                 "2014-06-01 12:30Z")
+    assert_equal(result["items"][15]["properties"]["start"][0],
+                 "2014-06-01 12:30-6:00")
 def test_dt_end_implied_date():
     """Test that events with dt-start and dt-end use the implied date rule
     http://microformats.org/wiki/value-class-pattern#microformats2_parsers

From e87b3509804eb021880baefbc3b1e471eb284bf5 Mon Sep 17 00:00:00 2001
From: Sven Knebel <sknebel@users.noreply.github.com>
Date: Mon, 19 Nov 2018 21:29:59 +0100
Subject: [PATCH 010/123] implement id parsing

---
 mf2py/parser.py             | 5 +++++
 test/examples/parse_id.html | 5 +++++
 test/test_parser.py         | 9 ++++++++-
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 test/examples/parse_id.html

diff --git a/mf2py/parser.py b/mf2py/parser.py
index 1cf07b1..c6e266b 100644
--- a/mf2py/parser.py
+++ b/mf2py/parser.py
@@ -221,6 +221,11 @@ def handle_microformat(root_class_names, el, value_property=None,
             # insert children if any
             if children:
                 microformat["children"] = children
+
+            Id = get_attr(el, 'id')
+            if Id:
+                microformat['id'] = Id
+
             # simple value is the parsed property value if it were not
             # an h-* class
             if simple_value is not None:
diff --git a/test/examples/parse_id.html b/test/examples/parse_id.html
new file mode 100644
index 0000000..ebbc172
--- /dev/null
+++ b/test/examples/parse_id.html
@@ -0,0 +1,5 @@
+<div class="h-feed" id="recentArticles">
+    <h2 class="p-name">Recent Articles</h2>
+    <div class="hentry" id="article">Lorem Ipsum</div>
+    <div class="p-author h-card" id="theAuthor">Max Mustermann</div>
+</div>
\ No newline at end of file
diff --git a/test/test_parser.py b/test/test_parser.py
index 505a4be..83ffde4 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -621,7 +621,7 @@ def test_backcompat_hproduct():
     assert_equal(['bullshit'], result["items"][0]["properties"]["category"])
     assert_equal(['Quacktastic Products'], result["items"][0]["properties"]["brand"])
     assert_equal(['#BULLSHIT-001'], result["items"][0]["properties"]["identifier"])
-    assert_equal("Magical tasty sugar pills that don't do anything.", result["items"][0]["properties"]['description'][0]) 
+    assert_equal("Magical tasty sugar pills that don't do anything.", result["items"][0]["properties"]['description'][0])
     assert_equal(["Tom's Magical Quack Tincture"], result["items"][0]["properties"]["name"])
 
 
@@ -851,6 +851,13 @@ def test_photo_with_alt():
     assert_equal('', exp_result['items'][5]['properties']['in-reply-to'][0]['properties']['photo'][0]['alt'])
     assert_equal('', exp_result['items'][5]['properties']['in-reply-to'][0]['alt'])
 
+
+def test_parse_id():
+    result = parse_fixture("parse_id.html")
+    assert_equal("recentArticles", result['items'][0]['id'])
+    assert_equal("article", result['items'][0]['children'][0]['id'])
+    assert_equal("theAuthor", result['items'][0]['properties']['author'][0]['id'])
+
 # unicode tests
 
 def get_all_files():

From b3230aa2a8b099011d314a279923d0e2c586e3ee Mon Sep 17 00:00:00 2001
From: Sven Knebel <sknebel@users.noreply.github.com>
Date: Mon, 19 Nov 2018 22:29:48 +0100
Subject: [PATCH 011/123] Add test: id parsing should not return empty id

---
 test/examples/parse_id.html | 1 +
 test/test_parser.py         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/test/examples/parse_id.html b/test/examples/parse_id.html
index ebbc172..0584846 100644
--- a/test/examples/parse_id.html
+++ b/test/examples/parse_id.html
@@ -1,5 +1,6 @@
 <div class="h-feed" id="recentArticles">
     <h2 class="p-name">Recent Articles</h2>
     <div class="hentry" id="article">Lorem Ipsum</div>
+    <div class="hentry" id="">empty id is invalid and should not be parsed</div>
     <div class="p-author h-card" id="theAuthor">Max Mustermann</div>
 </div>
\ No newline at end of file
diff --git a/test/test_parser.py b/test/test_parser.py
index 83ffde4..5279318 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -856,6 +856,7 @@ def test_parse_id():
     result = parse_fixture("parse_id.html")
     assert_equal("recentArticles", result['items'][0]['id'])
     assert_equal("article", result['items'][0]['children'][0]['id'])
+    assert_true("id" not in result['items'][0]['children'][1])
     assert_equal("theAuthor", result['items'][0]['properties']['author'][0]['id'])
 
 # unicode tests

From 530f7aeab392bfe7407eb7a50c3d8b493e7b109a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <support@dependabot.com>
Date: Tue, 11 Dec 2018 05:39:21 +0000
Subject: [PATCH 012/123] [Security] Bump requests from 2.19.1 to 2.21.0

Bumps [requests](https://github.com/requests/requests) from 2.19.1 to 2.21.0. **This update includes security fixes.**
- [Release notes](https://github.com/requests/requests/releases)
- [Changelog](https://github.com/requests/requests/blob/master/HISTORY.md)
- [Commits](https://github.com/requests/requests/compare/v2.19.1...v2.21.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index d9b375d..151e106 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,6 +3,6 @@ html5lib==1.0.1
 nose==1.3.7
 mock==2.0.0
 lxml==4.2.5
-requests==2.19.1
+requests==2.21.0
 BeautifulSoup4==4.6.3
 -e .

From f0c6032b378aad9c6bd53b15c314c73f40c67cd3 Mon Sep 17 00:00:00 2001
From: Pawel Miech <pawelmhm@gmail.com>
Date: Tue, 27 Oct 2020 16:07:13 +0100
Subject: [PATCH 013/123] /dom_helpers, parser/ fix trivial style warnings

that appear in Python 3.8.3
---
 mf2py/dom_helpers.py | 2 +-
 mf2py/parser.py      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mf2py/dom_helpers.py b/mf2py/dom_helpers.py
index 8b10f43..3eb1a61 100644
--- a/mf2py/dom_helpers.py
+++ b/mf2py/dom_helpers.py
@@ -141,7 +141,7 @@ def text_collection(el, replace_img=False, img_to_src=True, base_url=''):
 
         return items
 
-    results = [t for t in text_collection(el, replace_img, img_to_src, base_url) if t is not '']
+    results = [t for t in text_collection(el, replace_img, img_to_src, base_url) if t != '']
 
     if results:
         # remove <space> if it is first and last or if it is preceded by a <space> or <p> open/close
diff --git a/mf2py/parser.py b/mf2py/parser.py
index ce5ce59..c380828 100644
--- a/mf2py/parser.py
+++ b/mf2py/parser.py
@@ -261,7 +261,7 @@ def parse_props(el):
 
             if root_class_names:
                 parsed_types_aggregation.add('h')
-            
+
             # Is this a property element (p-*, u-*, etc.) flag
             # False is default
             is_property_el = False
@@ -384,7 +384,7 @@ def parse_rels(el):
 
                 # 1st one wins
                 if "text" not in value_dict:
-                    value_dict["text"] = el.get_text().strip()  
+                    value_dict["text"] = el.get_text().strip()
 
                 url_rels = value_dict.get("rels", [])
                 value_dict["rels"] = url_rels
@@ -411,7 +411,7 @@ def parse_rels(el):
                     alternate_dict["url"] = url
                     x = " ".join(
                         [r for r in rel_attrs if not r == "alternate"])
-                    if x is not "":
+                    if x != "":
                         alternate_dict["rel"] = x
                     alternate_dict["text"] = text_type(el.get_text().strip())
                     for knownattr in ("media", "hreflang", "type", "title"):

From 1c997d39c09e4867e77fd7da25c731af60aa48d6 Mon Sep 17 00:00:00 2001
From: Tom Morris <tom.morris@futurelearn.com>
Date: Tue, 27 Oct 2020 17:37:14 +0000
Subject: [PATCH 014/123] Adds GitHub Action for unit testing

This improves performance: a Travis build recently took over 1h21m to test
against the specified versions of Python on just Ubuntu. GitHub Actions lets us
matrix test against all the Python versions we care about, and build on Windows
and macOS as well as Linux, in just under 4m. This seems like enough of a win
in itself to just fully replace Travis.
---
 .github/workflows/tests.yml | 27 +++++++++++++++++++++++++++
 .travis.yml                 | 14 --------------
 2 files changed, 27 insertions(+), 14 deletions(-)
 create mode 100644 .github/workflows/tests.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
new file mode 100644
index 0000000..c958b30
--- /dev/null
+++ b/.github/workflows/tests.yml
@@ -0,0 +1,27 @@
+name: Run Python Tests
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        python_version: ["2.7", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "pypy2", "pypy3"]
+        os: ["ubuntu-latest", "macos-latest", "windows-latest"]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          pip install -r requirements.txt --user
+      - name: Run tests with Nose
+        run: python -m nose --exclude=test_suite
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 4e942d3..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-language: python
-python:
-  - "2.7"
-  - "3.3"
-  - "3.4"
-  - "3.5"
-  - "3.6"
-  - "pypy"
-  - "pypy3"
-sudo: false
-# command to install dependencies
-install: "pip install -r requirements.txt"
-# command to run tests
-script: nosetests --exclude=test_suite

From 66b784365ab5ef44c47ffea407c1998d1cfbc305 Mon Sep 17 00:00:00 2001
From: Pawel Miech <pawelmhm@gmail.com>
Date: Tue, 27 Oct 2020 16:07:13 +0100
Subject: [PATCH 015/123] /dom_helpers, parser/ fix trivial style warnings

that appear in Python 3.8.3
---
 mf2py/dom_helpers.py | 2 +-
 mf2py/parser.py      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mf2py/dom_helpers.py b/mf2py/dom_helpers.py
index 8b10f43..3eb1a61 100644
--- a/mf2py/dom_helpers.py
+++ b/mf2py/dom_helpers.py
@@ -141,7 +141,7 @@ def text_collection(el, replace_img=False, img_to_src=True, base_url=''):
 
         return items
 
-    results = [t for t in text_collection(el, replace_img, img_to_src, base_url) if t is not '']
+    results = [t for t in text_collection(el, replace_img, img_to_src, base_url) if t != '']
 
     if results:
         # remove <space> if it is first and last or if it is preceded by a <space> or <p> open/close
diff --git a/mf2py/parser.py b/mf2py/parser.py
index ce5ce59..c380828 100644
--- a/mf2py/parser.py
+++ b/mf2py/parser.py
@@ -261,7 +261,7 @@ def parse_props(el):
 
             if root_class_names:
                 parsed_types_aggregation.add('h')
-            
+
             # Is this a property element (p-*, u-*, etc.) flag
             # False is default
             is_property_el = False
@@ -384,7 +384,7 @@ def parse_rels(el):
 
                 # 1st one wins
                 if "text" not in value_dict:
-                    value_dict["text"] = el.get_text().strip()  
+                    value_dict["text"] = el.get_text().strip()
 
                 url_rels = value_dict.get("rels", [])
                 value_dict["rels"] = url_rels
@@ -411,7 +411,7 @@ def parse_rels(el):
                     alternate_dict["url"] = url
                     x = " ".join(
                         [r for r in rel_attrs if not r == "alternate"])
-                    if x is not "":
+                    if x != "":
                         alternate_dict["rel"] = x
                     alternate_dict["text"] = text_type(el.get_text().strip())
                     for knownattr in ("media", "hreflang", "type", "title"):

From 39659df900c2f54f9fba80fa43b94d6b9bcebd9c Mon Sep 17 00:00:00 2001
From: Tom Morris <tom@tommorris.org>
Date: Thu, 13 Jan 2022 20:38:56 +0000
Subject: [PATCH 016/123] Update CI setup to install libxml2

Unfortunately, this means temporarily dropping multi-OS testing for now.
May bring back the Mac testing at some point, and if there's demand, we
can start doing Windows testing again when there's a sensible way to get
libxml2 on Windows in CI.
---
 .github/workflows/tests.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c958b30..a39d173 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,11 +11,14 @@ jobs:
   build:
     strategy:
       matrix:
-        python_version: ["2.7", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "pypy2", "pypy3"]
-        os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-    runs-on: ${{ matrix.os }}
+        python_version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"]
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - name: Install libxml2
+        run: |
+          sudo apt-get update
+          sudo apt-get install libxml2 libxml2-dev libxslt1-dev
       - name: Install Python
         uses: actions/setup-python@v1
         with:

From 204b1bc7adbd404cc4a7e19f199362f58a55f7f2 Mon Sep 17 00:00:00 2001
From: Tom Morris <tom@tommorris.org>
Date: Thu, 13 Jan 2022 20:22:16 +0000
Subject: [PATCH 017/123] Specify parser to avoid warning in CI

Fixes #158
---
 test/test_parser.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_parser.py b/test/test_parser.py
index 3fce032..0090d57 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -45,7 +45,7 @@ def test_open_file():
 def test_doc_tag():
     # test that strings, BS doc and BS tags are all parsed
     doc = '''<article class="h-entry"></article>'''
-    soup = BeautifulSoup(doc)
+    soup = BeautifulSoup(doc, 'html5lib')
     parse_string = Parser(doc).to_dict()
     assert 'h-entry' in parse_string['items'][0]['type']
     parse_doc = Parser(soup).to_dict()

From 6e9a11af8f09bb57ade3024a93150ced1916df41 Mon Sep 17 00:00:00 2001
From: Tom Morris <tom@tommorris.org>
Date: Tue, 25 Jan 2022 19:17:49 +0000
Subject: [PATCH 018/123] Update lxml

Until we have a new build tool, at the very least, we should have a
newer lxml without the vulnerabilities in older versions.

https://github.com/advisories/GHSA-55x5-fj6c-h6m8
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 151e106..5b942ef 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
 html5lib==1.0.1
 nose==1.3.7
 mock==2.0.0
-lxml==4.2.5
+lxml==4.6.5
 requests==2.21.0
 BeautifulSoup4==4.6.3
 -e .

From e123564af390a908eb6dbd6cd7c94e8198211203 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Sep 2022 10:03:06 +0000
Subject: [PATCH 019/123] Bump lxml from 4.6.5 to 4.9.1

Bumps [lxml](https://github.com/lxml/lxml) from 4.6.5 to 4.9.1.
- [Release notes](https://github.com/lxml/lxml/releases)
- [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
- [Commits](https://github.com/lxml/lxml/compare/lxml-4.6.5...lxml-4.9.1)

---
updated-dependencies:
- dependency-name: lxml
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 5b942ef..ce50cd6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
 html5lib==1.0.1
 nose==1.3.7
 mock==2.0.0
-lxml==4.6.5
+lxml==4.9.1
 requests==2.21.0
 BeautifulSoup4==4.6.3
 -e .

From 83e38bfda609ba4cf64c1530126fddba3a1a932e Mon Sep 17 00:00:00 2001
From: Tom Morris <tom@tommorris.org>
Date: Sun, 20 Nov 2022 14:10:04 +0000
Subject: [PATCH 020/123] Remove CanIUsePython3

Fixes #172
---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index aed7788..3f2ad66 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,6 @@ mf2py
 
 [![Build Status](https://travis-ci.org/microformats/mf2py.svg?branch=master)](https://travis-ci.org/microformats/mf2py)
 
-[![Can I Use Python 3?](https://caniusepython3.com/project/mf2py.svg)](https://caniusepython3.com/project/mf2py)
-
 Python parser for [microformats 2](http://microformats.org/wiki/Microformats2).
 
 Current status: Full-featured and mostly stable. Implements the full

From a66cf5698929a34707652b05d94abf8d29530a39 Mon Sep 17 00:00:00 2001
From: Tom Morris <tom@tommorris.org>
Date: Sun, 20 Nov 2022 14:14:08 +0000
Subject: [PATCH 021/123] Switch to main in CI tests

Relates to #171
---
 .github/workflows/tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a39d173..d219f23 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -2,10 +2,10 @@ name: Run Python Tests
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   build:

From 27f13087c1e0060381de9035280d56af5dad8649 Mon Sep 17 00:00:00 2001
From: Tom Morris <tom@tommorris.org>
Date: Sun, 20 Nov 2022 14:17:02 +0000
Subject: [PATCH 022/123] Remove Travis build status

Travis has been deprecated for a while
---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 3f2ad66..96680b1 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
 mf2py
 =====
 
-[![Build Status](https://travis-ci.org/microformats/mf2py.svg?branch=master)](https://travis-ci.org/microformats/mf2py)
-
 Python parser for [microformats 2](http://microformats.org/wiki/Microformats2).
 
 Current status: Full-featured and mostly stable. Implements the full

From 1fc8e6d0bf8cc0b2771e13bdbf260bda0542b11c Mon Sep 17 00:00:00 2001
From: Angelo Gladding <ragt.ag>
Date: Sat, 28 Jan 2023 15:10:40 -0800
Subject: [PATCH 023/123] Switch from nosetests to pytest; fixes #175

---
 .github/workflows/tests.yml |   4 +-
 requirements.txt            |   2 +-
 setup.cfg                   |   2 -
 setup.py                    |   3 +-
 test/test_parser.py         | 565 ++++++++++++++++--------------------
 test/test_suite.py          |  10 +-
 6 files changed, 255 insertions(+), 331 deletions(-)
 delete mode 100644 setup.cfg

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d219f23..8f524c3 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -26,5 +26,5 @@ jobs:
       - name: Install dependencies
         run: |
           pip install -r requirements.txt --user
-      - name: Run tests with Nose
-        run: python -m nose --exclude=test_suite
+      - name: Run tests with pytest
+        run: pytest
diff --git a/requirements.txt b/requirements.txt
index ce50cd6..8b8b71d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 # Keep in sync with setup.py's install_requires!
 html5lib==1.0.1
-nose==1.3.7
+pytest==7.2.1
 mock==2.0.0
 lxml==4.9.1
 requests==2.21.0
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 42b3148..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[nosetests]
-exclude=test_suite
diff --git a/setup.py b/setup.py
index ac6277a..42e4dca 100644
--- a/setup.py
+++ b/setup.py
@@ -26,11 +26,10 @@
       tests_require=[
           'lxml',
           'mock',
-          'nose',
+          'pytest',
       ],
       packages=['mf2py'],
       package_data={'mf2py': ['backcompat-rules/*.json']},
-      test_suite='nose.collector',
       classifiers=[
           'Development Status :: 4 - Beta',
           'Intended Audience :: Developers',
diff --git a/test/test_parser.py b/test/test_parser.py
index 0090d57..abba569 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -5,7 +5,6 @@
 import sys
 
 import mock
-from nose.tools import assert_equal, assert_true, assert_false
 from mf2py import Parser
 from bs4 import BeautifulSoup
 from unittest import TestCase
@@ -30,17 +29,17 @@ def parse_fixture(path, url=None):
 
 def test_empty():
     p = Parser()
-    assert_true(type(p) is not None)
-    assert_true(type(p.to_dict()) is dict)
+    assert type(p) is not None
+    assert type(p.to_dict()) is dict
 
 
 def test_open_file():
     with open(os.path.join(TEST_DIR, 'empty.html')) as f:
         p = Parser(doc=f)
 
-    assert_true(p.__doc__ is not None)
-    assert_true(type(p) is not None)
-    assert_true(type(p.to_dict()) is dict)
+    assert p.__doc__ is not None
+    assert type(p) is not None
+    assert type(p.to_dict()) is dict
 
 def test_doc_tag():
     # test that strings, BS doc and BS tags are all parsed
@@ -56,7 +55,7 @@ def test_doc_tag():
 @mock.patch('requests.get')
 def test_user_agent(getter):
     ua_expect = 'mf2py - microformats2 parser for python'
-    assert_true(Parser.useragent.startswith(ua_expect))
+    assert Parser.useragent.startswith(ua_expect)
 
     resp = mock.MagicMock()
     resp.content = b''
@@ -70,7 +69,7 @@ def test_user_agent(getter):
     })
 
     Parser.useragent = 'something else'
-    assert_equal(Parser.useragent, 'something else')
+    assert Parser.useragent == 'something else'
     # set back to default. damn stateful classes
     Parser.useragent = 'mf2py - microformats2 parser for python'
 
@@ -79,120 +78,84 @@ def test_base():
     with open(os.path.join(TEST_DIR, 'base.html')) as f:
         p = Parser(doc=f)
 
-    assert_equal(p.__url__, "http://tantek.com/")
+    assert p.__url__ == "http://tantek.com/"
 
 
 def test_simple_parse():
     result = parse_fixture("simple_person_reference.html")
-    assert_equal(result["items"][0]["properties"],
-                 {'name': ['Frances Berriman']})
+    assert result["items"][0]["properties"] == {'name': ['Frances Berriman']}
 
 
 def test_simple_person_reference_same_element():
     result = parse_fixture("simple_person_reference_same_element.html")
-    assert_equal(result["items"][0]["properties"],
-                 {'name': ['Frances Berriman']})
+    assert result["items"][0]["properties"] == {'name': ['Frances Berriman']}
 
 
 def test_person_with_url():
     result = parse_fixture("person_with_url.html")
-    assert_equal(result["items"][0]["properties"]["name"],
-                 ['Tom Morris'])
-    assert_equal(result["items"][0]["properties"]["url"],
-                 ['http://tommorris.org/'])
+    assert result["items"][0]["properties"]["name"] == ['Tom Morris']
+    assert result["items"][0]["properties"]["url"] == ['http://tommorris.org/']
 
 
 def test_vcp():
     result = parse_fixture("value_class_person.html")
-    assert_equal(result["items"][0]["properties"]["tel"], ['+44 1234 567890'])
+    assert result["items"][0]["properties"]["tel"] == ['+44 1234 567890']
 
 
 def test_multiple_root_classnames():
     result = parse_fixture("nested_multiple_classnames.html")
     # order does not matter
-    assert_equal(len(result["items"]), 1)
-    assert_equal(set(result["items"][0]["type"]),
-                 set(["h-entry", "h-as-note"]))
+    assert len(result["items"]) == 1
+    assert set(result["items"][0]["type"]) == set(["h-entry", "h-as-note"])
 
 
 def test_property_nested_microformat():
     result = parse_fixture("nested_multiple_classnames.html")
 
-    assert_equal(len(result["items"]), 1)
+    assert len(result["items"]) == 1
     assert "author" in result["items"][0]["properties"]
-    assert_equal(
-        result["items"][0]["properties"]["author"][0]["properties"]["name"][0],
-        "Tom Morris")
-    assert_equal(
-        result["items"][0]["properties"]["reviewer"][0]
-        ["properties"]["name"][0],
-        "Tom Morris")
-    assert_equal(
-        result["items"][0]["properties"]["author"][0]
-        ["properties"]["adr"][0]["properties"]["city"][0],
-        "London")
+    assert result["items"][0]["properties"]["author"][0]["properties"]["name"][0] == "Tom Morris"
+    assert result["items"][0]["properties"]["reviewer"][0]["properties"]["name"][0] == "Tom Morris"
+    assert result["items"][0]["properties"]["author"][0]["properties"]["adr"][0]["properties"]["city"][0] == "London"
 
 
 def test_plain_child_microformat():
     result = parse_fixture("nested_multiple_classnames.html")
 
-    assert_equal(len(result["items"]), 1)
-    assert_true("children" in result["items"][0])
-    assert_equal(len(result["items"][0]["children"]), 1)
-    assert_equal(
-        result["items"][0]["children"][0]["properties"]["name"][0],
-        "Some Citation")
+    assert len(result["items"]) == 1
+    assert "children" in result["items"][0]
+    assert len(result["items"][0]["children"]) == 1
+    assert result["items"][0]["children"][0]["properties"]["name"][0] == "Some Citation"
 
 
 def test_datetime_parsing():
     result = parse_fixture("datetimes.html")
-    assert_equal(result["items"][0]["properties"]["start"][0],
-                 "2014-01-01T12:00:00+00:00")
-    assert_equal(result["items"][0]["properties"]["end"][0],
-                 "3014-01-01T18:00:00+00:00")
-    assert_equal(result["items"][0]["properties"]["duration"][0],
-                 "P1000Y")
-    assert_equal(result["items"][0]["properties"]["updated"][0],
-                 "2011-08-26T00:01:21+00:00")
-    assert_equal(result["items"][0]["properties"]["updated"][1],
-                 "2011-08-26T00:01:21+00:00")
+    assert result["items"][0]["properties"]["start"][0] == "2014-01-01T12:00:00+00:00"
+    assert result["items"][0]["properties"]["end"][0] == "3014-01-01T18:00:00+00:00"
+    assert result["items"][0]["properties"]["duration"][0] == "P1000Y"
+    assert result["items"][0]["properties"]["updated"][0] == "2011-08-26T00:01:21+00:00"
+    assert result["items"][0]["properties"]["updated"][1] == "2011-08-26T00:01:21+00:00"
 
 
 def test_datetime_vcp_parsing():
     result = parse_fixture("datetimes.html")
-    assert_equal(len(result['items']), 16)
-    assert_equal(result["items"][1]["properties"]["published"][0],
-                 "3014-01-01 01:21Z")
-    assert_equal(result["items"][2]["properties"]["updated"][0],
-                 "2014-03-11 09:55")
-    assert_equal(result["items"][3]["properties"]["published"][0],
-                 "2014-01-30 15:28")
-    assert_equal(result["items"][4]["properties"]["published"][0],
-                 "9999-01-14T11:52+08:00")
-    assert_equal(result["items"][5]["properties"]["published"][0],
-                 "2014-06-01 12:30-06:00")
-    assert_equal(result["items"][8]["properties"]["start"][0],
-                 "2014-06-01 12:30-06:00")
-    assert_equal(result["items"][9]["properties"]["start"][0],
-                 "2014-06-01 12:30-06:00")
-    assert_equal(result["items"][10]["properties"]["start"][0],
-                 "2014-06-01 00:30-06:00")
-    assert_equal(result["items"][10]["properties"]["end"][0],
-                 "2014-06-01 12:15")
-    assert_equal(result["items"][10]["properties"]["start"][1],
-                 "2014-06-01 00:30-06:00")
-    assert_equal(result["items"][10]["properties"]["end"][1],
-                 "2014-06-01 12:15")
-    assert_equal(result["items"][11]["properties"]["start"][0],
-                 "2016-03-02 00:30-06:00")
-    assert_equal(result["items"][12]["properties"]["start"][0],
-                 "2014-06-01 12:30-6:00")
-    assert_equal(result["items"][13]["properties"]["start"][0],
-                 "2014-06-01 12:30+6:00")
-    assert_equal(result["items"][14]["properties"]["start"][0],
-                 "2014-06-01 12:30Z")
-    assert_equal(result["items"][15]["properties"]["start"][0],
-                 "2014-06-01 12:30-6:00")
+    assert len(result['items']) == 16
+    assert result["items"][1]["properties"]["published"][0] == "3014-01-01 01:21Z"
+    assert result["items"][2]["properties"]["updated"][0] == "2014-03-11 09:55"
+    assert result["items"][3]["properties"]["published"][0] == "2014-01-30 15:28"
+    assert result["items"][4]["properties"]["published"][0] == "9999-01-14T11:52+08:00"
+    assert result["items"][5]["properties"]["published"][0] == "2014-06-01 12:30-06:00"
+    assert result["items"][8]["properties"]["start"][0] == "2014-06-01 12:30-06:00"
+    assert result["items"][9]["properties"]["start"][0] == "2014-06-01 12:30-06:00"
+    assert result["items"][10]["properties"]["start"][0] == "2014-06-01 00:30-06:00"
+    assert result["items"][10]["properties"]["end"][0] == "2014-06-01 12:15"
+    assert result["items"][10]["properties"]["start"][1] == "2014-06-01 00:30-06:00"
+    assert result["items"][10]["properties"]["end"][1] == "2014-06-01 12:15"
+    assert result["items"][11]["properties"]["start"][0] == "2016-03-02 00:30-06:00"
+    assert result["items"][12]["properties"]["start"][0] == "2014-06-01 12:30-6:00"
+    assert result["items"][13]["properties"]["start"][0] == "2014-06-01 12:30+6:00"
+    assert result["items"][14]["properties"]["start"][0] == "2014-06-01 12:30Z"
+    assert result["items"][15]["properties"]["start"][0] == "2014-06-01 12:30-6:00"
 def test_dt_end_implied_date():
     """Test that events with dt-start and dt-end use the implied date rule
     http://microformats.org/wiki/value-class-pattern#microformats2_parsers
@@ -200,28 +163,19 @@ def test_dt_end_implied_date():
     result = parse_fixture("datetimes.html")
 
     event_wo_tz = result["items"][6]
-    assert_equal(event_wo_tz["properties"]["start"][0],
-                 "2014-05-21 18:30")
-    assert_equal(event_wo_tz["properties"]["end"][0],
-                 "2014-05-21 19:30")
+    assert event_wo_tz["properties"]["start"][0] == "2014-05-21 18:30"
+    assert event_wo_tz["properties"]["end"][0] == "2014-05-21 19:30"
 
     event_w_tz = result["items"][7]
-    assert_equal(event_w_tz["properties"]["start"][0],
-                 "2014-06-01 12:30-06:00")
-    assert_equal(event_w_tz["properties"]["end"][0],
-                 "2014-06-01 19:30-06:00")
+    assert event_w_tz["properties"]["start"][0] == "2014-06-01 12:30-06:00"
+    assert event_w_tz["properties"]["end"][0] == "2014-06-01 19:30-06:00"
 
 
 
 def test_embedded_parsing():
     result = parse_fixture("embedded.html")
-    assert_equal(
-        result["items"][0]["properties"]["content"][0]["html"],
-        '<p>Blah blah blah blah blah.</p>\n' +
-        '   <p>Blah.</p>\n   <p>Blah blah blah.</p>')
-    assert_equal(
-        result["items"][0]["properties"]["content"][0]["value"],
-        'Blah blah blah blah blah.\nBlah.\nBlah blah blah.')
+    assert result["items"][0]["properties"]["content"][0]["html"] == '<p>Blah blah blah blah blah.</p>\n   <p>Blah.</p>\n   <p>Blah blah blah.</p>'
+    assert result["items"][0]["properties"]["content"][0]["value"] == 'Blah blah blah blah blah.\nBlah.\nBlah blah blah.'
 
 
 def test_hoisting_nested_hcard():
@@ -247,52 +201,48 @@ def test_hoisting_nested_hcard():
                 'type': ['h-entry']
             }
         ]
-    assert_equal(expected, result['items'])
+    assert expected == result['items']
 
 
 def test_html_tag_class():
     result = parse_fixture("hfeed_on_html_tag.html")
-    assert_equal(['h-feed'], result['items'][0]['type'])
+    assert ['h-feed'] == result['items'][0]['type']
 
-    assert_equal(['entry1'], result['items'][0]['children'][0]
-                 ['properties']['name'])
-    assert_equal(['entry2'], result['items'][0]['children'][1]
-                 ['properties']['name'])
+    assert ['entry1'] == result['items'][0]['children'][0]['properties']['name']
+    assert ['entry2'] == result['items'][0]['children'][1]['properties']['name']
 
 
 def test_string_strip():
     result = parse_fixture("string_stripping.html")
-    assert_equal('Tom Morris', result["items"][0]["properties"]["name"][0])
+    assert 'Tom Morris' == result["items"][0]["properties"]["name"][0]
 
 
 def test_template_parse():
     result = parse_fixture("template_tag.html")
-    assert_equal(0, len(result["items"]))
+    assert 0 == len(result["items"])
 
 def test_template_tag_inside_e_value():
     result = parse_fixture("template_tag_inside_e_value.html")
-    assert_equal("This is a Test with a <code>template</code> tag after this:",
-                 result['items'][0]['properties']['content'][0]['html'])
-    assert_equal("This is a Test with a template tag after this:",
-                 result['items'][0]['properties']['content'][0]['value'])
+    assert "This is a Test with a <code>template</code> tag after this:" == result['items'][0]['properties']['content'][0]['html']
+    assert "This is a Test with a template tag after this:" == result['items'][0]['properties']['content'][0]['value']
 
 def test_ordering_dedup():
     ''' test that classes are dedeuped and alphabetically ordered '''
 
     result = parse_fixture("ordering_dedup.html")
     item = result['items'][0]
-    assert_equal(['h-entry', 'h-feed', 'h-product', 'h-x-test'], item['type'])
-    assert_equal(['example.com', 'example.com/2'], item['properties']['url'])
-    assert_equal(['name', 'URL name'], item['properties']['name'])
-    assert_equal(['author', 'bookmark', 'me'], result['rel-urls']['example.com/rel']['rels'])
-    assert_equal('de', result['rel-urls']['example.com/lang']['hreflang'])
+    assert ['h-entry', 'h-feed', 'h-product', 'h-x-test'] == item['type']
+    assert ['example.com', 'example.com/2'] == item['properties']['url']
+    assert ['name', 'URL name'] == item['properties']['name']
+    assert ['author', 'bookmark', 'me'] == result['rel-urls']['example.com/rel']['rels']
+    assert 'de' == result['rel-urls']['example.com/lang']['hreflang']
 
 def test_class_names_format():
     ''' test that only classes with letters and possibly numbers in the vendor prefix part are used '''
 
     result = parse_fixture("class_names_format.html")
     item = result['items'][0]
-    assert_equal(['h-feed', 'h-p3k-entry', 'h-x-test'], item['type'])
+    assert ['h-feed', 'h-p3k-entry', 'h-x-test'] == item['type']
     assert 'url' in item['properties']
     assert 'p3k-url' in item['properties']
     assert 'Url' not in item['properties']
@@ -307,8 +257,7 @@ def test_class_names_format():
 
 def test_area_uparsing():
     result = parse_fixture("area.html")
-    assert_equal({
-        'url': ['http://suda.co.uk'], 'name': ['Brian Suda']}, result["items"][0]["properties"])
+    assert {'url': ['http://suda.co.uk'], 'name': ['Brian Suda']} == result["items"][0]["properties"]
     assert 'shape' in result["items"][0]
     assert 'coords' in result["items"][0]
 
@@ -317,18 +266,18 @@ def test_src_equiv():
     result = parse_fixture("test_src_equiv.html")
     for item in result["items"]:
         assert 'x-example' in item['properties']
-        assert_equal('http://example.org/', item['properties']['x-example'][0])
+        assert 'http://example.org/' == item['properties']['x-example'][0]
 
 
 def test_rels():
     result = parse_fixture("rel.html")
-    assert_equal({
+    assert {
         u'in-reply-to': [u'http://example.com/1', u'http://example.com/2'],
         u'author': [u'http://example.com/a', u'http://example.com/b'],
         u'alternate': [u'http://example.com/fr'],
         u'home': [u'http://example.com/fr'],
-    }, result['rels'])
-    assert_equal({
+    } == result['rels']
+    assert {
         u'http://example.com/1': {'text': u"post 1", "rels": [u'in-reply-to']},
         u'http://example.com/2': {'text': u"post 2", "rels": [u'in-reply-to']},
         u'http://example.com/a': {'text': u"author a", "rels": [u'author']},
@@ -337,50 +286,50 @@ def test_rels():
                                    u'media': u'handheld',
                                    u'rels': [u'alternate', u'home'],
                                    u'hreflang': u'fr'}
-    }, result['rel-urls'])
+    } == result['rel-urls']
 
 
 def test_alternates():
     result = parse_fixture("rel.html")
-    assert_equal([{
+    assert [{
         'url': 'http://example.com/fr', 'media': 'handheld',
         'text': 'French mobile homepage',
         'rel': 'home', 'hreflang': 'fr'
-    }], result['alternates'])
+    }] == result['alternates']
 
 
 def test_enclosures():
     result = parse_fixture("rel_enclosure.html")
-    assert_equal({'enclosure': ['http://example.com/movie.mp4']}, result['rels'])
-    assert_equal({'http://example.com/movie.mp4': {
+    assert {'enclosure': ['http://example.com/movie.mp4']} == result['rels']
+    assert {'http://example.com/movie.mp4': {
         'rels': ['enclosure'],
         'text': 'my movie',
         'type': 'video/mpeg'}
-    }, result['rel-urls'])
+    } == result['rel-urls']
 
 
 def test_empty_href():
     result = parse_fixture("hcard_with_empty_url.html", "http://foo.com")
 
     for hcard in result['items']:
-        assert_equal(['http://foo.com'], hcard['properties']['url'])
+        assert ['http://foo.com'] == hcard['properties']['url']
 
 
 def test_link_with_u_url():
     result = parse_fixture("link_with_u-url.html", "http://foo.com")
-    assert_equal({
+    assert {
         "type": ["h-card"],
         "properties": {
             "name": [""],
             "url": ["http://foo.com/"],
         },
-    }, result["items"][0])
+    } == result["items"][0]
 
 def test_broken_url():
     result = parse_fixture("broken_url.html", "http://example.com")
-    assert_equal(result["items"][0]["properties"]["relative"][0], "http://example.com/foo.html")
-    assert_equal(result["items"][0]["properties"]["url"][0], "http://www.[w3.org/")
-    assert_equal(result["items"][0]["properties"]["photo"][0], "http://www.w3].org/20[08/site/images/logo-w3c-mobile-lg")
+    assert result["items"][0]["properties"]["relative"][0] == "http://example.com/foo.html"
+    assert result["items"][0]["properties"]["url"][0] == "http://www.[w3.org/"
+    assert result["items"][0]["properties"]["photo"][0] == "http://www.w3].org/20[08/site/images/logo-w3c-mobile-lg"
 
 def test_complex_e_content():
     """When parsing h-* e-* properties, we should fold {"value":..., "html":...}
@@ -389,7 +338,7 @@ def test_complex_e_content():
     """
     result = parse_fixture("complex_e_content.html")
 
-    assert_equal({
+    assert {
         "type": ["h-entry"],
         "properties": {
             "content": [{
@@ -403,7 +352,7 @@ def test_complex_e_content():
                 "value": "Hello"
             }],
         }
-    }, result["items"][0])
+    } == result["items"][0]
 
 
 def test_nested_values():
@@ -412,31 +361,31 @@ def test_nested_values():
     result = parse_fixture("nested_values.html")
     entry = result["items"][0]
 
-    assert_equal({
+    assert {
         'properties': {
             'name': ['Kyle'],
             'url': ['http://about.me/kyle'],
         },
         'value': 'Kyle',
         'type': ['h-card'],
-    }, entry["properties"]["author"][0])
+    } == entry["properties"]["author"][0]
 
-    assert_equal({
+    assert {
         'properties': {
             'name': ['foobar'],
             'url': ['http://example.com/foobar'],
         },
         'value': 'http://example.com/foobar',
         'type': ['h-cite'],
-    }, entry["properties"]["like-of"][0])
+    } == entry["properties"]["like-of"][0]
 
-    assert_equal({
+    assert {
         'properties': {
             'name': ['George'],
             'url': ['http://people.com/george'],
         },
         'type': ['h-card'],
-    }, entry["children"][0])
+    } == entry["children"][0]
 
 
 # implied properties tests
@@ -445,17 +394,16 @@ def test_implied_name():
     result = parse_fixture("implied_properties/implied_properties.html")
 
     for i in range(7):
-        assert_equal(result["items"][i]["properties"]["name"][0], "Tom Morris")
+        assert result["items"][i]["properties"]["name"][0] == "Tom Morris"
 
 
 def test_implied_url():
     result = parse_fixture("implied_properties/implied_properties.html", url="http://foo.com/")
-    assert_equal(
-        result["items"][1]["properties"]["url"][0], "http://tommorris.org/")
+    assert result["items"][1]["properties"]["url"][0] == "http://tommorris.org/"
     # img should not have a "url" property
-    assert_true("url" not in result["items"][4]["properties"])
+    assert "url" not in result["items"][4]["properties"]
     # href="" is relative to the base url
-    assert_equal(result["items"][5]["properties"]["url"][0], "http://foo.com/")
+    assert result["items"][5]["properties"]["url"][0] == "http://foo.com/"
 
 def test_implied_photo():
 
@@ -463,12 +411,12 @@ def test_implied_photo():
 
     for i in range(12):
         photos = result["items"][i]["properties"]["photo"]
-        assert_equal(len(photos), 1)
-        assert_equal(photos[0], "http://example.com/photo.jpg")
+        assert len(photos) == 1
+        assert photos[0] == "http://example.com/photo.jpg"
 
     # tests for no photo
     for i in range(12, 23):
-        assert_false("photo" in result["items"][i]["properties"])
+        assert "photo" not in result["items"][i]["properties"]
 
 def test_implied_url():
 
@@ -476,53 +424,48 @@ def test_implied_url():
 
     for i in range(12):
         urls = result["items"][i]["properties"]["url"]
-        assert_equal(len(urls), 1)
-        assert_equal(urls[0], "http://example.com")
+        assert len(urls) == 1
+        assert urls[0] == "http://example.com"
 
     # tests for no url
     for i in range(12, 23):
-        assert_false("url" in result["items"][i]["properties"])
+        assert "url" not in result["items"][i]["properties"]
 
 def test_stop_implied_url():
     """testing that explicit properties case implied url-parsing to be aborted"""
 
     result = parse_fixture("implied_properties/stop_implied_url.html")
 
-    assert_false("url" in result["items"][0]["properties"])
-    assert_false("url" in result["items"][1]["properties"])
-    assert_false("url" in result["items"][2]["properties"])
-    assert_false("url" in result["items"][3]["properties"])
-    assert_false("url" in result["items"][4]["properties"])
-    assert_false("url" in result["items"][5]["properties"])
+    assert "url" not in result["items"][0]["properties"]
+    assert "url" not in result["items"][1]["properties"]
+    assert "url" not in result["items"][2]["properties"]
+    assert "url" not in result["items"][3]["properties"]
+    assert "url" not in result["items"][4]["properties"]
+    assert "url" not in result["items"][5]["properties"]
 
-    assert_equal(result["items"][6]["properties"]["url"], ["http://example.com/"])
-    assert_equal(result["items"][7]["properties"]["url"], ["http://example.com/"])
-    assert_equal(result["items"][8]["properties"]["url"], ["http://example.com/"])
-    assert_equal(result["items"][9]["properties"]["url"], ["http://example.com/"])
+    assert result["items"][6]["properties"]["url"] == ["http://example.com/"]
+    assert result["items"][7]["properties"]["url"] == ["http://example.com/"]
+    assert result["items"][8]["properties"]["url"] == ["http://example.com/"]
+    assert result["items"][9]["properties"]["url"] == ["http://example.com/"]
 
 def test_implied_nested_photo():
     result = parse_fixture("implied_properties/implied_properties.html", url="http://bar.org")
-    assert_equal(result["items"][2]["properties"]["photo"][0],
-                 "http://tommorris.org/photo.png")
-    assert_equal(result["items"][3]["properties"]["photo"][0],
-                 "http://tommorris.org/photo.png")
-    assert_equal(result["items"][4]["properties"]["photo"][0],
-                 "http://tommorris.org/photo.png")
+    assert result["items"][2]["properties"]["photo"][0] == "http://tommorris.org/photo.png"
+    assert result["items"][3]["properties"]["photo"][0] == "http://tommorris.org/photo.png"
+    assert result["items"][4]["properties"]["photo"][0] == "http://tommorris.org/photo.png"
     # src="" is relative to the base url
-    assert_equal(result["items"][6]["properties"]["photo"][0],
-                 "http://bar.org")
+    assert result["items"][6]["properties"]["photo"][0] == "http://bar.org"
 
 
 def test_implied_nested_photo_alt_name():
     result = parse_fixture("implied_properties/implied_properties.html")
-    assert_equal(result["items"][3]["properties"]["name"][0], "Tom Morris")
+    assert result["items"][3]["properties"]["name"][0] == "Tom Morris"
 
 
 def test_implied_image():
     result = parse_fixture("implied_properties/implied_properties.html")
-    assert_equal(result["items"][4]["properties"]["photo"][0],
-                 "http://tommorris.org/photo.png")
-    assert_equal(result["items"][4]["properties"]["name"][0], "Tom Morris")
+    assert result["items"][4]["properties"]["photo"][0] == "http://tommorris.org/photo.png"
+    assert result["items"][4]["properties"]["name"][0] == "Tom Morris"
 
 def test_implied_name_empty_alt():
     """An empty alt text should not prevent us from including other
@@ -532,34 +475,30 @@ def test_implied_name_empty_alt():
     result = parse_fixture("implied_properties/implied_name_empty_alt.html")
     hcard = result['items'][0]
 
-    assert_equal({
+    assert {
         'type': ['h-card'],
         'properties': {
             'name': ['@kylewmahan'],
             'url': ['https://twitter.com/kylewmahan'],
             'photo': ['https://example.org/test.jpg'],
         },
-    }, hcard)
+    } == hcard
 
 def test_relative_datetime():
     result = parse_fixture("implied_properties/implied_relative_datetimes.html")
-    assert_equal(result[u'items'][0][u'properties'][u'updated'][0],
-                 '2015-01-02 05:06')
+    assert result[u'items'][0][u'properties'][u'updated'][0] == '2015-01-02 05:06'
 
 def test_stop_implied_name_nested_h():
     result = parse_fixture("implied_properties/stop_implied_name_nested_h.html")
-    assert_true('name' not in
-                 result[u'items'][0][u'properties'])
+    assert 'name' not in result[u'items'][0][u'properties']
 
 def test_stop_implied_name_e_content():
     result = parse_fixture("implied_properties/stop_implied_name_e_content.html")
-    assert_true('name' not in
-                 result[u'items'][0][u'properties'])
+    assert 'name' not in result[u'items'][0][u'properties']
 
 def test_stop_implied_name_p_content():
     result = parse_fixture("implied_properties/stop_implied_name_p_content.html")
-    assert_true('name' not in
-                 result[u'items'][0][u'properties'])
+    assert 'name' not in result[u'items'][0][u'properties']
 
 def test_implied_properties_silo_pub():
     result = parse_fixture('implied_properties/implied_properties_silo_pub.html')
@@ -567,96 +506,90 @@ def test_implied_properties_silo_pub():
 
     #implied_name = item['properties']['name'][0]
     #implied_name = re.sub('\s+', ' ', implied_name).strip()
-    #assert_equal('@kylewmahan on Twitter', implied_name)
+    #assert '@kylewmahan on Twitter', implied_name)
 
     # no implied name expected under new rules
 
-    assert_true('name' not in
-                 item[u'properties'])
+    assert 'name' not in item[u'properties']
 
 def test_simple_person_reference_implied():
     result = parse_fixture("implied_properties/simple_person_reference_implied.html")
-    assert_equal(result["items"][0]["properties"],
-                 {'name': ['Frances Berriman']})
+    assert result["items"][0]["properties"] == {'name': ['Frances Berriman']}
 
 
 def test_implied_name_alt():
     result = parse_fixture("implied_properties/implied_name_alt.html")
-    assert_equal(result["items"][0]["children"][0],
+    assert result["items"][0]["children"][0] == \
                  {'type': ['h-card'],
                   'properties': {'name': ['Avatar of Stephen'],
-                                 'photo': ['avatar.jpg']}})
+                                 'photo': ['avatar.jpg']}}
 
 
 def test_value_name_whitespace():
     result = parse_fixture("value_name_whitespace.html")
 
     for i in range(3):
-        assert_equal(result["items"][i]["properties"]["content"][0]["value"], "Hello World")
-        assert_equal(result["items"][i]["properties"]["name"][0], "Hello World")
+        assert result["items"][i]["properties"]["content"][0]["value"] == "Hello World"
+        assert result["items"][i]["properties"]["name"][0] == "Hello World"
 
     for i in range(3, 8):
-        assert_equal(result["items"][i]["properties"]["content"][0]["value"], "Hello\nWorld")
-        assert_equal(result["items"][i]["properties"]["name"][0], "Hello\nWorld")
+        assert result["items"][i]["properties"]["content"][0]["value"] == "Hello\nWorld"
+        assert result["items"][i]["properties"]["name"][0] == "Hello\nWorld"
 
     for i in range(8, 10):
-        assert_equal(result["items"][i]["properties"]["content"][0]["value"], "One\nTwo\nThree")
-        assert_equal(result["items"][i]["properties"]["name"][0], "One\nTwo\nThree")
+        assert result["items"][i]["properties"]["content"][0]["value"] == "One\nTwo\nThree"
+        assert result["items"][i]["properties"]["name"][0] == "One\nTwo\nThree"
 
-    assert_equal(result["items"][10]["properties"]["content"][0]["value"], "Hello World      one\n      two\n      three\n    ")
-    assert_equal(result["items"][10]["properties"]["name"][0], "Hello World      one\n      two\n      three\n    ")
+    assert result["items"][10]["properties"]["content"][0]["value"] == "Hello World      one\n      two\n      three\n    "
+    assert result["items"][10]["properties"]["name"][0] == "Hello World      one\n      two\n      three\n    "
 
-    assert_equal(result["items"][11]["properties"]["content"][0]["value"], "Correct name Correct summary")
-    assert_equal(result["items"][11]["properties"]["name"][0], "Correct name")
+    assert result["items"][11]["properties"]["content"][0]["value"] == "Correct name Correct summary"
+    assert result["items"][11]["properties"]["name"][0] == "Correct name"
 
 # backcompat tests
 
 def test_backcompat_hentry():
     result = parse_fixture("backcompat/hentry.html")
-    assert_true('h-entry' in result['items'][0]['type'])
-    assert_equal('Tom Morris',
-                 result['items'][0]['properties']
-                 ['author'][0]['properties']['name'][0])
-    assert_equal('A Title',
-                 result['items'][0]['properties']['name'][0])
-    assert_equal('Some Content',
-                 result['items'][0]['properties']['content'][0]['value'])
+    assert 'h-entry' in result['items'][0]['type']
+    assert 'Tom Morris' == result['items'][0]['properties']['author'][0]['properties']['name'][0]
+    assert 'A Title' == result['items'][0]['properties']['name'][0]
+    assert 'Some Content' == result['items'][0]['properties']['content'][0]['value']
 
 def test_backcompat_hproduct():
     result = parse_fixture("backcompat/hproduct.html")
-    assert_equal(1, len(result["items"]))
-    assert_equal(["h-product"], result["items"][0]["type"])
-    assert_equal(['bullshit'], result["items"][0]["properties"]["category"])
-    assert_equal(['Quacktastic Products'], result["items"][0]["properties"]["brand"])
-    assert_equal(['#BULLSHIT-001'], result["items"][0]["properties"]["identifier"])
-    assert_equal("Magical tasty sugar pills that don't do anything.", result["items"][0]["properties"]['description'][0])
-    assert_equal(["Tom's Magical Quack Tincture"], result["items"][0]["properties"]["name"])
+    assert 1 == len(result["items"])
+    assert ["h-product"] == result["items"][0]["type"]
+    assert ['bullshit'] == result["items"][0]["properties"]["category"]
+    assert ['Quacktastic Products'] == result["items"][0]["properties"]["brand"]
+    assert ['#BULLSHIT-001'] == result["items"][0]["properties"]["identifier"]
+    assert "Magical tasty sugar pills that don't do anything." == result["items"][0]["properties"]['description'][0]
+    assert ["Tom's Magical Quack Tincture"] == result["items"][0]["properties"]["name"]
 
 
 def test_backcompat_hproduct_nested_hreview():
     result = parse_fixture("backcompat/hproduct_hreview_nested.html")
-    assert_equal(['h-review'], result["items"][0]["children"][0]['type'])
+    assert ['h-review'] == result["items"][0]["children"][0]['type']
 
 def test_backcompat_hreview_nested_card_event_product():
     result = parse_fixture("backcompat/hreview_nested_card_event_product.html")
-    assert_equal(['h-review'], result["items"][0]['type'])
+    assert ['h-review'] == result["items"][0]['type']
     items = result["items"][0]["properties"]['item']
-    assert_equal(3, len(items))
+    assert 3 == len(items)
 
     event = items[0]
-    assert_equal(['h-event'], event['type'])
-    assert_equal(['http://example.com/event-url'], event['properties']['url'])
-    assert_equal(['event name'], event['properties']['name'])
+    assert ['h-event'] == event['type']
+    assert ['http://example.com/event-url'] == event['properties']['url']
+    assert ['event name'] == event['properties']['name']
 
     card = items[1]
-    assert_equal(['h-card'], card['type'])
-    assert_equal(['http://example.com/card-url'], card['properties']['url'])
-    assert_equal(['card name'], card['properties']['name'])
+    assert ['h-card'] == card['type']
+    assert ['http://example.com/card-url'] == card['properties']['url']
+    assert ['card name'] == card['properties']['name']
 
     product = items[2]
-    assert_equal(['h-product'], product['type'])
-    assert_equal(['http://example.com/product-url'], product['properties']['url'])
-    assert_equal(['product name'], product['properties']['name'])
+    assert ['h-product'] == product['type']
+    assert ['http://example.com/product-url'] == product['properties']['url']
+    assert ['product name'] == product['properties']['name']
 
 
 def test_backcompat_rel_bookmark():
@@ -670,8 +603,8 @@ def test_backcompat_rel_bookmark():
             '/2014/11/21/earth',
             '/2014/11/19/labor',
     )):
-        assert_equal(['h-entry'], result['items'][ii]['type'])
-        assert_equal([url], result['items'][ii]['properties']['url'])
+        assert ['h-entry'] == result['items'][ii]['type']
+        assert [url] == result['items'][ii]['properties']['url']
 
 def test_backcompat_rel_bookmark():
     """Confirm that rel=bookmark inside of an hentry and hreview is converted
@@ -683,7 +616,7 @@ def test_backcompat_rel_bookmark():
     results = [parse_fixture(x) for x in tests]
 
     for result in results:
-        assert_equal(['https://example.com/bookmark', 'https://example.com/bookmark-url'], result['items'][0]['properties']['url'])
+        assert ['https://example.com/bookmark', 'https://example.com/bookmark-url'] == result['items'][0]['properties']['url']
 
 def test_backcompat_rel_tag():
     """Confirm that rel=tag inside of an hentry is converted
@@ -694,75 +627,75 @@ def test_backcompat_rel_tag():
 
     results = [parse_fixture(x) for x in tests]
     for result in results:
-        assert_equal(['cat', 'dog', 'mountain lion', 'mouse', 'meerkat'], result['items'][0]['properties']['category'])
+        assert ['cat', 'dog', 'mountain lion', 'mouse', 'meerkat'] == result['items'][0]['properties']['category']
 
 def test_backcompat_rel_tag_entry_title():
     """Confirm that other backcompat properties on a rel=tag are parsed
     """
 
     result = parse_fixture('backcompat/hentry_with_rel_tag_entry_title.html')
-    assert_equal(['cat'], result['items'][0]['properties']['category'])
-    assert_equal(['rhinoceros'], result['items'][0]['properties']['name'])
+    assert ['cat'] == result['items'][0]['properties']['category']
+    assert ['rhinoceros'] == result['items'][0]['properties']['name']
 
 def test_backcompat_rel_multiple_root():
     """Confirm that rel=tag and rel=bookmark inside of an hentry+hreview is parsed correctly"""
 
     result = parse_fixture('backcompat/hreview_hentry_with_rel_tag_bookmark.html')
 
-    assert_equal(len(result['items']), 1)
-    assert_true('h-entry' in result['items'][0]['type'])
-    assert_true('h-review' in result['items'][0]['type'])
+    assert len(result['items']) == 1
+    assert 'h-entry' in result['items'][0]['type']
+    assert 'h-review' in result['items'][0]['type']
 
-    assert_equal(['cat', 'dog', 'mountain lion', 'mouse', 'meerkat'], result['items'][0]['properties']['category'])
-    assert_equal(['https://example.com/bookmark', 'https://example.com/bookmark-url'], result['items'][0]['properties']['url'])
+    assert ['cat', 'dog', 'mountain lion', 'mouse', 'meerkat'] == result['items'][0]['properties']['category']
+    assert ['https://example.com/bookmark', 'https://example.com/bookmark-url'] == result['items'][0]['properties']['url']
 
 def test_backcompat_ignore_mf1_root_if_mf2_present():
     """Confirm that mf1 root class is ignored if another mf2 root class is present.
     """
     result = parse_fixture('backcompat/ignore_mf1_root_if_mf2_present.html')
-    assert_true('h-entry' not in result['items'][0]['type'])
-    assert_true('h-event' in result['items'][0]['type'])
+    assert 'h-entry' not in result['items'][0]['type']
+    assert 'h-event' in result['items'][0]['type']
 
 def test_backcompat_no_implied_properties_mf1_root():
     """Confirm that mf1 root class does not have implied properties
     """
     result = parse_fixture('backcompat/ignore_mf1_root_if_mf2_present.html')
-    assert_true('h-entry' not in result['items'][0]['properties'])
-    assert_true('name' not in result['items'][0]['type'])
-    assert_true('url' not in result['items'][0]['properties'])
-    assert_true('photo' not in result['items'][0]['properties'])
+    assert 'h-entry' not in result['items'][0]['properties']
+    assert 'name' not in result['items'][0]['type']
+    assert 'url' not in result['items'][0]['properties']
+    assert 'photo' not in result['items'][0]['properties']
 
 def test_backcompat_ignore_mf2_properties_in_mf1_root():
     """Confirm that mf2 properties are ignored in mf1 root class
     """
     result = parse_fixture('backcompat/ignore_mf2_properties_in_mf1_root.html')
-    assert_equal('Correct name', result['items'][0]['properties']['name'][0])
-    assert_equal('Correct summary', result['items'][0]['properties']['summary'][0])
+    assert 'Correct name' == result['items'][0]['properties']['name'][0]
+    assert 'Correct summary' == result['items'][0]['properties']['summary'][0]
 
 def test_backcompat_ignore_mf1_properties_in_mf2_root():
     """Confirm that mf1 properties are ignored in mf2 root class
     """
     result = parse_fixture('backcompat/ignore_mf1_properties_in_mf2_root.html')
-    assert_equal('Correct name', result['items'][0]['properties']['name'][0])
-    assert_equal('Correct summary', result['items'][0]['properties']['summary'][0])
+    assert 'Correct name' == result['items'][0]['properties']['name'][0]
+    assert 'Correct summary' == result['items'][0]['properties']['summary'][0]
 
 def test_backcompat_nested_mf2_in_mf1():
     """Confirm that mf2 roots nested inside mf1 root are parsed
     """
     result = parse_fixture('backcompat/nested_mf2_in_mf1.html')
-    assert_equal('h-feed', result['items'][0]['type'][0])
-    assert_equal('h-entry', result['items'][0]['children'][0]['type'][0])
-    assert_equal('Correct name', result['items'][0]['children'][0]['properties']['name'][0])
-    assert_equal('Correct summary', result['items'][0]['children'][0]['properties']['summary'][0])
+    assert 'h-feed' == result['items'][0]['type'][0]
+    assert 'h-entry' == result['items'][0]['children'][0]['type'][0]
+    assert 'Correct name' == result['items'][0]['children'][0]['properties']['name'][0]
+    assert 'Correct summary' == result['items'][0]['children'][0]['properties']['summary'][0]
 
 def test_backcompat_nested_mf1_in_mf2():
     """Confirm that mf1 roots nested inside mf2 root are parsed
     """
     result = parse_fixture('backcompat/nested_mf1_in_mf2.html')
-    assert_equal('h-feed', result['items'][0]['type'][0])
-    assert_equal('h-entry', result['items'][0]['children'][0]['type'][0])
-    assert_equal('Correct name', result['items'][0]['children'][0]['properties']['name'][0])
-    assert_equal('Correct summary', result['items'][0]['children'][0]['properties']['summary'][0])
+    assert 'h-feed' == result['items'][0]['type'][0]
+    assert 'h-entry' == result['items'][0]['children'][0]['type'][0]
+    assert 'Correct name' == result['items'][0]['children'][0]['properties']['name'][0]
+    assert 'Correct summary' == result['items'][0]['children'][0]['properties']['summary'][0]
 
 def test_backcompat_nested_mf1_in_mf2_e_content():
     """Confirm that mf1 roots nested inside mf2 root e-content are parsed as authored
@@ -772,13 +705,13 @@ def test_backcompat_nested_mf1_in_mf2_e_content():
     mf2_entry = result['items'][0]
     mf1_entry = mf2_entry['children'][0]
 
-    assert_equal('<div class="hentry">\n<span class="entry-title">Correct name</span>\n\n<span class="entry-summary">Correct summary</span>\n</div>', mf2_entry['properties']['content'][0]['html'])
+    assert '<div class="hentry">\n<span class="entry-title">Correct name</span>\n\n<span class="entry-summary">Correct summary</span>\n</div>' == mf2_entry['properties']['content'][0]['html']
 
-    assert_equal('Correct name Correct summary', mf2_entry['properties']['content'][0]['value'])
+    assert 'Correct name Correct summary' == mf2_entry['properties']['content'][0]['value']
 
-    assert_equal('h-entry', mf1_entry['type'][0])
-    assert_equal('Correct name', mf1_entry['properties']['name'][0])
-    assert_equal('Correct summary', mf1_entry['properties']['summary'][0])
+    assert 'h-entry' == mf1_entry['type'][0]
+    assert 'Correct name' == mf1_entry['properties']['name'][0]
+    assert 'Correct summary' == mf1_entry['properties']['summary'][0]
 
 def test_backcompat_hentry_content_html():
     """Confirm that mf1 entry-content html is parsed as authored without mf2 replacements
@@ -787,7 +720,7 @@ def test_backcompat_hentry_content_html():
 
     entry = result['items'][0]
 
-    assert_equal('<p class="entry-summary">This is a summary</p> \n        <p>This is <a href="/tags/mytag" rel="tag">mytag</a> inside content. </p>', entry['properties']['content'][0]['html'])
+    assert '<p class="entry-summary">This is a summary</p> \n        <p>This is <a href="/tags/mytag" rel="tag">mytag</a> inside content. </p>' == entry['properties']['content'][0]['html']
 
 def test_whitespace_with_tags_inside_property():
     """Whitespace should only be trimmed at the ends of textContent, not inside.
@@ -795,8 +728,7 @@ def test_whitespace_with_tags_inside_property():
     https://github.com/microformats/mf2py/issues/112
     """
     result = parse_fixture('tag_whitespace_inside_p_value.html')
-    assert_equal(result['items'][0]['properties'],
-                 {'name': ['foo bar']})
+    assert result['items'][0]['properties'] == {'name': ['foo bar']}
 
 
 # experimental features tests
@@ -815,57 +747,57 @@ def test_photo_with_alt():
         exp_result = Parser(doc=f, html_parser='html5lib', img_with_alt=True).to_dict()
 
     # simple img with u-*
-    assert_equal('/photo.jpg', result['items'][0]['properties']['photo'][0])
-    assert_equal('/photo.jpg', exp_result['items'][0]['properties']['photo'][0])
+    assert '/photo.jpg' == result['items'][0]['properties']['photo'][0]
+    assert '/photo.jpg' == exp_result['items'][0]['properties']['photo'][0]
 
-    assert_equal('/photo.jpg', result['items'][1]['properties']['url'][0])
-    assert_equal('/photo.jpg', exp_result['items'][1]['properties']['url'][0]['value'])
-    assert_equal('alt text', exp_result['items'][1]['properties']['url'][0]['alt'])
+    assert '/photo.jpg' == result['items'][1]['properties']['url'][0]
+    assert '/photo.jpg' == exp_result['items'][1]['properties']['url'][0]['value']
+    assert 'alt text' == exp_result['items'][1]['properties']['url'][0]['alt']
 
-    assert_equal('/photo.jpg', result['items'][2]['properties']['in-reply-to'][0])
-    assert_equal('/photo.jpg', exp_result['items'][2]['properties']['in-reply-to'][0]['value'])
-    assert_equal('', exp_result['items'][2]['properties']['in-reply-to'][0]['alt'])
+    assert '/photo.jpg' == result['items'][2]['properties']['in-reply-to'][0]
+    assert '/photo.jpg' == exp_result['items'][2]['properties']['in-reply-to'][0]['value']
+    assert '' == exp_result['items'][2]['properties']['in-reply-to'][0]['alt']
 
     # img with u-* and h-* example
-    assert_true('h-cite' in result['items'][3]['properties']['in-reply-to'][0]['type'])
-    assert_equal('/photo.jpg', result['items'][3]['properties']['in-reply-to'][0]['properties']['photo'][0])
-    assert_equal('/photo.jpg', result['items'][3]['properties']['in-reply-to'][0]['value'])
-    assert_false('alt' in result['items'][3]['properties']['in-reply-to'][0])
-
-    assert_true('h-cite' in exp_result['items'][3]['properties']['in-reply-to'][0]['type'])
-    assert_equal('/photo.jpg', exp_result['items'][3]['properties']['in-reply-to'][0]['properties']['photo'][0])
-    assert_equal('/photo.jpg', exp_result['items'][3]['properties']['in-reply-to'][0]['value'])
-    assert_false('alt' in exp_result['items'][3]['properties']['in-reply-to'][0])
-
-    assert_true('h-cite' in result['items'][4]['properties']['in-reply-to'][0]['type'])
-    assert_equal('/photo.jpg', result['items'][4]['properties']['in-reply-to'][0]['properties']['photo'][0])
-    assert_equal('/photo.jpg', result['items'][4]['properties']['in-reply-to'][0]['value'])
-    assert_false('alt' in result['items'][4]['properties']['in-reply-to'][0])
-
-    assert_true('h-cite' in exp_result['items'][4]['properties']['in-reply-to'][0]['type'])
-    assert_equal('/photo.jpg', exp_result['items'][4]['properties']['in-reply-to'][0]['properties']['photo'][0]['value'])
-    assert_equal('/photo.jpg', exp_result['items'][4]['properties']['in-reply-to'][0]['value'])
-    assert_equal('alt text', exp_result['items'][4]['properties']['in-reply-to'][0]['properties']['photo'][0]['alt'])
-    assert_equal('alt text', exp_result['items'][4]['properties']['in-reply-to'][0]['alt'])
-
-    assert_true('h-cite' in result['items'][5]['properties']['in-reply-to'][0]['type'])
-    assert_equal('/photo.jpg', result['items'][5]['properties']['in-reply-to'][0]['properties']['photo'][0])
-    assert_equal('/photo.jpg', result['items'][5]['properties']['in-reply-to'][0]['value'])
-    assert_false('alt' in result['items'][5]['properties']['in-reply-to'][0])
-
-    assert_true('h-cite' in exp_result['items'][5]['properties']['in-reply-to'][0]['type'])
-    assert_equal('/photo.jpg', exp_result['items'][5]['properties']['in-reply-to'][0]['properties']['photo'][0]['value'])
-    assert_equal('/photo.jpg', exp_result['items'][5]['properties']['in-reply-to'][0]['value'])
-    assert_equal('', exp_result['items'][5]['properties']['in-reply-to'][0]['properties']['photo'][0]['alt'])
-    assert_equal('', exp_result['items'][5]['properties']['in-reply-to'][0]['alt'])
+    assert 'h-cite' in result['items'][3]['properties']['in-reply-to'][0]['type']
+    assert '/photo.jpg' == result['items'][3]['properties']['in-reply-to'][0]['properties']['photo'][0]
+    assert '/photo.jpg' == result['items'][3]['properties']['in-reply-to'][0]['value']
+    assert 'alt' not in result['items'][3]['properties']['in-reply-to'][0]
+
+    assert 'h-cite' in exp_result['items'][3]['properties']['in-reply-to'][0]['type']
+    assert '/photo.jpg' == exp_result['items'][3]['properties']['in-reply-to'][0]['properties']['photo'][0]
+    assert '/photo.jpg' == exp_result['items'][3]['properties']['in-reply-to'][0]['value']
+    assert 'alt' not in exp_result['items'][3]['properties']['in-reply-to'][0]
+
+    assert 'h-cite' in result['items'][4]['properties']['in-reply-to'][0]['type']
+    assert '/photo.jpg' == result['items'][4]['properties']['in-reply-to'][0]['properties']['photo'][0]
+    assert '/photo.jpg' == result['items'][4]['properties']['in-reply-to'][0]['value']
+    assert 'alt' not in result['items'][4]['properties']['in-reply-to'][0]
+
+    assert 'h-cite' in exp_result['items'][4]['properties']['in-reply-to'][0]['type']
+    assert '/photo.jpg' == exp_result['items'][4]['properties']['in-reply-to'][0]['properties']['photo'][0]['value']
+    assert '/photo.jpg' == exp_result['items'][4]['properties']['in-reply-to'][0]['value']
+    assert 'alt text' == exp_result['items'][4]['properties']['in-reply-to'][0]['properties']['photo'][0]['alt']
+    assert 'alt text' == exp_result['items'][4]['properties']['in-reply-to'][0]['alt']
+
+    assert 'h-cite' in result['items'][5]['properties']['in-reply-to'][0]['type']
+    assert '/photo.jpg' == result['items'][5]['properties']['in-reply-to'][0]['properties']['photo'][0]
+    assert '/photo.jpg' == result['items'][5]['properties']['in-reply-to'][0]['value']
+    assert 'alt' not in result['items'][5]['properties']['in-reply-to'][0]
+
+    assert 'h-cite' in exp_result['items'][5]['properties']['in-reply-to'][0]['type']
+    assert '/photo.jpg' == exp_result['items'][5]['properties']['in-reply-to'][0]['properties']['photo'][0]['value']
+    assert '/photo.jpg' == exp_result['items'][5]['properties']['in-reply-to'][0]['value']
+    assert '' == exp_result['items'][5]['properties']['in-reply-to'][0]['properties']['photo'][0]['alt']
+    assert '' == exp_result['items'][5]['properties']['in-reply-to'][0]['alt']
 
 
 def test_parse_id():
     result = parse_fixture("parse_id.html")
-    assert_equal("recentArticles", result['items'][0]['id'])
-    assert_equal("article", result['items'][0]['children'][0]['id'])
-    assert_true("id" not in result['items'][0]['children'][1])
-    assert_equal("theAuthor", result['items'][0]['properties']['author'][0]['id'])
+    assert "recentArticles" == result['items'][0]['id']
+    assert "article" == result['items'][0]['children'][0]['id']
+    assert "id" not in result['items'][0]['children'][1]
+    assert "theAuthor" == result['items'][0]['properties']['author'][0]['id']
 
 # unicode tests
 
@@ -883,15 +815,13 @@ def get_all_files():
 def assert_unicode_everywhere(obj):
     if isinstance(obj, dict):
         for k, v in obj.items():
-            assert_false(isinstance(k, binary_type),
-                         'key=%r; type=%r' % (k, type(k)))
+            assert not isinstance(k, binary_type), 'key=%r; type=%r' % (k, type(k))
             assert_unicode_everywhere(v)
     elif isinstance(obj, list):
         for v in obj:
             assert_unicode_everywhere(v)
 
-    assert_false(isinstance(obj, binary_type),
-                 'value=%r; type=%r' % (obj, type(obj)))
+    assert not isinstance(obj, binary_type), 'value=%r; type=%r' % (obj, type(obj))
 
 
 def check_unicode(filename, jsonblob):
@@ -903,7 +833,7 @@ def test_unicode_everywhere():
 
     for h in get_all_files()  :
         result = parse_fixture(h)
-        yield check_unicode, h, result
+        check_unicode(h, result)
 
 
 def test_input_tree_integrity():
@@ -915,11 +845,12 @@ def test_input_tree_integrity():
             html1 = soup.prettify()
             p = Parser(doc=soup, html_parser='lxml')
             html2 = soup.prettify()
-        yield make_labelled_cmp("tree_integrity_" + path), html1, html2
+        make_labelled_cmp("tree_integrity_" + path)(html1, html2)
 
 
 def make_labelled_cmp(label):
-    f = lambda html1, html2: assert_equal(html1,html2)
+    def f(html1, html2):
+        assert html1 == html2
     f.description = label
     return f
 
@@ -929,6 +860,6 @@ def test_all_u_cases():
     URL_COUNT = 28
     result = parse_fixture("u_all_cases.html")
 
-    assert_equal(URL_COUNT, len(result['items'][0]['properties']['url']))
+    assert URL_COUNT == len(result['items'][0]['properties']['url'])
     for i in range(URL_COUNT):
-        yield make_labelled_cmp("all_u_cases_" + str(i)), "http://example.com/test", result['items'][0]['properties']['url'][i]
+        make_labelled_cmp("all_u_cases_" + str(i))("http://example.com/test", result['items'][0]['properties']['url'][i])
diff --git a/test/test_suite.py b/test/test_suite.py
index 1201625..bd8a7ba 100644
--- a/test/test_suite.py
+++ b/test/test_suite.py
@@ -1,5 +1,4 @@
 from __future__ import unicode_literals, print_function
-from nose.tools import assert_equal
 import glob
 import json
 import mf2py
@@ -8,9 +7,6 @@
 from test_parser import check_unicode
 
 
-assert_equal.__self__.maxDiff = None
-
-
 def test_mf2tests():
     allfiles = glob.glob(
         os.path.join('.', 'testsuite', 'tests', '*', '*', '*.json'))
@@ -18,15 +14,15 @@ def test_mf2tests():
         htmlfile = jsonfile[:-4] + 'html'
         with open(htmlfile) as f:
             p = mf2py.parse(doc=f, url='http://example.com')
-            yield check_unicode, htmlfile, p
+            check_unicode(htmlfile, p)
         with open(jsonfile) as jsonf:
             try:
                 s = json.load(jsonf)
             except:
                 s = "bad file: " + jsonfile + sys.exc_info()[0]
-        yield check_mf2, htmlfile, p, s
+        check_mf2(htmlfile, p, s)
 
 
 def check_mf2(htmlfile, p, s):
     # TODO ignore extra keys in p that are not in s
-    assert_equal(p, s)
+    assert p == s

From a107263972ac518f0c70d5098f9a5a678fcbfe59 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <ragt.ag>
Date: Sat, 28 Jan 2023 15:20:32 -0800
Subject: [PATCH 024/123] Update html5lib dependency to get tests passing

Fixes #175
---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 8b8b71d..237403c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 # Keep in sync with setup.py's install_requires!
-html5lib==1.0.1
+html5lib==1.1
 pytest==7.2.1
 mock==2.0.0
 lxml==4.9.1
diff --git a/setup.py b/setup.py
index 42e4dca..0202a6a 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@
       url='http://microformats.org/wiki/mf2py',
       install_requires=[
           # Keep in sync with requirements.txt!
-          'html5lib>=1.0.1',
+          'html5lib>=1.1',
           'requests>=2.18.4',
           'BeautifulSoup4>=4.6.0',
       ],

From 78c8f7ff87225df764ff6c16addf2a65d41a982a Mon Sep 17 00:00:00 2001
From: Angelo Gladding <ragt.ag>
Date: Sun, 29 Jan 2023 14:31:17 -0800
Subject: [PATCH 025/123] Deprecate Python 2 support

Resolves #87
---
 .github/workflows/tests.yml  | 14 +++++++----
 dumpout.py                   |  2 --
 mf2py/backcompat.py          |  9 +------
 mf2py/datetime_helpers.py    |  3 +--
 mf2py/dom_helpers.py         | 34 +++++++++-----------------
 mf2py/implied_properties.py  | 25 +++++++-------------
 mf2py/mf2_classes.py         |  4 +---
 mf2py/mf_helpers.py          |  2 +-
 mf2py/parse_property.py      |  8 -------
 mf2py/parser.py              | 46 +++++++++++++-----------------------
 mf2py/value_class_pattern.py |  2 --
 mf2py/version.py             |  2 +-
 setup.py                     |  1 -
 test/test_parser.py          | 13 ++--------
 test/test_suite.py           |  1 -
 15 files changed, 52 insertions(+), 114 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8f524c3..a602b9f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,20 +11,24 @@ jobs:
   build:
     strategy:
       matrix:
-        python_version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "pypy3.7", "pypy3.8", "pypy3.9"]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install libxml2
         run: |
           sudo apt-get update
           sudo apt-get install libxml2 libxml2-dev libxslt1-dev
       - name: Install Python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          pip install -r requirements.txt --user
+          python -m venv env
+          source env/bin/activate
+          pip install -r requirements.txt
       - name: Run tests with pytest
-        run: pytest
+        run: |
+          source env/bin/activate
+          pytest
diff --git a/dumpout.py b/dumpout.py
index 997b528..5e99708 100644
--- a/dumpout.py
+++ b/dumpout.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 from mf2py import Parser
 import os.path
 import glob
diff --git a/mf2py/backcompat.py b/mf2py/backcompat.py
index 38d0d13..9ac3903 100644
--- a/mf2py/backcompat.py
+++ b/mf2py/backcompat.py
@@ -1,4 +1,3 @@
-# coding: utf-8
 """Looks for classic microformats class names and augments them with
 microformats2 names. Ported and adapted from php-mf2.
 
@@ -24,7 +23,6 @@
 
 """
 
-from __future__ import unicode_literals, print_function
 from .dom_helpers import get_children
 from .mf_helpers import unordered_list
 from . import mf2_classes
@@ -33,12 +31,7 @@
 import os
 import codecs
 import json
-
-import sys
-if sys.version < '3':
-    from urllib import unquote
-else:
-    from urllib.parse import unquote
+from urllib.parse import unquote
 
 # Classic map
 _CLASSIC_MAP = {}
diff --git a/mf2py/datetime_helpers.py b/mf2py/datetime_helpers.py
index 95e1093..de6313f 100644
--- a/mf2py/datetime_helpers.py
+++ b/mf2py/datetime_helpers.py
@@ -1,5 +1,4 @@
 '''helper functions to deal wit datetime strings'''
-from __future__ import unicode_literals, print_function
 
 import re
 from datetime import datetime
@@ -47,7 +46,7 @@ def normalize_datetime(dtstr, match=None):
                     hourstr = '00'
 
                 if (ampmstr.startswith('p') or ampmstr.startswith('P')) and hourint < 12:
-                    hourstr = str(hourint + 12)
+                    hourstr = hourint + 12
 
 
             dtstr = '%s%s%s:%s' % (
diff --git a/mf2py/dom_helpers.py b/mf2py/dom_helpers.py
index 3eb1a61..f1c3e72 100644
--- a/mf2py/dom_helpers.py
+++ b/mf2py/dom_helpers.py
@@ -1,21 +1,9 @@
-from __future__ import unicode_literals
-
-import sys
 import bs4
 import re
+from urllib.parse import urljoin
 
 from bs4.element import Tag, NavigableString, Comment
 
-if sys.version < '3':
-    from urlparse import urljoin
-    text_type = unicode
-    binary_type = str
-else:
-    from urllib.parse import urljoin
-    text_type = str
-    binary_type = bytes
-    basestring = str
-
 
 _whitespace_to_space_regex = re.compile(r"[\n\t\r]+")
 _reduce_spaces_regex = re.compile(r" {2,}")
@@ -46,7 +34,7 @@ def get_attr(el, attr, check_name=None):
     """
     if check_name is None:
         return el.get(attr)
-    if isinstance(check_name, basestring) and el.name == check_name:
+    if isinstance(check_name, str) and el.name == check_name:
         return el.get(attr)
     if isinstance(check_name, (tuple, list)) and el.name in check_name:
         return el.get(attr)
@@ -64,11 +52,11 @@ def get_img_src_alt(img, dict_class, img_with_alt, base_url=''):
         src = try_urljoin(base_url, src)
 
         if alt is None or not img_with_alt:
-            return text_type(src)
+            return src
         else:
             return dict_class([
-                                ("value", text_type(src)),
-                                ("alt", text_type(alt))
+                                ("value", src),
+                                ("alt", alt)
                             ])
 
 def get_children(node):
@@ -105,7 +93,7 @@ def text_collection(el, replace_img=False, img_to_src=True, base_url=''):
             items = []
 
         elif isinstance(el, NavigableString):
-            value = text_type(el)
+            value = el
             # replace \t \n \r by space
             value = _whitespace_to_space_regex.sub(' ', value)
             # replace multiple spaces with one space
@@ -123,7 +111,7 @@ def text_collection(el, replace_img=False, img_to_src=True, base_url=''):
                     value = try_urljoin(base_url, value)
 
             if value is not None:
-                items = [' ', text_type(value), ' ']
+                items = [' ', value, ' ']
 
         elif el.name == 'br':
             items = ['\n']
@@ -160,7 +148,7 @@ def text_collection(el, replace_img=False, img_to_src=True, base_url=''):
 
     if results:
         # remove leading whitespace and <int> i.e. next lines
-        while ((isinstance(results[0], basestring) and (results[0] == '' or results[0].isspace())) or
+        while ((isinstance(results[0], str) and (results[0] == '' or results[0].isspace())) or
                results[0] in (P_BREAK_BEFORE, P_BREAK_AFTER)):
             results.pop(0)
             if not results:
@@ -168,7 +156,7 @@ def text_collection(el, replace_img=False, img_to_src=True, base_url=''):
 
     if results:
         # remove trailing whitespace and <int> i.e. next lines
-        while ((isinstance(results[-1], basestring) and (results[-1] == '' or results[-1].isspace())) or
+        while ((isinstance(results[-1], str) and (results[-1] == '' or results[-1].isspace())) or
                results[-1] in (P_BREAK_BEFORE, P_BREAK_AFTER)):
             results.pop(-1)
             if not results:
@@ -176,9 +164,9 @@ def text_collection(el, replace_img=False, img_to_src=True, base_url=''):
 
     # trim leading and trailing non-<pre> whitespace
     if results:
-        if isinstance(results[0], basestring):
+        if isinstance(results[0], str):
             results[0] = results[0].lstrip()
-        if isinstance(results[-1], basestring):
+        if isinstance(results[-1], str):
             results[-1] = results[-1].rstrip()
 
     # create final string by concatenating replacing consecutive sequence of <int> by largest value number of \n
diff --git a/mf2py/implied_properties.py b/mf2py/implied_properties.py
index e963e97..17562d2 100644
--- a/mf2py/implied_properties.py
+++ b/mf2py/implied_properties.py
@@ -1,14 +1,5 @@
-from __future__ import unicode_literals, print_function
 from . import mf2_classes
 from .dom_helpers import get_attr, get_img_src_alt, get_children, get_textContent, try_urljoin
-import sys
-
-if sys.version < '3':
-    text_type = unicode
-    binary_type = str
-else:
-    text_type = str
-    binary_type = bytes
 
 
 def name(el, base_url=''):
@@ -28,12 +19,12 @@ def non_empty(val):
     # if image or area use alt text if not empty
     prop_value = get_attr(el, "alt", check_name=("img", "area"))
     if non_empty(prop_value):
-        return text_type(prop_value)
+        return prop_value
 
     # if abbreviation use the title if not empty
     prop_value = get_attr(el, "title", check_name="abbr")
     if non_empty(prop_value):
-        return text_type(prop_value)
+        return prop_value
 
     # find candidate child or grandchild
     poss_child = None
@@ -60,12 +51,12 @@ def non_empty(val):
         # use alt if possible child is img or area
         prop_value = get_attr(poss_child, "alt", check_name=("img", "area"))
         if non_empty(prop_value):
-            return text_type(prop_value)
+            return prop_value
 
         # use title if possible child is abbr
         prop_value = get_attr(poss_child, "title", check_name="abbr")
         if non_empty(prop_value):
-            return text_type(prop_value)
+            return prop_value
 
     # use text if all else fails
     # replace images with alt but not with src in implied name
@@ -113,7 +104,7 @@ def get_photo_child(children):
     # if element is an object use data if exists
     prop_value = get_attr(el, "data", check_name="object")
     if prop_value is not None:
-        return text_type(prop_value)
+        return prop_value
 
     # find candidate child or grandchild
     poss_child = None
@@ -137,7 +128,7 @@ def get_photo_child(children):
         # object get data
         prop_value = get_attr(poss_child, "data", check_name="object")
         if prop_value is not None:
-            return text_type(prop_value)
+            return prop_value
 
 
 def url(el, base_url=''):
@@ -172,7 +163,7 @@ def get_url_child(children):
     # if element is a <a> or area use its href if exists
     prop_value = get_attr(el, "href", check_name=("a", "area"))
     if prop_value is not None:  # an empty href is valid
-        return text_type(try_urljoin(base_url, prop_value))
+        return try_urljoin(base_url, prop_value)
 
     # find candidate child or grandchild
     poss_child = None
@@ -190,4 +181,4 @@ def get_url_child(children):
     if poss_child is not None:
         prop_value = get_attr(poss_child, "href", check_name=("a", "area"))
         if prop_value is not None:  # an empty href is valid
-            return text_type(try_urljoin(base_url, prop_value))
+            return try_urljoin(base_url, prop_value)
diff --git a/mf2py/mf2_classes.py b/mf2py/mf2_classes.py
index 715c181..49d1de9 100644
--- a/mf2py/mf2_classes.py
+++ b/mf2py/mf2_classes.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals, print_function
-
 import re
 
 _mf2_classes_re = re.compile("(p|e|u|dt|h)-((:?[a-z0-9]+-)?[a-z]+(:?-[a-z]+)*)$")
@@ -29,4 +27,4 @@ def is_property_class(class_):
     return _mf2_properties_re.match(class_)
 
 def has_embedded_class(classes):
-    return any(_mf2_e_properties_re.match(c) for c in classes)
\ No newline at end of file
+    return any(_mf2_e_properties_re.match(c) for c in classes)
diff --git a/mf2py/mf_helpers.py b/mf2py/mf_helpers.py
index 65eeea3..c98ed5e 100644
--- a/mf2py/mf_helpers.py
+++ b/mf2py/mf_helpers.py
@@ -14,7 +14,7 @@ def get_url(mf):
 
     urls = []
     for item in mf:
-        if isinstance(item, basestring):
+        if isinstance(item, str):
             urls.append(item)
         elif (isinstance(item, dict)
               and any(x.startswith('h-') for x in item.get('type', []))):
diff --git a/mf2py/parse_property.py b/mf2py/parse_property.py
index 21731b1..9b7002d 100644
--- a/mf2py/parse_property.py
+++ b/mf2py/parse_property.py
@@ -1,19 +1,11 @@
 """functions to parse the properties of elements"""
-from __future__ import unicode_literals, print_function
 
 from .dom_helpers import get_attr, get_img_src_alt, get_textContent, try_urljoin
 from .datetime_helpers import normalize_datetime, DATETIME_RE, TIME_RE
 from . import value_class_pattern
 
-import sys
 import re
 
-if sys.version < '3':
-    text_type = unicode
-    binary_type = str
-else:
-    text_type = str
-    binary_type = bytes
 
 def text(el, base_url=''):
     """Process p-* properties"""
diff --git a/mf2py/parser.py b/mf2py/parser.py
index c380828..be8c6b5 100644
--- a/mf2py/parser.py
+++ b/mf2py/parser.py
@@ -1,6 +1,3 @@
-# coding: utf-8
-from __future__ import unicode_literals, print_function
-
 from bs4 import BeautifulSoup, FeatureNotFound
 from bs4.element import Tag
 
@@ -12,17 +9,8 @@
 
 import json
 import requests
-import sys
 import copy
-
-if sys.version < '3':
-    from urlparse import urlparse
-    text_type = unicode
-    binary_type = str
-else:
-    from urllib.parse import urlparse
-    text_type = str
-    binary_type = bytes
+from urllib.parse import urlparse
 
 
 def parse(doc=None, url=None, html_parser=None, img_with_alt=False):
@@ -80,7 +68,7 @@ def __init__(self, doc=None, url=None, html_parser=None, img_with_alt=False):
             ('debug', self.dict_class([
                 ('description', self.ua_desc),
                 ('source', self.ua_url),
-                ('version', text_type(__version__))
+                ('version', __version__)
             ]))
         ])
         self.__img_with_alt__ = img_with_alt
@@ -205,18 +193,18 @@ def handle_microformat(root_class_names, el, value_property=None,
 
             # build microformat with type and properties
             microformat = self.dict_class([
-                ("type", [text_type(class_name)
+                ("type", [class_name
                           for class_name in sorted(root_class_names)]),
                 ("properties", properties),
             ])
-            if str(el.name) == "area":
+            if el.name == "area":
                 shape = get_attr(el, 'shape')
                 if shape is not None:
-                    microformat['shape'] = text_type(shape)
+                    microformat['shape'] = shape
 
                 coords = get_attr(el, 'coords')
                 if coords is not None:
-                    microformat['coords'] = text_type(coords)
+                    microformat['coords'] = coords
 
             # insert children if any
             if children:
@@ -236,7 +224,7 @@ def handle_microformat(root_class_names, el, value_property=None,
                     # details: https://github.com/microformats/mf2py/issues/35
                     microformat.update(simple_value)
                 else:
-                    microformat["value"] = text_type(simple_value)
+                    microformat["value"] = simple_value
 
             return microformat
 
@@ -275,7 +263,7 @@ def parse_props(el):
 
                 # if value has not been parsed then parse it
                 if p_value is None:
-                    p_value = text_type(parse_property.text(el, base_url=self.__url__))
+                    p_value = parse_property.text(el, base_url=self.__url__)
 
                 if root_class_names:
                     prop_value.append(handle_microformat(
@@ -303,7 +291,7 @@ def parse_props(el):
                     if isinstance(u_value, self.dict_class):
                         prop_value.append(u_value)
                     else:
-                        prop_value.append(text_type(u_value))
+                        prop_value.append(u_value)
 
             # Parse datetime dt-* properties.
             dt_value = None
@@ -324,10 +312,10 @@ def parse_props(el):
                     stops_implied_name = True
                     prop_value.append(handle_microformat(
                         root_class_names, el,
-                        simple_value=text_type(dt_value), backcompat_mode=backcompat_mode))
+                        simple_value=dt_value, backcompat_mode=backcompat_mode))
                 else:
                     if dt_value is not None:
-                        prop_value.append(text_type(dt_value))
+                        prop_value.append(dt_value)
 
             # Parse embedded markup e-* properties.
             e_value = None
@@ -374,7 +362,7 @@ def parse_props(el):
         def parse_rels(el):
             """Parse an element for rel microformats
             """
-            rel_attrs = [text_type(rel) for rel in get_attr(el, 'rel')]
+            rel_attrs = get_attr(el, 'rel')
             # if rel attributes exist
             if rel_attrs is not None:
                 # find the url and normalise it
@@ -393,7 +381,7 @@ def parse_rels(el):
                     x = get_attr(el, knownattr)
                     # 1st one wins
                     if x is not None and knownattr not in value_dict:
-                        value_dict[knownattr] = text_type(x)
+                        value_dict[knownattr] = x
 
                 self.__parsed__["rel-urls"][url] = value_dict
 
@@ -413,11 +401,11 @@ def parse_rels(el):
                         [r for r in rel_attrs if not r == "alternate"])
                     if x != "":
                         alternate_dict["rel"] = x
-                    alternate_dict["text"] = text_type(el.get_text().strip())
+                    alternate_dict["text"] = el.get_text().strip()
                     for knownattr in ("media", "hreflang", "type", "title"):
                         x = get_attr(el, knownattr)
                         if x is not None:
-                            alternate_dict[knownattr] = text_type(x)
+                            alternate_dict[knownattr] = x
                     alternate_list.append(alternate_dict)
                     self.__parsed__["alternates"] = alternate_list
 
@@ -463,9 +451,9 @@ def parse_el(el, ctx):
         # add actual parser used to debug
         # uses builder.NAME from BeautifulSoup
         if self.__html_parser__:
-            self.__parsed__["debug"]["markup parser"] = text_type(self.__html_parser__)
+            self.__parsed__["debug"]["markup parser"] = self.__html_parser__
         else:
-            self.__parsed__["debug"]["markup parser"] = text_type('unknown')
+            self.__parsed__["debug"]["markup parser"] = 'unknown'
 
     def to_dict(self, filter_by_type=None):
         """Get a dictionary version of the parsed microformat document.
diff --git a/mf2py/value_class_pattern.py b/mf2py/value_class_pattern.py
index 7bc5b21..c30ee71 100644
--- a/mf2py/value_class_pattern.py
+++ b/mf2py/value_class_pattern.py
@@ -1,7 +1,5 @@
 """functions to parse the properties of elements according to the value class pattern http://microformats.org/wiki/value-class-pattern """
 
-from __future__ import unicode_literals, print_function
-
 from .dom_helpers import get_children
 from .datetime_helpers import normalize_datetime, DATETIME_RE, TIME_RE, DATE_RE, TIMEZONE_RE
 
diff --git a/mf2py/version.py b/mf2py/version.py
index cde4178..fc89d55 100644
--- a/mf2py/version.py
+++ b/mf2py/version.py
@@ -1,4 +1,4 @@
 # Define the version number. This class is exec'd by setup.py to read
 # the value without loading mf2py (loading mf2py is bad if its dependencies
 # haven't been installed yet, which is common during setup)
-__version__ = '1.1.2'
+__version__ = '2.0.0'
diff --git a/setup.py b/setup.py
index 0202a6a..2ca0239 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,6 @@
           'Intended Audience :: Developers',
           'License :: OSI Approved :: MIT License',
           'Natural Language :: English',
-          'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
           'Topic :: Text Processing :: Markup :: HTML'
       ])
diff --git a/test/test_parser.py b/test/test_parser.py
index abba569..8b81490 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals, print_function
-
 import os
 import re
 import sys
@@ -12,13 +10,6 @@
 TestCase.maxDiff = None
 
 
-if sys.version < '3':
-    text_type = unicode
-    binary_type = str
-else:
-    text_type = str
-    binary_type = bytes
-
 TEST_DIR = 'test/examples/'
 
 def parse_fixture(path, url=None):
@@ -815,13 +806,13 @@ def get_all_files():
 def assert_unicode_everywhere(obj):
     if isinstance(obj, dict):
         for k, v in obj.items():
-            assert not isinstance(k, binary_type), 'key=%r; type=%r' % (k, type(k))
+            assert not isinstance(k, bytes), 'key=%r; type=%r' % (k, type(k))
             assert_unicode_everywhere(v)
     elif isinstance(obj, list):
         for v in obj:
             assert_unicode_everywhere(v)
 
-    assert not isinstance(obj, binary_type), 'value=%r; type=%r' % (obj, type(obj))
+    assert not isinstance(obj, bytes), 'value=%r; type=%r' % (obj, type(obj))
 
 
 def check_unicode(filename, jsonblob):
diff --git a/test/test_suite.py b/test/test_suite.py
index bd8a7ba..fef0953 100644
--- a/test/test_suite.py
+++ b/test/test_suite.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals, print_function
 import glob
 import json
 import mf2py

From b07418f70ec14aa8afe410453bd12f8296e45c62 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <ragt.ag>
Date: Sun, 29 Jan 2023 23:54:40 -0800
Subject: [PATCH 026/123] Prepare release for 1.1.3

---
 CHANGELOG.md     | 7 +++++++
 mf2py/version.py | 2 +-
 setup.py         | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b78ecc8..2f7d310 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 1.1.3 - 2022-02-
+- reduce instances where photo is implied (#135)
+- always do relative URL resolution (#138)
+- VCP now handles tz offsets without leading zeros (#142)
+- implement id parsing (#143)
+- fix outdated syntax causing SyntaxWarning (#157)
+
 ## 1.1.2 - 2018-08-08
 - add parsing for iframe.u-*[src] (#116)
 - bug fix: reduced implied urls (#117)
diff --git a/mf2py/version.py b/mf2py/version.py
index cde4178..36e1355 100644
--- a/mf2py/version.py
+++ b/mf2py/version.py
@@ -1,4 +1,4 @@
 # Define the version number. This class is exec'd by setup.py to read
 # the value without loading mf2py (loading mf2py is bad if its dependencies
 # haven't been installed yet, which is common during setup)
-__version__ = '1.1.2'
+__version__ = '1.1.3'
diff --git a/setup.py b/setup.py
index ac6277a..13e09cd 100644
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,7 @@
       author='Tom Morris',
       author_email='tom@tommorris.org',
       url='http://microformats.org/wiki/mf2py',
+      python_requires='>=2.7',
       install_requires=[
           # Keep in sync with requirements.txt!
           'html5lib>=1.0.1',

From acf6a6c1be471ac1011e08996d4b67c0149cb30e Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 27 Jun 2023 18:37:15 +0100
Subject: [PATCH 027/123] set up docs via mkdocs

---
 README.md                   | 107 +++++++++------
 doc/source/conf.py          | 260 ------------------------------------
 doc/source/index.rst        |  10 --
 docs/banner.png             | Bin 0 -> 42876 bytes
 docs/changelog.md           | 145 ++++++++++++++++++++
 docs/index.md               |  98 ++++++++++++++
 docs/parser.md              |   5 +
 docs/stylesheets/styles.css |   3 +
 mkdocs.yml                  |  46 +++++++
 9 files changed, 362 insertions(+), 312 deletions(-)
 delete mode 100644 doc/source/conf.py
 delete mode 100644 doc/source/index.rst
 create mode 100644 docs/banner.png
 create mode 100644 docs/changelog.md
 create mode 100644 docs/index.md
 create mode 100644 docs/parser.md
 create mode 100644 docs/stylesheets/styles.css
 create mode 100644 mkdocs.yml

diff --git a/README.md b/README.md
index 96680b1..f7fe0ed 100644
--- a/README.md
+++ b/README.md
@@ -1,78 +1,101 @@
-mf2py
-=====
+![mf2py banner](banner.png)
 
-Python parser for [microformats 2](http://microformats.org/wiki/Microformats2).
+[![version](https://badge.fury.io/py/mf2py.svg?)](https://badge.fury.io/py/mf2py)
+[![downloads](https://img.shields.io/pypi/dm/mf2py)](https://pypistats.org/packages/mf2py)
+[![license](https://img.shields.io/pypi/l/mf2py?)](https://github.com/microformats/mf2py/blob/main/LICENSE)
+[![python-version](https://img.shields.io/pypi/pyversions/mf2py)](https://badge.fury.io/py/mf2py)
 
-Current status: Full-featured and mostly stable. Implements the full
-mf2 spec, including backward compatibility with microformats1.
+## Welcome 👋
 
-Documentation, code tidying and so on is rather lacking.    
+`mf2py` is a full-featured microformats2 (mf2) parser implemented in Python.
 
-License: [MIT](http://opensource.org/licenses/mit-license.php)
+mf2py implements the full mf2 specification, including backward compatibility with microformats1.
 
-Install
--------
+## Installation 💻
 
-`pip install mf2py`
+To install `mf2py`, run the following command:
 
-Usage
------
+```bash
+pip install mf2py
+```
 
-Import the parser using
+## Quickstart 🚀
 
-    import mf2py
+Import the parser using:
 
-Parse a file containing the content
+```python
+import mf2py
+```
 
-    with open('file/content.html','r') as file:
-        obj = mf2py.parse(doc=file)
+### Parse a File
 
-Parse string containing content
+Parse a file containing HTML:
 
-    content = '<article class="h-entry"><h1 class="p-name">Hello</h1></article>'
-    obj = mf2py.parse(doc=content)
+```python
+with open('file/content.html','r') as file:
+    obj = mf2py.parse(doc=file)
+```
 
-Parse content from a URL
+### Parse a String
 
-    obj = mf2py.parse(url="http://tommorris.org/")
+Parse string containing HTML content:
+
+```python
+content = '<article class="h-entry"><h1 class="p-name">Hello</h1></article>'
+obj = mf2py.parse(doc=content)
+```
+
+### Parse a HTML Document Retrieved from a URL
+
+Parse content from a URL:
+
+```python
+obj = mf2py.parse(url="http://tommorris.org/")
+```
 
 `parse` is a convenience method that actually delegates to
 `mf2py.Parser` to do the real work. More sophisticated behaviors are
 available by invoking the object directly.
 
-Get parsed microformat in a variety of formats
+### Format Options
+
+Retrieve parsed microformats as a Python dictionary or JSON string:
 
-    p = mf2py.Parser(...)
-    p.to_dict()  # returns a python dictionary
-    p.to_json()  # returns a JSON string
+```python
+p = mf2py.Parser(...)
+p.to_dict()  # returns a python dictionary
+p.to_json()  # returns a JSON string
+```
 
-Filter by microformat type
+### Filter by Microformat Type
 
-    p.to_dict(filter_by_type="h-entry")
-    p.to_json(filter_by_type="h-entry")
+Filter by microformat type:
 
-Experimental features
----------------------
-- pass the optional argument `img_with_alt=True` to either the `Parser` object or to the `parse` method to enable parsing of the `alt` attribute of `<img>` tags according to [issue: image alt text is lost during parsing](https://github.com/microformats/microformats2-parsing/issues/2). By default this is `False` to be backwards compatible.
+```python
+p.to_dict(filter_by_type="h-entry")
+p.to_json(filter_by_type="h-entry")
+```
 
-FAQ
----
+## Experimental Features 🧪
+
+- Pass the optional argument `img_with_alt=True` to either the `Parser` object or to the `parse` method to enable parsing of the `alt` attribute of `<img>` tags according to [issue: image alt text is lost during parsing](https://github.com/microformats/microformats2-parsing/issues/2). By default this is `False` to be backwards compatible.
+
+## FAQs ❓
 
 * I passed `mf2py.parse()` a BeautifulSoup document, and it got modified!
 
 Yes, mf2py currently does that. We're working on preventing it! Hopefully soon.
 
-Frontends
--------------
+## Testing Environments 🌐
 
-A basic web interface for mf2py and [mf2util](https://github.com/kylewm/mf2util) is available at [mf2py-web](https://github.com/kylewm/mf2py-web).
+A hosted live version of mf2py can be found at [python.microformats.io](https://python.microformats.io).
 
-A hosted live version can be found at [python.microformats.io](https://python.microformats.io).
-
-Contributions
--------------
+## Contributing 🛠️
 
 We welcome contributions and bug reports via Github, and on the microformats wiki.
 
-We try to follow the [IndieWebCamp code of conduct](http://indiewebcamp.com/code-of-conduct). Please be respectful of other contributors, and forge a spirit of positive co-operation without discrimination or disrespect.
+We to follow the [IndieWebCamp code of conduct](http://indiewebcamp.com/code-of-conduct). Please be respectful of other contributors, and forge a spirit of positive co-operation without discrimination or disrespect.
+
+## License 🧑‍⚖️
 
+`mf2py` is licensed under an MIT License.
\ No newline at end of file
diff --git a/doc/source/conf.py b/doc/source/conf.py
deleted file mode 100644
index 82b8c4d..0000000
--- a/doc/source/conf.py
+++ /dev/null
@@ -1,260 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# mf2py documentation build configuration file, created by
-# sphinx-quickstart on Sun Jan 18 09:39:25 2015.
-#
-# This file is execfile()d with the current directory set to its
-# containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys
-import os
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-
-# -- General configuration ------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = [
-    'sphinx.ext.autodoc',
-]
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = u'mf2py'
-copyright = u'2015, Tom Morris'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '0.2.1'
-# The full version, including alpha/beta/rc tags.
-release = '0.2.1'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = []
-
-# The reST default role (used for this markup: `text`) to use for all
-# documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-# If true, keep warnings as "system message" paragraphs in the built documents.
-#keep_warnings = False
-
-
-# -- Options for HTML output ----------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-html_theme = 'default'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-# Add any extra paths that contain custom files (such as robots.txt or
-# .htaccess) here, relative to this directory. These files are copied
-# directly to the root of the documentation.
-#html_extra_path = []
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'mf2pydoc'
-
-
-# -- Options for LaTeX output ---------------------------------------------
-
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-#  author, documentclass [howto, manual, or own class]).
-latex_documents = [
-  ('index', 'mf2py.tex', u'mf2py Documentation',
-   u'Tom Morris', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output ---------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('index', 'mf2py', u'mf2py Documentation',
-     [u'Tom Morris'], 1)
-]
-
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-
-# -- Options for Texinfo output -------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-  ('index', 'mf2py', u'mf2py Documentation',
-   u'Tom Morris', 'mf2py', 'One line description of project.',
-   'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
-
-# If true, do not generate a @detailmenu in the "Top" node's menu.
-#texinfo_no_detailmenu = False
diff --git a/doc/source/index.rst b/doc/source/index.rst
deleted file mode 100644
index 24146cc..0000000
--- a/doc/source/index.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. mf2py documentation master file, created by
-   sphinx-quickstart on Sun Jan 18 09:39:25 2015.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-mf2py API reference
-=================================
-
-.. automodule:: mf2py
-   :members:
diff --git a/docs/banner.png b/docs/banner.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2f93141ee7a873c3ef98c419f6c65f7620f298e
GIT binary patch
literal 42876
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%0A0PS2qbKAKVMdP(b1Ry$H9p-<5
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
C%H&J{

literal 0
HcmV?d00001

diff --git a/docs/changelog.md b/docs/changelog.md
new file mode 100644
index 0000000..b78ecc8
--- /dev/null
+++ b/docs/changelog.md
@@ -0,0 +1,145 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+## 1.1.2 - 2018-08-08
+- add parsing for iframe.u-*[src] (#116)
+- bug fix: reduced implied urls (#117)
+- bug fix: don't collapse whitespace between tags
+- specify explicit versions for dependencies
+- revert BeautifulSoup copying added in 1.1.1 due to bugs (eg #108)
+- misc performance improvements
+
+## 1.1.1 - 2018-06-15
+
+- streamline backcompat to use JSON only.
+- fix multiple mf1 root rel-tag parsing 
+- correct url and photo for hreview.
+- add rules for nested hreview. update backcompat to use multiple matches in old properties.
+- fix `rel-tag` to `p-category` conversion so that other classes are not lost.
+- use original authored html for `e-*` parsing in backcompat
+- make classes and rels into unordered (alphabetically ordered) deduped arrays.
+- only use class names for mf2 which follow the naming rules
+- fix `parse` method to use default html parser.
+- always use the first value for attributes for rels.
+- correct AM/PM conversion in datetime value class pattern.
+ - add ordinal date parsing to datetimes value class pattern. ordinal date is normalised to YYYY-MM-DD
+- remove hack for html tag classes since that is fixed in new BS
+- better whitespace algorithm for `name` and `html.value` parsing
+- experimental flag for including `alt` in `u-photo` parsing
+- make a copy of the BeautifulSoup given by user to work on for parsing to prevent changes to original doc
+- bump version to 1.1.1 
+
+## 1.1.0 - 2018-03-16
+
+- bump version to 1.1.0 since it is a "major" change 
+- added tests for new implied name rules
+- modified earlier tests to accommodate new rules
+- use space separator instead of "T"
+- Don't add "00" seconds unless authored
+- use TZ authored in separate `value` element
+- only use first found `value` of a particular type `date`, `time`, or `timezone`.
+- move backcompat rules into JSON files
+- reorganise value class pattern parsing into new files
+- add datetime_helpers to organise datetime parsing rules
+- reorganise tests
+- remove Heroku frontend, point to mf2py-web and python.microformats.io instead in README.
+- remove Flask and gunicorn requirements
+- add debug info with description, version, url and the html parser used 
+
+## 1.0.6 - 2018-03-04
+
+- strip leading/trailing white space for `e-*[html]`. update the corresponding tests
+- blank values explicitly authored are allowed as property values 
+- include `alt` or `src` from `<img>` in parsing for `p-*` and `e-*[value]`
+- parse `title` from `<link>` for `p-*` resolves #84 
+- and `poster` from `<video>` for `u-*` resolves #76 
+- use `html5lib` as default parser
+- use the final redirect URL resolves #62 
+- update requirements to use BS4 v4.6.0 and html5lib v1.0.1
+- drop support for Python 2.6 as html5lib dropped support
+
+## 1.0.5 - 2016-05-09
+
+- Implied property checks now ignore alt="", treating it the same as
+  if no alt value is defined.
+- Support for using a custom dict implementation by setting
+  mf2py.Parser.dict_class. collections.OrderedDict yields much nicer
+  output for hosted parsers.
+
+## 1.0.4 - 2016-03-21
+### Changed
+- Performance improvement changing simple calls to soup.find_all to
+  a manual iteration over .contents.
+
+## 1.0.3 - 2016-02-05
+### Changed
+- Performance improvement by limiting number of calls to soup.find_all
+  in backcompat module. Should not be any functional changes.
+
+## 1.0.2 - 2016-01-26
+### Added
+- Backward compatibility parsing for rel=tag properties. These are now converted
+  to p-category based on the last path segment of the tag URI as spec'd in
+  http://microformats.org/wiki/h-entry#Parser_Compatibility
+- Optional property html_parser to specify the html parser that BeautifulSoup
+  should use (e.g., "lxml" or "html5lib")
+
+## 1.0.1 - 2015-12-11
+### Changed
+- `u-*` properties are now parsed from `<link>` elements per the updated spec
+  http://microformats.org/wiki/microformats2-parsing-issues#link_elements_and_u-_parsing
+
+## 1.0.0 - 2015-10-05
+### Changed
+- Version number bumped to 1.0.0 following community discussion.
+
+## 0.2.8 - 2015-09-21
+### Changed
+- Stricter checks that Parser.__init__ params are actually None before
+  ignoring them.
+
+## 0.2.7 - 2015-08-03
+### Changed
+- Now produces unicode strings for every key and value, no more byte
+  strings anywhere.
+- Do not add 'T' between date and time when normalizing dates
+### Added
+- Unit tests for running the microformats test suite
+
+## 0.2.6 - 2015-05-06
+### Added
+- New top-level "rel-urls" entry, contains rich data parsed from rel
+  links, organized by URL.
+
+## 0.2.5 - 2015-03-01
+### Added
+- convenience method `mf2py.parse` that takes the same arguments as Parser
+  and returns a dict.
+### Changed
+- nested h-* classes now parse their "value" based on the property
+  they represent (p-*, u-*, dt-*), so for example "p-in-reply-to
+  h-cite" would have a name as its value and "u-in-reply-to h-cite"
+  will have a URL.
+
+## 0.2.4 - 2015-02-13
+### Added
+- Add rel=bookmark to backward compat parsing rules based (translated
+  to u-url in mf2)
+### Changed
+- Parser constructor now takes explicit named arguments instead of
+  **kwargs, for saner behavior when called with unnamed arguments.
+- Bugfix: Empty href="" attributes are now properly interpreted as
+  the current document's URL.
+
+## 0.2.3 - 2015-02-07
+### Changed
+- Minor Py3 compatibility fix
+- Correct typo `test_requires` -> `tests_require` in setup.py
+
+## 0.2.2 - 2015-02-05
+### Changed
+- Started keeping a changelog!
+- Use a better method for extracting HTML for an e-* property
+- Correct BeautifulSoup4 dependency in setup.py to fix error with
+  installation from PyPI.
+- Buffed up docstrings for public methods.
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 0000000..63b7b65
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,98 @@
+# Home
+
+![mf2py banner](banner.png)
+
+## Welcome 👋
+
+`mf2py` is a full-featured microformats2 (mf2) parser implemented in Python.
+
+mf2py implements the full mf2 specification, including backward compatibility with microformats1.
+
+## Installation 💻
+
+To install `mf2py`, run the following command:
+
+```bash
+pip install mf2py
+```
+
+## Quickstart 🚀
+
+Import the parser using:
+
+```python
+import mf2py
+```
+
+### Parse a File
+
+Parse a file containing HTML:
+
+```python
+with open('file/content.html','r') as file:
+    obj = mf2py.parse(doc=file)
+```
+
+### Parse a String
+
+Parse string containing HTML content:
+
+```python
+content = '<article class="h-entry"><h1 class="p-name">Hello</h1></article>'
+obj = mf2py.parse(doc=content)
+```
+
+### Parse a HTML Document Retrieved from a URL
+
+Parse content from a URL:
+
+```python
+obj = mf2py.parse(url="http://tommorris.org/")
+```
+
+`parse` is a convenience method that actually delegates to
+`mf2py.Parser` to do the real work. More sophisticated behaviors are
+available by invoking the object directly.
+
+### Format Options
+
+Retrieve parsed microformats as a Python dictionary or JSON string:
+
+```python
+p = mf2py.Parser(...)
+p.to_dict()  # returns a python dictionary
+p.to_json()  # returns a JSON string
+```
+
+### Filter by Microformat Type
+
+Filter by microformat type:
+
+```python
+p.to_dict(filter_by_type="h-entry")
+p.to_json(filter_by_type="h-entry")
+```
+
+## Experimental Features 🧪
+
+- Pass the optional argument `img_with_alt=True` to either the `Parser` object or to the `parse` method to enable parsing of the `alt` attribute of `<img>` tags according to [issue: image alt text is lost during parsing](https://github.com/microformats/microformats2-parsing/issues/2). By default this is `False` to be backwards compatible.
+
+## FAQs ❓
+
+* I passed `mf2py.parse()` a BeautifulSoup document, and it got modified!
+
+Yes, mf2py currently does that. We're working on preventing it! Hopefully soon.
+
+## Testing Environments 🌐
+
+A hosted live version of mf2py can be found at [python.microformats.io](https://python.microformats.io).
+
+## Contributing 🛠️
+
+We welcome contributions and bug reports via Github, and on the microformats wiki.
+
+We to follow the [IndieWebCamp code of conduct](http://indiewebcamp.com/code-of-conduct). Please be respectful of other contributors, and forge a spirit of positive co-operation without discrimination or disrespect.
+
+## License 🧑‍⚖️
+
+`mf2py` is licensed under an MIT License.
\ No newline at end of file
diff --git a/docs/parser.md b/docs/parser.md
new file mode 100644
index 0000000..51e78df
--- /dev/null
+++ b/docs/parser.md
@@ -0,0 +1,5 @@
+# Parse a Document
+
+## Parser
+
+:::mf2py.Parser
\ No newline at end of file
diff --git a/docs/stylesheets/styles.css b/docs/stylesheets/styles.css
new file mode 100644
index 0000000..5e2a553
--- /dev/null
+++ b/docs/stylesheets/styles.css
@@ -0,0 +1,3 @@
+:root {
+    --md-primary-fg-color:        #6CA300;
+}
\ No newline at end of file
diff --git a/mkdocs.yml b/mkdocs.yml
new file mode 100644
index 0000000..55e4c54
--- /dev/null
+++ b/mkdocs.yml
@@ -0,0 +1,46 @@
+site_name: mf2py
+site_url: https://microformats.github.io/mf2py
+site_author: Microformats
+site_description: A microformats2 parser written in Python.
+repo_name: microformats/mf2py
+repo_url: https://github.com/microformats/mf2py
+edit_uri: https://github.com/microformats/mf2py/tree/main/docs
+copyright: MIT License
+
+extra_css:
+  - stylesheets/styles.css
+
+nav:
+  - Home: index.md
+  - Parse a Document: parser.md
+  - Changelog: changelog.md
+
+theme:
+  name: 'material'
+  logo: https://microformats.org/microformats-logo.png
+  favicon: https://microformats.org/microformats-logo.png
+  palette:
+    # Palette for light mode
+    - scheme: default
+      primary: 'custom'
+      toggle:
+        icon: material/brightness-7
+        name: Switch to dark mode
+  font:
+    text: Roboto
+    code: Roboto Mono
+
+plugins:
+  - mkdocstrings
+  - search
+
+markdown_extensions:
+  - admonition
+  - pymdownx.details
+  - pymdownx.superfences
+  - attr_list
+  - md_in_html
+  - pymdownx.tabbed:
+      alternate_style: true
+  - toc:
+      permalink: true
\ No newline at end of file

From d44a83557e67fa6463d8983c70cbbc683c4f1e94 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 27 Jun 2023 18:54:31 +0100
Subject: [PATCH 028/123] enable img_with_alt by default

---
 mf2py/parser.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mf2py/parser.py b/mf2py/parser.py
index c380828..54fb780 100644
--- a/mf2py/parser.py
+++ b/mf2py/parser.py
@@ -69,7 +69,7 @@ class Parser(object):
 
     dict_class = dict
 
-    def __init__(self, doc=None, url=None, html_parser=None, img_with_alt=False):
+    def __init__(self, doc=None, url=None, html_parser=None, img_with_alt=True):
         self.__url__ = None
         self.__doc__ = None
         self._preserve_doc = False

From 3d5740601a01445ba40a6dd5aa74f15cf7b92c2b Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 27 Jun 2023 20:51:06 +0100
Subject: [PATCH 029/123] bump checkout and setup-python actions

---
 .github/workflows/tests.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8f524c3..27e3d76 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,17 +14,19 @@ jobs:
         python_version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+        with:
+          python-version: ${{ matrix.python-version }}
       - name: Install libxml2
         run: |
           sudo apt-get update
           sudo apt-get install libxml2 libxml2-dev libxslt1-dev
       - name: Install Python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
           pip install -r requirements.txt --user
       - name: Run tests with pytest
-        run: pytest
+        run: pytest
\ No newline at end of file

From a6dddb72849bf84722803ce9198a5968b3be0ea7 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 27 Jun 2023 20:53:35 +0100
Subject: [PATCH 030/123] fix dash

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 27e3d76..f66de19 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     strategy:
       matrix:
-        python_version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"]
+        python-version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

From 5531ce88cc71bfa02a45ccdd4ca44824e48c2103 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 27 Jun 2023 20:56:00 +0100
Subject: [PATCH 031/123] change python versions

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f66de19..b1b8719 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     strategy:
       matrix:
-        python-version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"]
+        python-version: ["2.7", "3.6.7", "3.7", "3.8", "3.9", "3.10"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

From f224f65a603eb85ad3f09e6e984066764caf5012 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 27 Jun 2023 21:01:17 +0100
Subject: [PATCH 032/123] update runs-on to work with ubuntu-20.04

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b1b8719..ce48ca8 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["2.7", "3.6.7", "3.7", "3.8", "3.9", "3.10"]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
         with:

From 3f2b8ddc8502bed3b452a0b9a266d72f302513f3 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 27 Jun 2023 21:02:31 +0100
Subject: [PATCH 033/123] remove 2.7 support in tests

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ce48ca8..b759a05 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     strategy:
       matrix:
-        python-version: ["2.7", "3.6.7", "3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.6.7", "3.7", "3.8", "3.9", "3.10"]
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3

From 44f3551f582580f2eb258a1f4d85e77a5f3f657d Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 27 Jun 2023 21:03:45 +0100
Subject: [PATCH 034/123] remove 3.6.7 support in tests

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b759a05..23c13ba 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     strategy:
       matrix:
-        python-version: ["3.6.7", "3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3

From f126d1558c195b1ae62895a55aea56950c273653 Mon Sep 17 00:00:00 2001
From: James <37276661+capjamesg@users.noreply.github.com>
Date: Wed, 28 Jun 2023 10:19:33 +0100
Subject: [PATCH 035/123] update banner.png link

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f7fe0ed..bd765bd 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![mf2py banner](banner.png)
+![mf2py banner](http://microformats.github.io/mf2py/banner.png)
 
 [![version](https://badge.fury.io/py/mf2py.svg?)](https://badge.fury.io/py/mf2py)
 [![downloads](https://img.shields.io/pypi/dm/mf2py)](https://pypistats.org/packages/mf2py)
@@ -98,4 +98,4 @@ We to follow the [IndieWebCamp code of conduct](http://indiewebcamp.com/code-of-
 
 ## License 🧑‍⚖️
 
-`mf2py` is licensed under an MIT License.
\ No newline at end of file
+`mf2py` is licensed under an MIT License.

From 8ed842994e3661d70826c6709e70106ca12efbd3 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Wed, 28 Jun 2023 21:44:01 +0100
Subject: [PATCH 036/123] add dates to changelog entries

---
 CHANGELOG.md      | 2 +-
 docs/changelog.md | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f7d310..d7f6c2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## 1.1.3 - 2022-02-
+## 1.1.3 - 2022-06-28
 - reduce instances where photo is implied (#135)
 - always do relative URL resolution (#138)
 - VCP now handles tz offsets without leading zeros (#142)
diff --git a/docs/changelog.md b/docs/changelog.md
index b78ecc8..d7f6c2e 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,6 +1,13 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 1.1.3 - 2022-06-28
+- reduce instances where photo is implied (#135)
+- always do relative URL resolution (#138)
+- VCP now handles tz offsets without leading zeros (#142)
+- implement id parsing (#143)
+- fix outdated syntax causing SyntaxWarning (#157)
+
 ## 1.1.2 - 2018-08-08
 - add parsing for iframe.u-*[src] (#116)
 - bug fix: reduced implied urls (#117)

From 3926b04170d88bd1f30d9308d5daae22710c35d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 20:46:04 +0000
Subject: [PATCH 037/123] Bump requests from 2.21.0 to 2.31.0

Bumps [requests](https://github.com/psf/requests) from 2.21.0 to 2.31.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.21.0...v2.31.0)

---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 237403c..0b576ea 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,6 +3,6 @@ html5lib==1.1
 pytest==7.2.1
 mock==2.0.0
 lxml==4.9.1
-requests==2.21.0
+requests==2.31.0
 BeautifulSoup4==4.6.3
 -e .

From ca51d6d51c7f827d93eec87ba69efb5afe623723 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Wed, 28 Jun 2023 13:57:40 -0700
Subject: [PATCH 038/123] Correct release date in CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7f6c2e..8f401ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## 1.1.3 - 2022-06-28
+## 1.1.3 - 2023-06-28
 - reduce instances where photo is implied (#135)
 - always do relative URL resolution (#138)
 - VCP now handles tz offsets without leading zeros (#142)

From aac1adf29638e483d46bcfe311ca66678b03c84b Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Wed, 28 Jun 2023 16:44:31 -0700
Subject: [PATCH 039/123] Use poetry for dependency management

---
 .github/workflows/tests.yml | 22 +++++++++++---------
 .gitignore                  |  1 +
 mf2py/version.py            |  4 +++-
 pyproject.toml              | 27 ++++++++++++++++++++++++
 requirements.txt            |  8 --------
 setup.py                    | 41 -------------------------------------
 6 files changed, 43 insertions(+), 60 deletions(-)
 create mode 100644 pyproject.toml
 delete mode 100644 requirements.txt
 delete mode 100644 setup.py

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a84132b..6647c24 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,8 +11,8 @@ jobs:
   build:
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
-    runs-on: ubuntu-20.04
+        python-version: ["3.7", "3.8", "3.9", "3.10", "pypy3.8", "pypy3.9"]
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
@@ -25,12 +25,14 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          version: 1.2.2
+          virtualenvs-in-project: true
       - name: Install dependencies
-        run: |
-          python -m venv env
-          source env/bin/activate
-          pip install -r requirements.txt
-      - name: Run tests with pytest
-        run: |
-          source env/bin/activate
-          pytest
\ No newline at end of file
+        run: poetry install --no-interaction --no-root
+      - name: Install library
+        run: poetry install --no-interaction
+      - name: Run tests
+        run: poetry run pytest
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 7f90a96..717d41c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ mf2py.egg-info/
 nbproject/
 venv/
 *~
+poetry.lock
\ No newline at end of file
diff --git a/mf2py/version.py b/mf2py/version.py
index c382fd6..ea79e13 100644
--- a/mf2py/version.py
+++ b/mf2py/version.py
@@ -2,4 +2,6 @@
 # the value without loading mf2py (loading mf2py is bad if its dependencies
 # haven't been installed yet, which is common during setup)
 
-__version__ = '2.0.0'
+import importlib.metadata
+
+__version__ = importlib.metadata.metadata("microformats")["Version"]
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..cc2436c
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,27 @@
+[tool.poetry]
+name = "mf2py"
+version = "1.1.3"
+description = "Microformats parser"
+authors = ["Tom Morris <tom@tommorris.org>"]
+license = "MIT"
+classifiers = [
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python :: 3",
+    "Topic :: Text Processing :: Markup :: HTML"
+]
+
+[tool.poetry.dependencies]
+python = ">=3.7"
+html5lib = "^1.1"
+requests = "^2.28.2"
+beautifulsoup4 = "^4.11.1"
+
+[tool.poetry.group.dev.dependencies]
+lxml = "^4.9.2"
+mock = "^5.0.1"
+pytest = "^7.2.1"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 0b576ea..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Keep in sync with setup.py's install_requires!
-html5lib==1.1
-pytest==7.2.1
-mock==2.0.0
-lxml==4.9.1
-requests==2.31.0
-BeautifulSoup4==4.6.3
--e .
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 0373389..0000000
--- a/setup.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env python
-
-from setuptools import setup
-import os.path
-
-ns = {}
-with open(os.path.join(os.path.dirname(__file__), 'mf2py/version.py'))\
-        as version_file:
-    exec(version_file.read(), ns)
-
-
-setup(name='mf2py',
-      version=ns['__version__'],
-      description='Python Microformats2 parser',
-      long_description=open('README.md').read(),
-      long_description_content_type='text/markdown',
-      author='Tom Morris',
-      author_email='tom@tommorris.org',
-      url='http://microformats.org/wiki/mf2py',
-      python_requires='>=2.7',
-      install_requires=[
-          # Keep in sync with requirements.txt!
-          'html5lib>=1.1',
-          'requests>=2.18.4',
-          'BeautifulSoup4>=4.6.0',
-      ],
-      tests_require=[
-          'lxml',
-          'mock',
-          'pytest',
-      ],
-      packages=['mf2py'],
-      package_data={'mf2py': ['backcompat-rules/*.json']},
-      classifiers=[
-          'Development Status :: 4 - Beta',
-          'Intended Audience :: Developers',
-          'License :: OSI Approved :: MIT License',
-          'Natural Language :: English',
-          'Programming Language :: Python :: 3',
-          'Topic :: Text Processing :: Markup :: HTML'
-      ])

From 34fbf8a40d989470283d2e486ad10b2797fb82ca Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Wed, 28 Jun 2023 16:48:39 -0700
Subject: [PATCH 040/123] Fix typo in version.py

---
 mf2py/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mf2py/version.py b/mf2py/version.py
index ea79e13..4adb557 100644
--- a/mf2py/version.py
+++ b/mf2py/version.py
@@ -4,4 +4,4 @@
 
 import importlib.metadata
 
-__version__ = importlib.metadata.metadata("microformats")["Version"]
\ No newline at end of file
+__version__ = importlib.metadata.metadata("mf2py")["Version"]

From 57f34c984ac7cdb8f82131fa5d6c9ee8713028b1 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Wed, 28 Jun 2023 17:10:41 -0700
Subject: [PATCH 041/123] Update tests to include alt texts by default

---
 test/test_parser.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/test_parser.py b/test/test_parser.py
index 8b81490..96f8d40 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -441,9 +441,9 @@ def test_stop_implied_url():
 
 def test_implied_nested_photo():
     result = parse_fixture("implied_properties/implied_properties.html", url="http://bar.org")
-    assert result["items"][2]["properties"]["photo"][0] == "http://tommorris.org/photo.png"
+    assert result["items"][2]["properties"]["photo"][0] == {"alt": "", "value": "http://tommorris.org/photo.png"}
     assert result["items"][3]["properties"]["photo"][0] == "http://tommorris.org/photo.png"
-    assert result["items"][4]["properties"]["photo"][0] == "http://tommorris.org/photo.png"
+    assert result["items"][4]["properties"]["photo"][0] == {"alt": "Tom Morris", "value": "http://tommorris.org/photo.png"}
     # src="" is relative to the base url
     assert result["items"][6]["properties"]["photo"][0] == "http://bar.org"
 
@@ -471,7 +471,7 @@ def test_implied_name_empty_alt():
         'properties': {
             'name': ['@kylewmahan'],
             'url': ['https://twitter.com/kylewmahan'],
-            'photo': ['https://example.org/test.jpg'],
+            'photo': [{'alt': '', 'value': 'https://example.org/test.jpg'}],
         },
     } == hcard
 
@@ -513,7 +513,7 @@ def test_implied_name_alt():
     assert result["items"][0]["children"][0] == \
                  {'type': ['h-card'],
                   'properties': {'name': ['Avatar of Stephen'],
-                                 'photo': ['avatar.jpg']}}
+                                 'photo': [{'alt': 'Avatar of', 'value': 'avatar.jpg'}]}}
 
 
 def test_value_name_whitespace():

From b81dc2c19789f9833890b1aca0310a9a731ceee2 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Wed, 28 Jun 2023 17:20:08 -0700
Subject: [PATCH 042/123] Update additional tests

---
 test/test_parser.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test_parser.py b/test/test_parser.py
index 96f8d40..9c74b0d 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -455,7 +455,7 @@ def test_implied_nested_photo_alt_name():
 
 def test_implied_image():
     result = parse_fixture("implied_properties/implied_properties.html")
-    assert result["items"][4]["properties"]["photo"][0] == "http://tommorris.org/photo.png"
+    assert result["items"][4]["properties"]["photo"][0] == {"alt": "Tom Morris", "value": "http://tommorris.org/photo.png"}
     assert result["items"][4]["properties"]["name"][0] == "Tom Morris"
 
 def test_implied_name_empty_alt():
@@ -741,7 +741,7 @@ def test_photo_with_alt():
     assert '/photo.jpg' == result['items'][0]['properties']['photo'][0]
     assert '/photo.jpg' == exp_result['items'][0]['properties']['photo'][0]
 
-    assert '/photo.jpg' == result['items'][1]['properties']['url'][0]
+    assert {'alt': 'alt text', 'value': '/photo.jpg'} == result['items'][1]['properties']['url'][0]
     assert '/photo.jpg' == exp_result['items'][1]['properties']['url'][0]['value']
     assert 'alt text' == exp_result['items'][1]['properties']['url'][0]['alt']
 

From 92219c5bb28efda578befde286ee1484f8b480b1 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <ragt.ag>
Date: Wed, 28 Jun 2023 17:40:51 -0700
Subject: [PATCH 043/123] Update last of tests

---
 test/test_parser.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/test_parser.py b/test/test_parser.py
index 9c74b0d..9115267 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -745,7 +745,7 @@ def test_photo_with_alt():
     assert '/photo.jpg' == exp_result['items'][1]['properties']['url'][0]['value']
     assert 'alt text' == exp_result['items'][1]['properties']['url'][0]['alt']
 
-    assert '/photo.jpg' == result['items'][2]['properties']['in-reply-to'][0]
+    assert {'alt': '', 'value': '/photo.jpg'} == result['items'][2]['properties']['in-reply-to'][0]
     assert '/photo.jpg' == exp_result['items'][2]['properties']['in-reply-to'][0]['value']
     assert '' == exp_result['items'][2]['properties']['in-reply-to'][0]['alt']
 
@@ -761,9 +761,9 @@ def test_photo_with_alt():
     assert 'alt' not in exp_result['items'][3]['properties']['in-reply-to'][0]
 
     assert 'h-cite' in result['items'][4]['properties']['in-reply-to'][0]['type']
-    assert '/photo.jpg' == result['items'][4]['properties']['in-reply-to'][0]['properties']['photo'][0]
+    assert {'alt': 'alt text', 'value': '/photo.jpg'} == result['items'][4]['properties']['in-reply-to'][0]['properties']['photo'][0]
     assert '/photo.jpg' == result['items'][4]['properties']['in-reply-to'][0]['value']
-    assert 'alt' not in result['items'][4]['properties']['in-reply-to'][0]
+    assert 'alt' in result['items'][4]['properties']['in-reply-to'][0]
 
     assert 'h-cite' in exp_result['items'][4]['properties']['in-reply-to'][0]['type']
     assert '/photo.jpg' == exp_result['items'][4]['properties']['in-reply-to'][0]['properties']['photo'][0]['value']
@@ -772,9 +772,9 @@ def test_photo_with_alt():
     assert 'alt text' == exp_result['items'][4]['properties']['in-reply-to'][0]['alt']
 
     assert 'h-cite' in result['items'][5]['properties']['in-reply-to'][0]['type']
-    assert '/photo.jpg' == result['items'][5]['properties']['in-reply-to'][0]['properties']['photo'][0]
+    assert {'alt': '', 'value': '/photo.jpg'} == result['items'][5]['properties']['in-reply-to'][0]['properties']['photo'][0]
     assert '/photo.jpg' == result['items'][5]['properties']['in-reply-to'][0]['value']
-    assert 'alt' not in result['items'][5]['properties']['in-reply-to'][0]
+    assert 'alt' in result['items'][5]['properties']['in-reply-to'][0]
 
     assert 'h-cite' in exp_result['items'][5]['properties']['in-reply-to'][0]['type']
     assert '/photo.jpg' == exp_result['items'][5]['properties']['in-reply-to'][0]['properties']['photo'][0]['value']

From 5fb5b491d1e79004cb6bd3c03884e47167d33610 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Wed, 28 Jun 2023 18:01:43 -0700
Subject: [PATCH 044/123] Drop 3.7 as `importlib.metadata` appears in 3.8

Python 3.7 hit EOL yesterday (2023-06-27).
---
 .github/workflows/tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 6647c24..f07171d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "pypy3.8", "pypy3.9"]
+        python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -35,4 +35,4 @@ jobs:
       - name: Install library
         run: poetry install --no-interaction
       - name: Run tests
-        run: poetry run pytest
\ No newline at end of file
+        run: poetry run pytest

From b8fbad3d058852d7d1672e4d11768fc246944688 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Wed, 28 Jun 2023 18:08:20 -0700
Subject: [PATCH 045/123] Update pyproject.toml

Increase python version requirement.
---
 pyproject.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index cc2436c..0febd7b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,7 +12,7 @@ classifiers = [
 ]
 
 [tool.poetry.dependencies]
-python = ">=3.7"
+python = ">=3.8"
 html5lib = "^1.1"
 requests = "^2.28.2"
 beautifulsoup4 = "^4.11.1"
@@ -24,4 +24,4 @@ pytest = "^7.2.1"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
\ No newline at end of file
+build-backend = "poetry.core.masonry.api"

From ee920972dc1de6b68818fbb188ac3194cfc4c885 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Thu, 29 Jun 2023 18:46:09 +0100
Subject: [PATCH 046/123] run black

---
 mf2py/__init__.py            |   2 +-
 mf2py/backcompat.py          |  87 ++--
 mf2py/datetime_helpers.py    | 107 ++---
 mf2py/dom_helpers.py         |  88 ++--
 mf2py/implied_properties.py  |  54 ++-
 mf2py/mf2_classes.py         |   6 +-
 mf2py/mf_helpers.py          |   9 +-
 mf2py/parse_property.py      |  28 +-
 mf2py/parser.py              | 253 +++++++----
 mf2py/temp_fixes.py          |   2 +-
 mf2py/value_class_pattern.py |  60 +--
 test/test_parser.py          | 841 +++++++++++++++++++++--------------
 test/test_suite.py           |   7 +-
 13 files changed, 916 insertions(+), 628 deletions(-)

diff --git a/mf2py/__init__.py b/mf2py/__init__.py
index e8a6a2e..d5560e0 100644
--- a/mf2py/__init__.py
+++ b/mf2py/__init__.py
@@ -10,4 +10,4 @@
 from .mf_helpers import get_url
 
 
-__all__ = ['Parser', 'parse', 'get_url', '__version__']
+__all__ = ["Parser", "parse", "get_url", "__version__"]
diff --git a/mf2py/backcompat.py b/mf2py/backcompat.py
index 9ac3903..b5ed93d 100644
--- a/mf2py/backcompat.py
+++ b/mf2py/backcompat.py
@@ -38,31 +38,35 @@
 
 # populate backcompat rules from JSON files
 
-_RULES_LOC = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'backcompat-rules')
+_RULES_LOC = os.path.join(
+    os.path.dirname(os.path.abspath(__file__)), "backcompat-rules"
+)
 
 for filename in os.listdir(_RULES_LOC):
     file_path = os.path.join(_RULES_LOC, filename)
     root = os.path.splitext(filename)[0]
-    with codecs.open(file_path, 'r', 'utf-8') as f:
+    with codecs.open(file_path, "r", "utf-8") as f:
         rules = json.load(f)
 
-    _CLASSIC_MAP[root] = rules 
+    _CLASSIC_MAP[root] = rules
 
 
 def _make_classes_rule(old_classes, new_classes):
     """Builds a rule for augmenting an mf1 class with its mf2
     equivalent(s).
     """
+
     def f(child, **kwargs):
         child_original = child.original or copy.copy(child)
-        child_classes = child.get('class', [])[:]
+        child_classes = child.get("class", [])[:]
         if all(cl in child_classes for cl in old_classes):
             child_classes.extend([cl for cl in new_classes if cl not in child_classes])
-            child['class'] = child_classes
+            child["class"] = child_classes
 
             # if any new class is e-* attach original to parse originally authored HTML
             if mf2_classes.has_embedded_class(child_classes) and child.original is None:
                 child.original = child_original
+
     return f
 
 
@@ -73,61 +77,70 @@ def _rel_tag_to_category_rule(child, html_parser, **kwargs):
     <data class="p-category" value="cat"></data>
     """
 
-    href = child.get('href', '')
-    rels = child.get('rel', [])
-    if 'tag' in rels and href:
-        segments = [seg for seg in href.split('/') if seg]
+    href = child.get("href", "")
+    rels = child.get("rel", [])
+    if "tag" in rels and href:
+        segments = [seg for seg in href.split("/") if seg]
         if segments:
             if html_parser:
-                soup = bs4.BeautifulSoup('', features=html_parser)
+                soup = bs4.BeautifulSoup("", features=html_parser)
             else:
-                soup = bs4.BeautifulSoup('')
+                soup = bs4.BeautifulSoup("")
 
-            data = soup.new_tag('data')
+            data = soup.new_tag("data")
             # this does not use what's given in the JSON
             # but that is not a problem currently
             # use mf1 class so it doesn't get removed later
-            data['class'] = ['p-category']
-            data['value'] = unquote(segments[-1])
+            data["class"] = ["p-category"]
+            data["value"] = unquote(segments[-1])
             child.insert_before(data)
             # remove tag from rels to avoid repeat
             # new list created, original not modifed -> safe on incomplete copy
-            child['rel'] = [r for r in rels if r != 'tag']
+            child["rel"] = [r for r in rels if r != "tag"]
 
 
 def _make_rels_rule(old_rels, new_classes, html_parser):
-    """Builds a rule for augmenting an mf1 rel with its mf2 class equivalent(s).
-    """
+    """Builds a rule for augmenting an mf1 rel with its mf2 class equivalent(s)."""
 
     # need to special case rel=tag as it operates differently
 
     def f(child, **kwargs):
-        child_rels = child.get('rel', [])
-        child_classes = child.get('class', [])[:]
+        child_rels = child.get("rel", [])
+        child_classes = child.get("class", [])[:]
         if all(r in child_rels for r in old_rels):
-            if 'tag' in old_rels:
+            if "tag" in old_rels:
                 _rel_tag_to_category_rule(child, html_parser, **kwargs)
             else:
-                child_classes.extend([cl for cl in new_classes if cl not in child_classes])
-                child['class'] = child_classes
+                child_classes.extend(
+                    [cl for cl in new_classes if cl not in child_classes]
+                )
+                child["class"] = child_classes
+
     return f
 
 
 def _get_rules(old_root, html_parser):
-    """ for given mf1 root get the rules as a list of functions to act on children """
-
-    class_rules = [_make_classes_rule(old_classes.split(), new_classes)
-                for old_classes, new_classes in _CLASSIC_MAP[old_root].get('properties', {}).items()]
-    rel_rules = [_make_rels_rule(old_rels.split(), new_classes, html_parser)
-                for old_rels, new_classes in _CLASSIC_MAP[old_root].get('rels', {}).items()]
+    """for given mf1 root get the rules as a list of functions to act on children"""
+
+    class_rules = [
+        _make_classes_rule(old_classes.split(), new_classes)
+        for old_classes, new_classes in _CLASSIC_MAP[old_root]
+        .get("properties", {})
+        .items()
+    ]
+    rel_rules = [
+        _make_rels_rule(old_rels.split(), new_classes, html_parser)
+        for old_rels, new_classes in _CLASSIC_MAP[old_root].get("rels", {}).items()
+    ]
 
     return class_rules + rel_rules
 
+
 def root(classes):
-    """get all backcompat root classnames
-    """
+    """get all backcompat root classnames"""
     return unordered_list([c for c in classes if c in _CLASSIC_MAP])
 
+
 def apply_rules(el, html_parser):
     """add modern classnames for older mf1 classnames
 
@@ -137,11 +150,12 @@ def apply_rules(el, html_parser):
     el_copy = copy.copy(el)
 
     def apply_prop_rules_to_children(parent, rules):
-
         for child in get_children(parent):
-            classes = child.get('class',[])[:]
+            classes = child.get("class", [])[:]
             # find existing mf2 properties if any and delete them
-            child['class'] = [cl for cl in classes if not mf2_classes.is_property_class(cl)]
+            child["class"] = [
+                cl for cl in classes if not mf2_classes.is_property_class(cl)
+            ]
 
             # apply rules to change mf1 to mf2
             for rule in rules:
@@ -152,13 +166,12 @@ def apply_prop_rules_to_children(parent, rules):
                 apply_prop_rules_to_children(child, rules)
 
     # add mf2 root equivalent
-    classes = el_copy.get('class', [])[:]
+    classes = el_copy.get("class", [])[:]
     old_roots = root(classes)
     for old_root in old_roots:
-        new_roots = _CLASSIC_MAP[old_root]['type']
+        new_roots = _CLASSIC_MAP[old_root]["type"]
         classes.extend(new_roots)
-    el_copy['class'] = classes
-
+    el_copy["class"] = classes
 
     # add mf2 prop equivalent to descendents and remove existing mf2 props
     rules = []
diff --git a/mf2py/datetime_helpers.py b/mf2py/datetime_helpers.py
index de6313f..93032e3 100644
--- a/mf2py/datetime_helpers.py
+++ b/mf2py/datetime_helpers.py
@@ -1,61 +1,62 @@
-'''helper functions to deal wit datetime strings'''
+"""helper functions to deal wit datetime strings"""
 
 import re
 from datetime import datetime
 
 # REGEX!
 
-DATE_RE = r'(\d{4}-\d{2}-\d{2})|(\d{4}-\d{3})'
-SEC_RE = r'(:(?P<second>\d{2})(\.\d+)?)'
-RAWTIME_RE = r'(?P<hour>\d{1,2})(:(?P<minute>\d{2})%s?)?' % (SEC_RE)
-AMPM_RE = r'am|pm|a\.m\.|p\.m\.|AM|PM|A\.M\.|P\.M\.'
-TIMEZONE_RE = r'Z|[+-]\d{1,2}:?\d{2}?'
-TIME_RE = (r'(?P<rawtime>%s)( ?(?P<ampm>%s))?( ?(?P<tz>%s))?' %
-           (RAWTIME_RE, AMPM_RE, TIMEZONE_RE))
-DATETIME_RE = (r'(?P<date>%s)(?P<separator>[T ])(?P<time>%s)'
-               % (DATE_RE, TIME_RE))
+DATE_RE = r"(\d{4}-\d{2}-\d{2})|(\d{4}-\d{3})"
+SEC_RE = r"(:(?P<second>\d{2})(\.\d+)?)"
+RAWTIME_RE = r"(?P<hour>\d{1,2})(:(?P<minute>\d{2})%s?)?" % (SEC_RE)
+AMPM_RE = r"am|pm|a\.m\.|p\.m\.|AM|PM|A\.M\.|P\.M\."
+TIMEZONE_RE = r"Z|[+-]\d{1,2}:?\d{2}?"
+TIME_RE = r"(?P<rawtime>%s)( ?(?P<ampm>%s))?( ?(?P<tz>%s))?" % (
+    RAWTIME_RE,
+    AMPM_RE,
+    TIMEZONE_RE,
+)
+DATETIME_RE = r"(?P<date>%s)(?P<separator>[T ])(?P<time>%s)" % (DATE_RE, TIME_RE)
+
 
 def normalize_datetime(dtstr, match=None):
-        """Try to normalize a datetime string.
-        1. Convert 12-hour time to 24-hour time
-
-        pass match in if we have already calculated it to avoid rework
-        """
-        match = match or (dtstr and re.match(DATETIME_RE + '$', dtstr))
-        if match:
-            datestr = match.group('date')
-            hourstr = match.group('hour')
-            minutestr = match.group('minute') or '00'
-            secondstr = match.group('second')
-            ampmstr = match.group('ampm')
-            separator = match.group('separator')
-
-            # convert ordinal date YYYY-DDD to YYYY-MM-DD
-            try:
-                datestr = datetime.strptime(datestr, '%Y-%j').strftime('%Y-%m-%d')
-            except ValueError:
-                # datestr was not in YYYY-DDD format
-                pass
-
-            # 12 to 24 time conversion
-            if ampmstr:
-                hourstr = match.group('hour')
-                hourint = int(hourstr)
-
-                if (ampmstr.startswith('a') or ampmstr.startswith('A')) and hourint == 12:
-                    hourstr = '00'
-
-                if (ampmstr.startswith('p') or ampmstr.startswith('P')) and hourint < 12:
-                    hourstr = hourint + 12
-
-
-            dtstr = '%s%s%s:%s' % (
-                datestr, separator, hourstr, minutestr)
-
-            if secondstr:
-                dtstr += ':'+secondstr
-
-            tzstr = match.group('tz')
-            if tzstr:
-                dtstr += tzstr
-        return dtstr
+    """Try to normalize a datetime string.
+    1. Convert 12-hour time to 24-hour time
+
+    pass match in if we have already calculated it to avoid rework
+    """
+    match = match or (dtstr and re.match(DATETIME_RE + "$", dtstr))
+    if match:
+        datestr = match.group("date")
+        hourstr = match.group("hour")
+        minutestr = match.group("minute") or "00"
+        secondstr = match.group("second")
+        ampmstr = match.group("ampm")
+        separator = match.group("separator")
+
+        # convert ordinal date YYYY-DDD to YYYY-MM-DD
+        try:
+            datestr = datetime.strptime(datestr, "%Y-%j").strftime("%Y-%m-%d")
+        except ValueError:
+            # datestr was not in YYYY-DDD format
+            pass
+
+        # 12 to 24 time conversion
+        if ampmstr:
+            hourstr = match.group("hour")
+            hourint = int(hourstr)
+
+            if (ampmstr.startswith("a") or ampmstr.startswith("A")) and hourint == 12:
+                hourstr = "00"
+
+            if (ampmstr.startswith("p") or ampmstr.startswith("P")) and hourint < 12:
+                hourstr = hourint + 12
+
+        dtstr = "%s%s%s:%s" % (datestr, separator, hourstr, minutestr)
+
+        if secondstr:
+            dtstr += ":" + secondstr
+
+        tzstr = match.group("tz")
+        if tzstr:
+            dtstr += tzstr
+    return dtstr
diff --git a/mf2py/dom_helpers.py b/mf2py/dom_helpers.py
index f1c3e72..ec9ea99 100644
--- a/mf2py/dom_helpers.py
+++ b/mf2py/dom_helpers.py
@@ -40,7 +40,7 @@ def get_attr(el, attr, check_name=None):
         return el.get(attr)
 
 
-def get_img_src_alt(img, dict_class, img_with_alt, base_url=''):
+def get_img_src_alt(img, dict_class, img_with_alt, base_url=""):
     """given a img element, returns both src and alt attributes as a list of tuples if alt exists, else returns the src as a string
     use for alt parsing with img
     """
@@ -54,36 +54,34 @@ def get_img_src_alt(img, dict_class, img_with_alt, base_url=''):
         if alt is None or not img_with_alt:
             return src
         else:
-            return dict_class([
-                                ("value", src),
-                                ("alt", alt)
-                            ])
+            return dict_class([("value", src), ("alt", alt)])
+
 
 def get_children(node):
     """An iterator over the immediate children tags of this tag"""
     for child in node.children:
-        if isinstance(child, bs4.Tag) and child.name != 'template':
+        if isinstance(child, bs4.Tag) and child.name != "template":
             yield child
 
 
 def get_descendents(node):
     """An iterator over the all children tags (descendants) of this tag"""
     for desc in node.descendants:
-        if isinstance(desc, bs4.Tag) and desc.name != 'template':
+        if isinstance(desc, bs4.Tag) and desc.name != "template":
             yield desc
 
-def get_textContent(el, replace_img=False, img_to_src=True, base_url=''):
-    """ Get the text content of an element, replacing images by alt or src
-    """
 
-    DROP_TAGS = ('script', 'style',  'template')
-    PRE_TAGS = ('pre',)
+def get_textContent(el, replace_img=False, img_to_src=True, base_url=""):
+    """Get the text content of an element, replacing images by alt or src"""
+
+    DROP_TAGS = ("script", "style", "template")
+    PRE_TAGS = ("pre",)
     P_BREAK_BEFORE = 1
     P_BREAK_AFTER = 0
     PRE_BEFORE = 2
     PRE_AFTER = 3
 
-    def text_collection(el, replace_img=False, img_to_src=True, base_url=''):
+    def text_collection(el, replace_img=False, img_to_src=True, base_url=""):
         # returns array of strings or integers
 
         items = []
@@ -95,69 +93,71 @@ def text_collection(el, replace_img=False, img_to_src=True, base_url=''):
         elif isinstance(el, NavigableString):
             value = el
             # replace \t \n \r by space
-            value = _whitespace_to_space_regex.sub(' ', value)
+            value = _whitespace_to_space_regex.sub(" ", value)
             # replace multiple spaces with one space
-            items = [_reduce_spaces_regex.sub(' ', value)]
+            items = [_reduce_spaces_regex.sub(" ", value)]
 
         # don't do anything special for PRE-formatted tags defined above
         elif el.name in PRE_TAGS:
             items = [PRE_BEFORE, el.get_text(), PRE_AFTER]
 
-        elif el.name == 'img' and replace_img:
-            value = el.get('alt')
+        elif el.name == "img" and replace_img:
+            value = el.get("alt")
             if value is None and img_to_src:
-                value = el.get('src')
+                value = el.get("src")
                 if value is not None:
                     value = try_urljoin(base_url, value)
 
             if value is not None:
-                items = [' ', value, ' ']
+                items = [" ", value, " "]
 
-        elif el.name == 'br':
-            items = ['\n']
+        elif el.name == "br":
+            items = ["\n"]
 
         else:
             for child in el.children:
-
                 child_items = text_collection(child, replace_img, img_to_src, base_url)
                 items.extend(child_items)
 
-            if el.name == 'p':
+            if el.name == "p":
                 items = [P_BREAK_BEFORE] + items
                 items.append(P_BREAK_AFTER)
 
-
         return items
 
-    results = [t for t in text_collection(el, replace_img, img_to_src, base_url) if t != '']
+    results = [
+        t for t in text_collection(el, replace_img, img_to_src, base_url) if t != ""
+    ]
 
     if results:
         # remove <space> if it is first and last or if it is preceded by a <space> or <p> open/close
         length = len(results)
         for i in range(0, length):
-            if (results[i] == ' ' and
-                    (i == 0 or
-                    i == length - 1 or
-                    results[i-1] == ' ' or
-                    results[i-1] in (P_BREAK_BEFORE, P_BREAK_AFTER) or
-                    results[i+1] == ' ' or
-                    results[i+1] in (P_BREAK_BEFORE, P_BREAK_AFTER)
-                    )
-                ):
-                results[i] = ''
+            if results[i] == " " and (
+                i == 0
+                or i == length - 1
+                or results[i - 1] == " "
+                or results[i - 1] in (P_BREAK_BEFORE, P_BREAK_AFTER)
+                or results[i + 1] == " "
+                or results[i + 1] in (P_BREAK_BEFORE, P_BREAK_AFTER)
+            ):
+                results[i] = ""
 
     if results:
         # remove leading whitespace and <int> i.e. next lines
-        while ((isinstance(results[0], str) and (results[0] == '' or results[0].isspace())) or
-               results[0] in (P_BREAK_BEFORE, P_BREAK_AFTER)):
+        while (
+            isinstance(results[0], str) and (results[0] == "" or results[0].isspace())
+        ) or results[0] in (P_BREAK_BEFORE, P_BREAK_AFTER):
             results.pop(0)
             if not results:
                 break
 
     if results:
         # remove trailing whitespace and <int> i.e. next lines
-        while ((isinstance(results[-1], str) and (results[-1] == '' or results[-1].isspace())) or
-               results[-1] in (P_BREAK_BEFORE, P_BREAK_AFTER)):
+        while (
+            isinstance(results[-1], str)
+            and (results[-1] == "" or results[-1].isspace())
+        ) or results[-1] in (P_BREAK_BEFORE, P_BREAK_AFTER):
             results.pop(-1)
             if not results:
                 break
@@ -170,18 +170,18 @@ def text_collection(el, replace_img=False, img_to_src=True, base_url=''):
             results[-1] = results[-1].rstrip()
 
     # create final string by concatenating replacing consecutive sequence of <int> by largest value number of \n
-    text = ''
+    text = ""
     count = 0
     last = None
     for t in results:
         if t in (P_BREAK_BEFORE, P_BREAK_AFTER):
             count = max(t, count)
         elif t == PRE_BEFORE:
-            text = text.rstrip(' ')
+            text = text.rstrip(" ")
         elif not isinstance(t, int):
-            if count or last == '\n':
-                t = t.lstrip(' ')
-            text = ''.join([text, '\n'*count , t])
+            if count or last == "\n":
+                t = t.lstrip(" ")
+            text = "".join([text, "\n" * count, t])
             count = 0
         last = t
 
diff --git a/mf2py/implied_properties.py b/mf2py/implied_properties.py
index 17562d2..fa1f945 100644
--- a/mf2py/implied_properties.py
+++ b/mf2py/implied_properties.py
@@ -1,8 +1,14 @@
 from . import mf2_classes
-from .dom_helpers import get_attr, get_img_src_alt, get_children, get_textContent, try_urljoin
+from .dom_helpers import (
+    get_attr,
+    get_img_src_alt,
+    get_children,
+    get_textContent,
+    try_urljoin,
+)
 
 
-def name(el, base_url=''):
+def name(el, base_url=""):
     """Find an implied name property
 
     Args:
@@ -11,10 +17,11 @@ def name(el, base_url=''):
     Returns:
       string: the implied name value
     """
+
     def non_empty(val):
         """If alt or title is empty, we don't want to use it as the implied
         name"""
-        return val is not None and val != ''
+        return val is not None and val != ""
 
     # if image or area use alt text if not empty
     prop_value = get_attr(el, "alt", check_name=("img", "area"))
@@ -33,7 +40,7 @@ def non_empty(val):
         poss_child = children[0]
 
         # ignore if mf2 root
-        if mf2_classes.root(poss_child.get('class',[])):
+        if mf2_classes.root(poss_child.get("class", [])):
             poss_child = None
 
         # if it is not img, area, abbr then find grandchild
@@ -43,7 +50,9 @@ def non_empty(val):
             if len(grandchildren) == 1:
                 poss_child = grandchildren[0]
                 # if it is not img, area, abbr or is mf2 root then no possible child
-                if poss_child.name not in ("img", "area", "abbr") or mf2_classes.root(poss_child.get('class',[])):
+                if poss_child.name not in ("img", "area", "abbr") or mf2_classes.root(
+                    poss_child.get("class", [])
+                ):
                     poss_child = None
 
     # if a possible child was found
@@ -64,7 +73,7 @@ def non_empty(val):
     return get_textContent(el, replace_img=True, img_to_src=False, base_url=base_url)
 
 
-def photo(el, dict_class, img_with_alt, base_url=''):
+def photo(el, dict_class, img_with_alt, base_url=""):
     """Find an implied photo property
 
     Args:
@@ -82,18 +91,18 @@ def get_photo_child(children):
 
         # if element has one image child use source if exists and img is
         # not root class
-        poss_imgs = [c for c in children if c.name == 'img']
+        poss_imgs = [c for c in children if c.name == "img"]
         if len(poss_imgs) == 1:
             poss_img = poss_imgs[0]
-            if not mf2_classes.root(poss_img.get('class', [])):
+            if not mf2_classes.root(poss_img.get("class", [])):
                 return poss_img
 
         # if element has one object child use data if exists and object is
         # not root class
-        poss_objs = [c for c in children if c.name == 'object']
+        poss_objs = [c for c in children if c.name == "object"]
         if len(poss_objs) == 1:
             poss_obj = poss_objs[0]
-            if not mf2_classes.root(poss_obj.get('class', [])):
+            if not mf2_classes.root(poss_obj.get("class", [])):
                 return poss_obj
 
     # if element is an img use source if exists
@@ -113,8 +122,11 @@ def get_photo_child(children):
     poss_child = get_photo_child(children)
 
     # if no possible child found then look for grandchild if only one child which is not not mf2 root
-    if poss_child is None and len(children) == 1 and not mf2_classes.root(children[0].get('class', [])): 
-
+    if (
+        poss_child is None
+        and len(children) == 1
+        and not mf2_classes.root(children[0].get("class", []))
+    ):
         grandchildren = list(get_children(children[0]))
         poss_child = get_photo_child(grandchildren)
 
@@ -131,7 +143,7 @@ def get_photo_child(children):
             return prop_value
 
 
-def url(el, base_url=''):
+def url(el, base_url=""):
     """Find an implied url property
 
     Args:
@@ -146,20 +158,19 @@ def get_url_child(children):
         "take a list of children and finds a valid child for url property"
 
         # if element has one <a> child use if not root class
-        poss_as = [c for c in children if c.name == 'a']
+        poss_as = [c for c in children if c.name == "a"]
         if len(poss_as) == 1:
             poss_a = poss_as[0]
-            if not mf2_classes.root(poss_a.get('class', [])):
+            if not mf2_classes.root(poss_a.get("class", [])):
                 return poss_a
 
         # if element has one area child use if not root class
-        poss_areas = [c for c in children if c.name == 'area']
+        poss_areas = [c for c in children if c.name == "area"]
         if len(poss_areas) == 1:
             poss_area = poss_areas[0]
-            if not mf2_classes.root(poss_area.get('class', [])):
+            if not mf2_classes.root(poss_area.get("class", [])):
                 return poss_area
 
-
     # if element is a <a> or area use its href if exists
     prop_value = get_attr(el, "href", check_name=("a", "area"))
     if prop_value is not None:  # an empty href is valid
@@ -172,8 +183,11 @@ def get_url_child(children):
     poss_child = get_url_child(children)
 
     # if no possible child found then look for grandchild if only one child which is not mf2 root
-    if poss_child is None and len(children) == 1 and not mf2_classes.root(children[0].get('class', [])): 
-
+    if (
+        poss_child is None
+        and len(children) == 1
+        and not mf2_classes.root(children[0].get("class", []))
+    ):
         grandchildren = list(get_children(children[0]))
         poss_child = get_url_child(grandchildren)
 
diff --git a/mf2py/mf2_classes.py b/mf2py/mf2_classes.py
index 49d1de9..6565414 100644
--- a/mf2py/mf2_classes.py
+++ b/mf2py/mf2_classes.py
@@ -9,12 +9,12 @@
 def filter_classes(classes, regex=_mf2_classes_re):
     """detect classes that are valid names for mf2, sort in dictionary by prefix"""
 
-    types = {x: set() for x in ('u', 'p', 'dt', 'e', 'h')}
+    types = {x: set() for x in ("u", "p", "dt", "e", "h")}
     for c in classes:
         match = regex.match(c)
         if match:
             if c[0] == "h":
-                types['h'].add(c)
+                types["h"].add(c)
             else:
                 types[match.group(1)].add(match.group(2))
     return types
@@ -23,8 +23,10 @@ def filter_classes(classes, regex=_mf2_classes_re):
 def root(classes):
     return {c for c in classes if _mf2_roots_re.match(c)}
 
+
 def is_property_class(class_):
     return _mf2_properties_re.match(class_)
 
+
 def has_embedded_class(classes):
     return any(_mf2_e_properties_re.match(c) for c in classes)
diff --git a/mf2py/mf_helpers.py b/mf2py/mf_helpers.py
index c98ed5e..d6a9985 100644
--- a/mf2py/mf_helpers.py
+++ b/mf2py/mf_helpers.py
@@ -1,5 +1,6 @@
 # don't need anymore defer to mf2util instead (mf2util does not have this functionality)
 
+
 def get_url(mf):
     """Given a property value that may be a list of simple URLs or complex
     h-* dicts (with a url property), extract a list of URLs. This is useful
@@ -16,12 +17,14 @@ def get_url(mf):
     for item in mf:
         if isinstance(item, str):
             urls.append(item)
-        elif (isinstance(item, dict)
-              and any(x.startswith('h-') for x in item.get('type', []))):
-            urls.extend(item.get('properties', {}).get('url', []))
+        elif isinstance(item, dict) and any(
+            x.startswith("h-") for x in item.get("type", [])
+        ):
+            urls.extend(item.get("properties", {}).get("url", []))
 
     return urls
 
+
 def unordered_list(l):
     """given a list, returns another list with unique and alphabetically sorted elements.
     use for HTML attributes that have no semantics to their order e.g. class, rel.
diff --git a/mf2py/parse_property.py b/mf2py/parse_property.py
index 9b7002d..9db9c9d 100644
--- a/mf2py/parse_property.py
+++ b/mf2py/parse_property.py
@@ -7,7 +7,7 @@
 import re
 
 
-def text(el, base_url=''):
+def text(el, base_url=""):
     """Process p-* properties"""
 
     # handle value-class-pattern
@@ -26,7 +26,7 @@ def text(el, base_url=''):
     return prop_value
 
 
-def url(el, dict_class, img_with_alt, base_url=''):
+def url(el, dict_class, img_with_alt, base_url=""):
     """Process u-* properties"""
 
     prop_value = get_attr(el, "href", check_name=("a", "area", "link"))
@@ -35,7 +35,9 @@ def url(el, dict_class, img_with_alt, base_url=''):
         if prop_value is not None:
             return prop_value
     if prop_value is None:
-        prop_value = get_attr(el, "src", check_name=("audio", "video", "source", "iframe"))
+        prop_value = get_attr(
+            el, "src", check_name=("audio", "video", "source", "iframe")
+        )
     if prop_value is None:
         prop_value = get_attr(el, "poster", check_name="video")
     if prop_value is None:
@@ -76,23 +78,25 @@ def datetime(el, default_date=None):
     if prop_value is None:
         prop_value = get_attr(el, "value", check_name=("data", "input"))
     if prop_value is None:
-        prop_value = get_textContent(el) 
+        prop_value = get_textContent(el)
 
     # if this is just a time, augment with default date
-    match = re.match(TIME_RE + '$', prop_value)
+    match = re.match(TIME_RE + "$", prop_value)
     if match and default_date:
-        prop_value = '%s %s' % (default_date, prop_value)
+        prop_value = "%s %s" % (default_date, prop_value)
         return normalize_datetime(prop_value), default_date
 
     # otherwise, treat it as a full date
-    match = re.match(DATETIME_RE + '$', prop_value)
-    return (normalize_datetime(prop_value, match=match),
-            match and match.group('date'),)
+    match = re.match(DATETIME_RE + "$", prop_value)
+    return (
+        normalize_datetime(prop_value, match=match),
+        match and match.group("date"),
+    )
 
 
-def embedded(el, base_url=''):
+def embedded(el, base_url=""):
     """Process e-* properties"""
     return {
-        'html': el.decode_contents().strip(),    # secret bs4 method to get innerHTML
-        'value': get_textContent(el, replace_img=True, base_url=base_url)
+        "html": el.decode_contents().strip(),  # secret bs4 method to get innerHTML
+        "value": get_textContent(el, replace_img=True, base_url=base_url),
     }
diff --git a/mf2py/parser.py b/mf2py/parser.py
index 4644ef1..035a2b8 100644
--- a/mf2py/parser.py
+++ b/mf2py/parser.py
@@ -51,9 +51,9 @@ class Parser(object):
       useragent (string): the User-Agent string for the Parser
     """
 
-    ua_desc = 'mf2py - microformats2 parser for python'
+    ua_desc = "mf2py - microformats2 parser for python"
     ua_url = "https://github.com/microformats/mf2py"
-    useragent = '{0} - version {1} - {2}'.format(ua_desc, __version__, ua_url)
+    useragent = "{0} - version {1} - {2}".format(ua_desc, __version__, ua_url)
 
     dict_class = dict
 
@@ -61,40 +61,49 @@ def __init__(self, doc=None, url=None, html_parser=None, img_with_alt=True):
         self.__url__ = None
         self.__doc__ = None
         self._preserve_doc = False
-        self.__parsed__ = self.dict_class([
-            ('items', []),
-            ('rels', self.dict_class()),
-            ('rel-urls', self.dict_class()),
-            ('debug', self.dict_class([
-                ('description', self.ua_desc),
-                ('source', self.ua_url),
-                ('version', __version__)
-            ]))
-        ])
+        self.__parsed__ = self.dict_class(
+            [
+                ("items", []),
+                ("rels", self.dict_class()),
+                ("rel-urls", self.dict_class()),
+                (
+                    "debug",
+                    self.dict_class(
+                        [
+                            ("description", self.ua_desc),
+                            ("source", self.ua_url),
+                            ("version", __version__),
+                        ]
+                    ),
+                ),
+            ]
+        )
         self.__img_with_alt__ = img_with_alt
 
         # use default parser if none specified
-        self.__html_parser__ = html_parser or 'html5lib'
+        self.__html_parser__ = html_parser or "html5lib"
 
         if url is not None:
             self.__url__ = url
 
             if doc is None:
-                data = requests.get(self.__url__, headers={
-                    'User-Agent': self.useragent,
-                })
+                data = requests.get(
+                    self.__url__,
+                    headers={
+                        "User-Agent": self.useragent,
+                    },
+                )
 
                 # update to final URL after redirects
                 self.__url__ = data.url
 
                 # HACK: check for character encodings and use 'correct' data
-                if 'charset' in data.headers.get('content-type', ''):
+                if "charset" in data.headers.get("content-type", ""):
                     doc = data.text
                 else:
                     doc = data.content
 
         if doc is not None:
-
             if isinstance(doc, BeautifulSoup) or isinstance(doc, Tag):
                 self.__doc__ = doc
                 self._preserve_doc = True
@@ -116,11 +125,11 @@ def __init__(self, doc=None, url=None, html_parser=None, img_with_alt=True):
 
         # check for <base> tag
         if self.__doc__:
-
-            poss_base = next((el for el in get_descendents(self.__doc__)
-                              if el.name == 'base'), None)
+            poss_base = next(
+                (el for el in get_descendents(self.__doc__) if el.name == "base"), None
+            )
             if poss_base:
-                poss_base_url = poss_base.get('href')  # try to get href
+                poss_base_url = poss_base.get("href")  # try to get href
                 if poss_base_url:
                     if urlparse(poss_base_url).netloc:
                         # base specifies an absolute path
@@ -145,10 +154,14 @@ def parse(self):
         # see value-class-pattern#microformats2_parsers on wiki.
         # see also the implied_relative_datetimes testcase.
 
-        def handle_microformat(root_class_names, el, value_property=None,
-                               simple_value=None, backcompat_mode=False):
-            """Handles a (possibly nested) microformat, i.e. h-*
-            """
+        def handle_microformat(
+            root_class_names,
+            el,
+            value_property=None,
+            simple_value=None,
+            backcompat_mode=False,
+        ):
+            """Handles a (possibly nested) microformat, i.e. h-*"""
             properties = self.dict_class()
             children = []
             self._default_date = None
@@ -157,11 +170,15 @@ def handle_microformat(root_class_names, el, value_property=None,
 
             if backcompat_mode:
                 el = backcompat.apply_rules(el, self.__html_parser__)
-                root_class_names = mf2_classes.root(el.get('class', []))
+                root_class_names = mf2_classes.root(el.get("class", []))
 
             # parse for properties and children
             for child in get_children(el):
-                child_props, child_children, child_parsed_types_aggregation = parse_props(child)
+                (
+                    child_props,
+                    child_children,
+                    child_parsed_types_aggregation,
+                ) = parse_props(child)
                 for key, new_value in child_props.items():
                     prop_value = properties.get(key, [])
                     prop_value.extend(new_value)
@@ -177,42 +194,56 @@ def handle_microformat(root_class_names, el, value_property=None,
             # if some properties not already found find in implied ways unless in backcompat mode
             if not backcompat_mode:
                 # stop implied name if any p-*, e-*, h-* is already found
-                if "name" not in properties and parsed_types_aggregation.isdisjoint("peh"):
-                    properties["name"] = [implied_properties.name(el, base_url=self.__url__)]
-
-                if "photo" not in properties and parsed_types_aggregation.isdisjoint("uh"):
-                    x = implied_properties.photo(el, self.dict_class, self.__img_with_alt__, base_url=self.__url__)
+                if "name" not in properties and parsed_types_aggregation.isdisjoint(
+                    "peh"
+                ):
+                    properties["name"] = [
+                        implied_properties.name(el, base_url=self.__url__)
+                    ]
+
+                if "photo" not in properties and parsed_types_aggregation.isdisjoint(
+                    "uh"
+                ):
+                    x = implied_properties.photo(
+                        el,
+                        self.dict_class,
+                        self.__img_with_alt__,
+                        base_url=self.__url__,
+                    )
                     if x is not None:
                         properties["photo"] = [x]
 
                 # stop implied url if any u-* or h-* is already found
-                if "url" not in properties and parsed_types_aggregation.isdisjoint("uh"):
+                if "url" not in properties and parsed_types_aggregation.isdisjoint(
+                    "uh"
+                ):
                     x = implied_properties.url(el, base_url=self.__url__)
                     if x is not None:
                         properties["url"] = [x]
 
             # build microformat with type and properties
-            microformat = self.dict_class([
-                ("type", [class_name
-                          for class_name in sorted(root_class_names)]),
-                ("properties", properties),
-            ])
+            microformat = self.dict_class(
+                [
+                    ("type", [class_name for class_name in sorted(root_class_names)]),
+                    ("properties", properties),
+                ]
+            )
             if el.name == "area":
-                shape = get_attr(el, 'shape')
+                shape = get_attr(el, "shape")
                 if shape is not None:
-                    microformat['shape'] = shape
+                    microformat["shape"] = shape
 
-                coords = get_attr(el, 'coords')
+                coords = get_attr(el, "coords")
                 if coords is not None:
-                    microformat['coords'] = coords
+                    microformat["coords"] = coords
 
             # insert children if any
             if children:
                 microformat["children"] = children
 
-            Id = get_attr(el, 'id')
+            Id = get_attr(el, "id")
             if Id:
-                microformat['id'] = Id
+                microformat["id"] = Id
 
             # simple value is the parsed property value if it were not
             # an h-* class
@@ -229,8 +260,7 @@ def handle_microformat(root_class_names, el, value_property=None,
             return microformat
 
         def parse_props(el):
-            """Parse the properties from a single element
-            """
+            """Parse the properties from a single element"""
             props = self.dict_class()
             children = []
             # for processing implied properties: collects if property types (p, e, u, d(t)) or children (h) have been processed
@@ -239,7 +269,7 @@ def parse_props(el):
             classes = el.get("class", [])
             filtered_classes = mf2_classes.filter_classes(classes)
             # Is this element a microformat2 root?
-            root_class_names = filtered_classes['h']
+            root_class_names = filtered_classes["h"]
             backcompat_mode = False
 
             # Is this element a microformat1 root?
@@ -248,7 +278,7 @@ def parse_props(el):
                 backcompat_mode = True
 
             if root_class_names:
-                parsed_types_aggregation.add('h')
+                parsed_types_aggregation.add("h")
 
             # Is this a property element (p-*, u-*, etc.) flag
             # False is default
@@ -256,9 +286,9 @@ def parse_props(el):
 
             # Parse plaintext p-* properties.
             p_value = None
-            for prop_name in filtered_classes['p']:
+            for prop_name in filtered_classes["p"]:
                 is_property_el = True
-                parsed_types_aggregation.add('p')
+                parsed_types_aggregation.add("p")
                 prop_value = props.setdefault(prop_name, [])
 
                 # if value has not been parsed then parse it
@@ -266,27 +296,44 @@ def parse_props(el):
                     p_value = parse_property.text(el, base_url=self.__url__)
 
                 if root_class_names:
-                    prop_value.append(handle_microformat(
-                        root_class_names, el, value_property="name",
-                        simple_value=p_value, backcompat_mode=backcompat_mode))
+                    prop_value.append(
+                        handle_microformat(
+                            root_class_names,
+                            el,
+                            value_property="name",
+                            simple_value=p_value,
+                            backcompat_mode=backcompat_mode,
+                        )
+                    )
                 else:
                     prop_value.append(p_value)
 
             # Parse URL u-* properties.
             u_value = None
-            for prop_name in filtered_classes['u']:
+            for prop_name in filtered_classes["u"]:
                 is_property_el = True
-                parsed_types_aggregation.add('u')
+                parsed_types_aggregation.add("u")
                 prop_value = props.setdefault(prop_name, [])
 
                 # if value has not been parsed then parse it
                 if u_value is None:
-                    u_value = parse_property.url(el, self.dict_class, self.__img_with_alt__, base_url=self.__url__)
+                    u_value = parse_property.url(
+                        el,
+                        self.dict_class,
+                        self.__img_with_alt__,
+                        base_url=self.__url__,
+                    )
 
                 if root_class_names:
-                    prop_value.append(handle_microformat(
-                        root_class_names, el, value_property="url",
-                        simple_value=u_value, backcompat_mode=backcompat_mode))
+                    prop_value.append(
+                        handle_microformat(
+                            root_class_names,
+                            el,
+                            value_property="url",
+                            simple_value=u_value,
+                            backcompat_mode=backcompat_mode,
+                        )
+                    )
                 else:
                     if isinstance(u_value, self.dict_class):
                         prop_value.append(u_value)
@@ -295,33 +342,37 @@ def parse_props(el):
 
             # Parse datetime dt-* properties.
             dt_value = None
-            for prop_name in filtered_classes['dt']:
+            for prop_name in filtered_classes["dt"]:
                 is_property_el = True
-                parsed_types_aggregation.add('d')
+                parsed_types_aggregation.add("d")
                 prop_value = props.setdefault(prop_name, [])
 
                 # if value has not been parsed then parse it
                 if dt_value is None:
-                    dt_value, new_date = parse_property.datetime(
-                        el, self._default_date)
+                    dt_value, new_date = parse_property.datetime(el, self._default_date)
                     # update the default date
                     if new_date:
                         self._default_date = new_date
 
                 if root_class_names:
                     stops_implied_name = True
-                    prop_value.append(handle_microformat(
-                        root_class_names, el,
-                        simple_value=dt_value, backcompat_mode=backcompat_mode))
+                    prop_value.append(
+                        handle_microformat(
+                            root_class_names,
+                            el,
+                            simple_value=dt_value,
+                            backcompat_mode=backcompat_mode,
+                        )
+                    )
                 else:
                     if dt_value is not None:
                         prop_value.append(dt_value)
 
             # Parse embedded markup e-* properties.
             e_value = None
-            for prop_name in filtered_classes['e']:
+            for prop_name in filtered_classes["e"]:
                 is_property_el = True
-                parsed_types_aggregation.add('e')
+                parsed_types_aggregation.add("e")
                 prop_value = props.setdefault(prop_name, [])
 
                 # if value has not been parsed then parse it
@@ -334,23 +385,39 @@ def parse_props(el):
                     if self._preserve_doc:
                         embedded_el = copy.copy(embedded_el)
                     temp_fixes.rm_templates(embedded_el)
-                    e_value = parse_property.embedded(embedded_el, base_url=self.__url__)
+                    e_value = parse_property.embedded(
+                        embedded_el, base_url=self.__url__
+                    )
 
                 if root_class_names:
                     stops_implied_name = True
-                    prop_value.append(handle_microformat(
-                        root_class_names, el, simple_value=e_value, backcompat_mode=backcompat_mode))
+                    prop_value.append(
+                        handle_microformat(
+                            root_class_names,
+                            el,
+                            simple_value=e_value,
+                            backcompat_mode=backcompat_mode,
+                        )
+                    )
                 else:
                     prop_value.append(e_value)
 
             # if this is not a property element, but it is a h-* microformat,
             # add it to our list of children
             if not is_property_el and root_class_names:
-                children.append(handle_microformat(root_class_names, el, backcompat_mode=backcompat_mode))
+                children.append(
+                    handle_microformat(
+                        root_class_names, el, backcompat_mode=backcompat_mode
+                    )
+                )
             # parse child tags, provided this isn't a microformat root-class
             if not root_class_names:
                 for child in get_children(el):
-                    child_properties, child_microformats, child_parsed_types_aggregation = parse_props(child)
+                    (
+                        child_properties,
+                        child_microformats,
+                        child_parsed_types_aggregation,
+                    ) = parse_props(child)
                     for prop_name in child_properties:
                         v = props.get(prop_name, [])
                         v.extend(child_properties[prop_name])
@@ -360,15 +427,13 @@ def parse_props(el):
             return props, children, parsed_types_aggregation
 
         def parse_rels(el):
-            """Parse an element for rel microformats
-            """
-            rel_attrs = get_attr(el, 'rel')
+            """Parse an element for rel microformats"""
+            rel_attrs = get_attr(el, "rel")
             # if rel attributes exist
             if rel_attrs is not None:
                 # find the url and normalise it
-                url = try_urljoin(self.__url__, el.get('href', ''))
-                value_dict = self.__parsed__["rel-urls"].get(url,
-                                                             self.dict_class())
+                url = try_urljoin(self.__url__, el.get("href", ""))
+                value_dict = self.__parsed__["rel-urls"].get(url, self.dict_class())
 
                 # 1st one wins
                 if "text" not in value_dict:
@@ -397,8 +462,7 @@ def parse_rels(el):
                     alternate_list = self.__parsed__.get("alternates", [])
                     alternate_dict = self.dict_class()
                     alternate_dict["url"] = url
-                    x = " ".join(
-                        [r for r in rel_attrs if not r == "alternate"])
+                    x = " ".join([r for r in rel_attrs if not r == "alternate"])
                     if x != "":
                         alternate_dict["rel"] = x
                     alternate_dict["text"] = el.get_text().strip()
@@ -410,8 +474,7 @@ def parse_rels(el):
                     self.__parsed__["alternates"] = alternate_list
 
         def parse_el(el, ctx):
-            """Parse an element for microformats
-            """
+            """Parse an element for microformats"""
             classes = el.get("class", [])
 
             # find potential microformats in root classnames h-*
@@ -425,7 +488,9 @@ def parse_el(el, ctx):
                 # find backcompat root classnames
                 potential_microformats = backcompat.root(classes)
                 if potential_microformats:
-                    result = handle_microformat(potential_microformats, el, backcompat_mode=True)
+                    result = handle_microformat(
+                        potential_microformats, el, backcompat_mode=True
+                    )
                     ctx.append(result)
                 else:
                     # parse child tags
@@ -439,21 +504,21 @@ def parse_el(el, ctx):
 
         # parse for rel values
         for el in get_descendents(self.__doc__):
-            if el.name in ('a', 'area', 'link') and el.has_attr('rel'):
+            if el.name in ("a", "area", "link") and el.has_attr("rel"):
                 parse_rels(el)
 
         # sort the rels array in rel-urls since this should be unordered set
         for url in self.__parsed__["rel-urls"]:
-            if 'rels' in self.__parsed__["rel-urls"][url]:
-                rels = self.__parsed__["rel-urls"][url]['rels']
-                self.__parsed__["rel-urls"][url]['rels'] =  unordered_list(rels)
+            if "rels" in self.__parsed__["rel-urls"][url]:
+                rels = self.__parsed__["rel-urls"][url]["rels"]
+                self.__parsed__["rel-urls"][url]["rels"] = unordered_list(rels)
 
         # add actual parser used to debug
         # uses builder.NAME from BeautifulSoup
         if self.__html_parser__:
             self.__parsed__["debug"]["markup parser"] = self.__html_parser__
         else:
-            self.__parsed__["debug"]["markup parser"] = 'unknown'
+            self.__parsed__["debug"]["markup parser"] = "unknown"
 
     def to_dict(self, filter_by_type=None):
         """Get a dictionary version of the parsed microformat document.
@@ -468,8 +533,7 @@ def to_dict(self, filter_by_type=None):
         if filter_by_type is None:
             return self.__parsed__
         else:
-            return [x for x in self.__parsed__['items']
-                    if filter_by_type in x['type']]
+            return [x for x in self.__parsed__["items"] if filter_by_type in x["type"]]
 
     def to_json(self, pretty_print=False, filter_by_type=None):
         """Get a json-encoding string version of the parsed microformats document
@@ -485,7 +549,8 @@ def to_json(self, pretty_print=False, filter_by_type=None):
         """
 
         if pretty_print:
-            return json.dumps(self.to_dict(filter_by_type), indent=4,
-                              separators=(', ', ': '))
+            return json.dumps(
+                self.to_dict(filter_by_type), indent=4, separators=(", ", ": ")
+            )
         else:
             return json.dumps(self.to_dict(filter_by_type))
diff --git a/mf2py/temp_fixes.py b/mf2py/temp_fixes.py
index 6d7da25..56c428e 100644
--- a/mf2py/temp_fixes.py
+++ b/mf2py/temp_fixes.py
@@ -1,3 +1,3 @@
 def rm_templates(doc):
-    for el in doc.find_all('template'):
+    for el in doc.find_all("template"):
         el.extract()
diff --git a/mf2py/value_class_pattern.py b/mf2py/value_class_pattern.py
index c30ee71..f7b53f6 100644
--- a/mf2py/value_class_pattern.py
+++ b/mf2py/value_class_pattern.py
@@ -1,51 +1,61 @@
 """functions to parse the properties of elements according to the value class pattern http://microformats.org/wiki/value-class-pattern """
 
 from .dom_helpers import get_children
-from .datetime_helpers import normalize_datetime, DATETIME_RE, TIME_RE, DATE_RE, TIMEZONE_RE
+from .datetime_helpers import (
+    normalize_datetime,
+    DATETIME_RE,
+    TIME_RE,
+    DATE_RE,
+    TIMEZONE_RE,
+)
 
 import re
 
+
 def _get_vcp_value(el):
-    if 'value-title' in el.get('class', []):
-        return el.get('title')
+    if "value-title" in el.get("class", []):
+        return el.get("title")
     return el.get_text()
 
 
 def _get_vcp_children(el):
-    return [c for c in get_children(el) if c.has_attr('class')
-            and ('value' in c['class'] or 'value-title' in c['class'])]
+    return [
+        c
+        for c in get_children(el)
+        if c.has_attr("class")
+        and ("value" in c["class"] or "value-title" in c["class"])
+    ]
 
-def text(el):
 
+def text(el):
     value_els = _get_vcp_children(el)
     if value_els:
-        return ''.join(_get_vcp_value(el) for el in value_els)
+        return "".join(_get_vcp_value(el) for el in value_els)
 
 
 def datetime(el, default_date=None):
-
     value_els = _get_vcp_children(el)
     if value_els:
         date_parts = []
         for value_el in value_els:
-            if 'value-title' in value_el.get('class', []):
-                title = el.get('title')
+            if "value-title" in value_el.get("class", []):
+                title = el.get("title")
                 if title:
                     date_parts.append(title.strip())
-            elif value_el.name in ('img', 'area'):
-                alt = value_el.get('alt') or value_el.get_text()
+            elif value_el.name in ("img", "area"):
+                alt = value_el.get("alt") or value_el.get_text()
                 if alt:
                     date_parts.append(alt.strip())
-            elif value_el.name == 'data':
-                val = value_el.get('value') or value_el.get_text()
+            elif value_el.name == "data":
+                val = value_el.get("value") or value_el.get_text()
                 if val:
                     date_parts.append(val.strip())
-            elif value_el.name == 'abbr':
-                title = value_el.get('title') or value_el.get_text()
+            elif value_el.name == "abbr":
+                title = value_el.get("title") or value_el.get_text()
                 if title:
                     date_parts.append(title.strip())
-            elif value_el.name in ('del', 'ins', 'time'):
-                dt = value_el.get('datetime') or value_el.get_text()
+            elif value_el.name in ("del", "ins", "time"):
+                dt = value_el.get("datetime") or value_el.get_text()
                 if dt:
                     date_parts.append(dt.strip())
             else:
@@ -56,18 +66,18 @@ def datetime(el, default_date=None):
         date_part = time_part = tz_part = None
 
         for part in date_parts:
-            match = re.match(DATETIME_RE + '$', part)
+            match = re.match(DATETIME_RE + "$", part)
             if match:
                 # if it's a full datetime, then we're done
-                date_part = match.group('date')
+                date_part = match.group("date")
                 return normalize_datetime(part, match=match), date_part
 
             # only use first found value
-            if re.match(TIME_RE + '$', part) and time_part is None:
+            if re.match(TIME_RE + "$", part) and time_part is None:
                 time_part = part
-            elif re.match(DATE_RE + '$', part) and date_part is None:
+            elif re.match(DATE_RE + "$", part) and date_part is None:
                 date_part = part
-            elif re.match(TIMEZONE_RE + '$', part) and tz_part is None:
+            elif re.match(TIMEZONE_RE + "$", part) and tz_part is None:
                 tz_part = part
 
         # use default date
@@ -75,8 +85,7 @@ def datetime(el, default_date=None):
             date_part = default_date
 
         if date_part and time_part:
-            date_time_value = '%s %s' % (date_part,
-                                         time_part)
+            date_time_value = "%s %s" % (date_part, time_part)
         else:
             date_time_value = date_part or time_part
 
@@ -84,4 +93,3 @@ def datetime(el, default_date=None):
             date_time_value += tz_part
 
         return normalize_datetime(date_time_value), date_part
-
diff --git a/test/test_parser.py b/test/test_parser.py
index 9115267..8eea8ca 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -10,11 +10,12 @@
 TestCase.maxDiff = None
 
 
-TEST_DIR = 'test/examples/'
+TEST_DIR = "test/examples/"
+
 
 def parse_fixture(path, url=None):
     with open(os.path.join(TEST_DIR, path)) as f:
-        p = Parser(doc=f, url=url, html_parser='html5lib')
+        p = Parser(doc=f, url=url, html_parser="html5lib")
         return p.to_dict()
 
 
@@ -25,48 +26,50 @@ def test_empty():
 
 
 def test_open_file():
-    with open(os.path.join(TEST_DIR, 'empty.html')) as f:
+    with open(os.path.join(TEST_DIR, "empty.html")) as f:
         p = Parser(doc=f)
 
     assert p.__doc__ is not None
     assert type(p) is not None
     assert type(p.to_dict()) is dict
 
+
 def test_doc_tag():
     # test that strings, BS doc and BS tags are all parsed
-    doc = '''<article class="h-entry"></article>'''
-    soup = BeautifulSoup(doc, 'html5lib')
+    doc = """<article class="h-entry"></article>"""
+    soup = BeautifulSoup(doc, "html5lib")
     parse_string = Parser(doc).to_dict()
-    assert 'h-entry' in parse_string['items'][0]['type']
+    assert "h-entry" in parse_string["items"][0]["type"]
     parse_doc = Parser(soup).to_dict()
-    assert 'h-entry' in parse_doc['items'][0]['type']
+    assert "h-entry" in parse_doc["items"][0]["type"]
     parse_tag = Parser(soup.article).to_dict()
-    assert 'h-entry' in parse_tag['items'][0]['type']
+    assert "h-entry" in parse_tag["items"][0]["type"]
+
 
-@mock.patch('requests.get')
+@mock.patch("requests.get")
 def test_user_agent(getter):
-    ua_expect = 'mf2py - microformats2 parser for python'
+    ua_expect = "mf2py - microformats2 parser for python"
     assert Parser.useragent.startswith(ua_expect)
 
     resp = mock.MagicMock()
-    resp.content = b''
-    resp.text = ''
+    resp.content = b""
+    resp.text = ""
     resp.headers = {}
     getter.return_value = resp
 
-    Parser(url='http://example.com')
-    getter.assert_called_with('http://example.com', headers={
-        'User-Agent': Parser.useragent
-    })
+    Parser(url="http://example.com")
+    getter.assert_called_with(
+        "http://example.com", headers={"User-Agent": Parser.useragent}
+    )
 
-    Parser.useragent = 'something else'
-    assert Parser.useragent == 'something else'
+    Parser.useragent = "something else"
+    assert Parser.useragent == "something else"
     # set back to default. damn stateful classes
-    Parser.useragent = 'mf2py - microformats2 parser for python'
+    Parser.useragent = "mf2py - microformats2 parser for python"
 
 
 def test_base():
-    with open(os.path.join(TEST_DIR, 'base.html')) as f:
+    with open(os.path.join(TEST_DIR, "base.html")) as f:
         p = Parser(doc=f)
 
     assert p.__url__ == "http://tantek.com/"
@@ -74,23 +77,23 @@ def test_base():
 
 def test_simple_parse():
     result = parse_fixture("simple_person_reference.html")
-    assert result["items"][0]["properties"] == {'name': ['Frances Berriman']}
+    assert result["items"][0]["properties"] == {"name": ["Frances Berriman"]}
 
 
 def test_simple_person_reference_same_element():
     result = parse_fixture("simple_person_reference_same_element.html")
-    assert result["items"][0]["properties"] == {'name': ['Frances Berriman']}
+    assert result["items"][0]["properties"] == {"name": ["Frances Berriman"]}
 
 
 def test_person_with_url():
     result = parse_fixture("person_with_url.html")
-    assert result["items"][0]["properties"]["name"] == ['Tom Morris']
-    assert result["items"][0]["properties"]["url"] == ['http://tommorris.org/']
+    assert result["items"][0]["properties"]["name"] == ["Tom Morris"]
+    assert result["items"][0]["properties"]["url"] == ["http://tommorris.org/"]
 
 
 def test_vcp():
     result = parse_fixture("value_class_person.html")
-    assert result["items"][0]["properties"]["tel"] == ['+44 1234 567890']
+    assert result["items"][0]["properties"]["tel"] == ["+44 1234 567890"]
 
 
 def test_multiple_root_classnames():
@@ -105,9 +108,20 @@ def test_property_nested_microformat():
 
     assert len(result["items"]) == 1
     assert "author" in result["items"][0]["properties"]
-    assert result["items"][0]["properties"]["author"][0]["properties"]["name"][0] == "Tom Morris"
-    assert result["items"][0]["properties"]["reviewer"][0]["properties"]["name"][0] == "Tom Morris"
-    assert result["items"][0]["properties"]["author"][0]["properties"]["adr"][0]["properties"]["city"][0] == "London"
+    assert (
+        result["items"][0]["properties"]["author"][0]["properties"]["name"][0]
+        == "Tom Morris"
+    )
+    assert (
+        result["items"][0]["properties"]["reviewer"][0]["properties"]["name"][0]
+        == "Tom Morris"
+    )
+    assert (
+        result["items"][0]["properties"]["author"][0]["properties"]["adr"][0][
+            "properties"
+        ]["city"][0]
+        == "London"
+    )
 
 
 def test_plain_child_microformat():
@@ -130,7 +144,7 @@ def test_datetime_parsing():
 
 def test_datetime_vcp_parsing():
     result = parse_fixture("datetimes.html")
-    assert len(result['items']) == 16
+    assert len(result["items"]) == 16
     assert result["items"][1]["properties"]["published"][0] == "3014-01-01 01:21Z"
     assert result["items"][2]["properties"]["updated"][0] == "2014-03-11 09:55"
     assert result["items"][3]["properties"]["published"][0] == "2014-01-30 15:28"
@@ -147,6 +161,8 @@ def test_datetime_vcp_parsing():
     assert result["items"][13]["properties"]["start"][0] == "2014-06-01 12:30+6:00"
     assert result["items"][14]["properties"]["start"][0] == "2014-06-01 12:30Z"
     assert result["items"][15]["properties"]["start"][0] == "2014-06-01 12:30-6:00"
+
+
 def test_dt_end_implied_date():
     """Test that events with dt-start and dt-end use the implied date rule
     http://microformats.org/wiki/value-class-pattern#microformats2_parsers
@@ -162,148 +178,169 @@ def test_dt_end_implied_date():
     assert event_w_tz["properties"]["end"][0] == "2014-06-01 19:30-06:00"
 
 
-
 def test_embedded_parsing():
     result = parse_fixture("embedded.html")
-    assert result["items"][0]["properties"]["content"][0]["html"] == '<p>Blah blah blah blah blah.</p>\n   <p>Blah.</p>\n   <p>Blah blah blah.</p>'
-    assert result["items"][0]["properties"]["content"][0]["value"] == 'Blah blah blah blah blah.\nBlah.\nBlah blah blah.'
+    assert (
+        result["items"][0]["properties"]["content"][0]["html"]
+        == "<p>Blah blah blah blah blah.</p>\n   <p>Blah.</p>\n   <p>Blah blah blah.</p>"
+    )
+    assert (
+        result["items"][0]["properties"]["content"][0]["value"]
+        == "Blah blah blah blah blah.\nBlah.\nBlah blah blah."
+    )
 
 
 def test_hoisting_nested_hcard():
     result = parse_fixture("nested_hcards.html")
     expected = [
-            {
-                'properties': {
-                    'author': [
-                        {
-                            'properties': {'name': ['KP1']},
-                            'type': ['h-card'],
-                            'value': 'KP1'
-                        }
-                    ],
-                    'in-reply-to': [
-                        {
-                            'properties': {'name': ['KP']},
-                            'type': ['h-cite'],
-                            'value': 'KP'
-                        }
-                    ],
-                },
-                'type': ['h-entry']
-            }
-        ]
-    assert expected == result['items']
+        {
+            "properties": {
+                "author": [
+                    {
+                        "properties": {"name": ["KP1"]},
+                        "type": ["h-card"],
+                        "value": "KP1",
+                    }
+                ],
+                "in-reply-to": [
+                    {"properties": {"name": ["KP"]}, "type": ["h-cite"], "value": "KP"}
+                ],
+            },
+            "type": ["h-entry"],
+        }
+    ]
+    assert expected == result["items"]
 
 
 def test_html_tag_class():
     result = parse_fixture("hfeed_on_html_tag.html")
-    assert ['h-feed'] == result['items'][0]['type']
+    assert ["h-feed"] == result["items"][0]["type"]
 
-    assert ['entry1'] == result['items'][0]['children'][0]['properties']['name']
-    assert ['entry2'] == result['items'][0]['children'][1]['properties']['name']
+    assert ["entry1"] == result["items"][0]["children"][0]["properties"]["name"]
+    assert ["entry2"] == result["items"][0]["children"][1]["properties"]["name"]
 
 
 def test_string_strip():
     result = parse_fixture("string_stripping.html")
-    assert 'Tom Morris' == result["items"][0]["properties"]["name"][0]
+    assert "Tom Morris" == result["items"][0]["properties"]["name"][0]
 
 
 def test_template_parse():
     result = parse_fixture("template_tag.html")
     assert 0 == len(result["items"])
 
+
 def test_template_tag_inside_e_value():
     result = parse_fixture("template_tag_inside_e_value.html")
-    assert "This is a Test with a <code>template</code> tag after this:" == result['items'][0]['properties']['content'][0]['html']
-    assert "This is a Test with a template tag after this:" == result['items'][0]['properties']['content'][0]['value']
+    assert (
+        "This is a Test with a <code>template</code> tag after this:"
+        == result["items"][0]["properties"]["content"][0]["html"]
+    )
+    assert (
+        "This is a Test with a template tag after this:"
+        == result["items"][0]["properties"]["content"][0]["value"]
+    )
+
 
 def test_ordering_dedup():
-    ''' test that classes are dedeuped and alphabetically ordered '''
+    """test that classes are dedeuped and alphabetically ordered"""
 
     result = parse_fixture("ordering_dedup.html")
-    item = result['items'][0]
-    assert ['h-entry', 'h-feed', 'h-product', 'h-x-test'] == item['type']
-    assert ['example.com', 'example.com/2'] == item['properties']['url']
-    assert ['name', 'URL name'] == item['properties']['name']
-    assert ['author', 'bookmark', 'me'] == result['rel-urls']['example.com/rel']['rels']
-    assert 'de' == result['rel-urls']['example.com/lang']['hreflang']
+    item = result["items"][0]
+    assert ["h-entry", "h-feed", "h-product", "h-x-test"] == item["type"]
+    assert ["example.com", "example.com/2"] == item["properties"]["url"]
+    assert ["name", "URL name"] == item["properties"]["name"]
+    assert ["author", "bookmark", "me"] == result["rel-urls"]["example.com/rel"]["rels"]
+    assert "de" == result["rel-urls"]["example.com/lang"]["hreflang"]
+
 
 def test_class_names_format():
-    ''' test that only classes with letters and possibly numbers in the vendor prefix part are used '''
+    """test that only classes with letters and possibly numbers in the vendor prefix part are used"""
 
     result = parse_fixture("class_names_format.html")
-    item = result['items'][0]
-    assert ['h-feed', 'h-p3k-entry', 'h-x-test'] == item['type']
-    assert 'url' in item['properties']
-    assert 'p3k-url' in item['properties']
-    assert 'Url' not in item['properties']
-    assert '-url' not in item['properties']
-    assert 'url-' not in item['properties']
-
-    assert 'name' in item['properties']
-    assert 'p3k-name' in item['properties']
-    assert 'nAme' not in item['properties']
-    assert '-name' not in item['properties']
-    assert 'name-' not in item['properties']
+    item = result["items"][0]
+    assert ["h-feed", "h-p3k-entry", "h-x-test"] == item["type"]
+    assert "url" in item["properties"]
+    assert "p3k-url" in item["properties"]
+    assert "Url" not in item["properties"]
+    assert "-url" not in item["properties"]
+    assert "url-" not in item["properties"]
+
+    assert "name" in item["properties"]
+    assert "p3k-name" in item["properties"]
+    assert "nAme" not in item["properties"]
+    assert "-name" not in item["properties"]
+    assert "name-" not in item["properties"]
+
 
 def test_area_uparsing():
     result = parse_fixture("area.html")
-    assert {'url': ['http://suda.co.uk'], 'name': ['Brian Suda']} == result["items"][0]["properties"]
-    assert 'shape' in result["items"][0]
-    assert 'coords' in result["items"][0]
+    assert {"url": ["http://suda.co.uk"], "name": ["Brian Suda"]} == result["items"][0][
+        "properties"
+    ]
+    assert "shape" in result["items"][0]
+    assert "coords" in result["items"][0]
 
 
 def test_src_equiv():
     result = parse_fixture("test_src_equiv.html")
     for item in result["items"]:
-        assert 'x-example' in item['properties']
-        assert 'http://example.org/' == item['properties']['x-example'][0]
+        assert "x-example" in item["properties"]
+        assert "http://example.org/" == item["properties"]["x-example"][0]
 
 
 def test_rels():
     result = parse_fixture("rel.html")
     assert {
-        u'in-reply-to': [u'http://example.com/1', u'http://example.com/2'],
-        u'author': [u'http://example.com/a', u'http://example.com/b'],
-        u'alternate': [u'http://example.com/fr'],
-        u'home': [u'http://example.com/fr'],
-    } == result['rels']
+        "in-reply-to": ["http://example.com/1", "http://example.com/2"],
+        "author": ["http://example.com/a", "http://example.com/b"],
+        "alternate": ["http://example.com/fr"],
+        "home": ["http://example.com/fr"],
+    } == result["rels"]
     assert {
-        u'http://example.com/1': {'text': u"post 1", "rels": [u'in-reply-to']},
-        u'http://example.com/2': {'text': u"post 2", "rels": [u'in-reply-to']},
-        u'http://example.com/a': {'text': u"author a", "rels": [u'author']},
-        u'http://example.com/b': {'text': u"author b", "rels": [u'author']},
-        u'http://example.com/fr': {'text': u'French mobile homepage',
-                                   u'media': u'handheld',
-                                   u'rels': [u'alternate', u'home'],
-                                   u'hreflang': u'fr'}
-    } == result['rel-urls']
+        "http://example.com/1": {"text": "post 1", "rels": ["in-reply-to"]},
+        "http://example.com/2": {"text": "post 2", "rels": ["in-reply-to"]},
+        "http://example.com/a": {"text": "author a", "rels": ["author"]},
+        "http://example.com/b": {"text": "author b", "rels": ["author"]},
+        "http://example.com/fr": {
+            "text": "French mobile homepage",
+            "media": "handheld",
+            "rels": ["alternate", "home"],
+            "hreflang": "fr",
+        },
+    } == result["rel-urls"]
 
 
 def test_alternates():
     result = parse_fixture("rel.html")
-    assert [{
-        'url': 'http://example.com/fr', 'media': 'handheld',
-        'text': 'French mobile homepage',
-        'rel': 'home', 'hreflang': 'fr'
-    }] == result['alternates']
+    assert [
+        {
+            "url": "http://example.com/fr",
+            "media": "handheld",
+            "text": "French mobile homepage",
+            "rel": "home",
+            "hreflang": "fr",
+        }
+    ] == result["alternates"]
 
 
 def test_enclosures():
     result = parse_fixture("rel_enclosure.html")
-    assert {'enclosure': ['http://example.com/movie.mp4']} == result['rels']
-    assert {'http://example.com/movie.mp4': {
-        'rels': ['enclosure'],
-        'text': 'my movie',
-        'type': 'video/mpeg'}
-    } == result['rel-urls']
+    assert {"enclosure": ["http://example.com/movie.mp4"]} == result["rels"]
+    assert {
+        "http://example.com/movie.mp4": {
+            "rels": ["enclosure"],
+            "text": "my movie",
+            "type": "video/mpeg",
+        }
+    } == result["rel-urls"]
 
 
 def test_empty_href():
     result = parse_fixture("hcard_with_empty_url.html", "http://foo.com")
 
-    for hcard in result['items']:
-        assert ['http://foo.com'] == hcard['properties']['url']
+    for hcard in result["items"]:
+        assert ["http://foo.com"] == hcard["properties"]["url"]
 
 
 def test_link_with_u_url():
@@ -316,11 +353,18 @@ def test_link_with_u_url():
         },
     } == result["items"][0]
 
+
 def test_broken_url():
     result = parse_fixture("broken_url.html", "http://example.com")
-    assert result["items"][0]["properties"]["relative"][0] == "http://example.com/foo.html"
+    assert (
+        result["items"][0]["properties"]["relative"][0] == "http://example.com/foo.html"
+    )
     assert result["items"][0]["properties"]["url"][0] == "http://www.[w3.org/"
-    assert result["items"][0]["properties"]["photo"][0] == "http://www.w3].org/20[08/site/images/logo-w3c-mobile-lg"
+    assert (
+        result["items"][0]["properties"]["photo"][0]
+        == "http://www.w3].org/20[08/site/images/logo-w3c-mobile-lg"
+    )
+
 
 def test_complex_e_content():
     """When parsing h-* e-* properties, we should fold {"value":..., "html":...}
@@ -332,17 +376,15 @@ def test_complex_e_content():
     assert {
         "type": ["h-entry"],
         "properties": {
-            "content": [{
-                "type": [
-                    "h-card"
-                ],
-                "properties": {
-                    "name": ["Hello"]
-                },
-                "html": "<p>Hello</p>",
-                "value": "Hello"
-            }],
-        }
+            "content": [
+                {
+                    "type": ["h-card"],
+                    "properties": {"name": ["Hello"]},
+                    "html": "<p>Hello</p>",
+                    "value": "Hello",
+                }
+            ],
+        },
     } == result["items"][0]
 
 
@@ -353,34 +395,35 @@ def test_nested_values():
     entry = result["items"][0]
 
     assert {
-        'properties': {
-            'name': ['Kyle'],
-            'url': ['http://about.me/kyle'],
+        "properties": {
+            "name": ["Kyle"],
+            "url": ["http://about.me/kyle"],
         },
-        'value': 'Kyle',
-        'type': ['h-card'],
+        "value": "Kyle",
+        "type": ["h-card"],
     } == entry["properties"]["author"][0]
 
     assert {
-        'properties': {
-            'name': ['foobar'],
-            'url': ['http://example.com/foobar'],
+        "properties": {
+            "name": ["foobar"],
+            "url": ["http://example.com/foobar"],
         },
-        'value': 'http://example.com/foobar',
-        'type': ['h-cite'],
+        "value": "http://example.com/foobar",
+        "type": ["h-cite"],
     } == entry["properties"]["like-of"][0]
 
     assert {
-        'properties': {
-            'name': ['George'],
-            'url': ['http://people.com/george'],
+        "properties": {
+            "name": ["George"],
+            "url": ["http://people.com/george"],
         },
-        'type': ['h-card'],
+        "type": ["h-card"],
     } == entry["children"][0]
 
 
 # implied properties tests
 
+
 def test_implied_name():
     result = parse_fixture("implied_properties/implied_properties.html")
 
@@ -389,15 +432,17 @@ def test_implied_name():
 
 
 def test_implied_url():
-    result = parse_fixture("implied_properties/implied_properties.html", url="http://foo.com/")
+    result = parse_fixture(
+        "implied_properties/implied_properties.html", url="http://foo.com/"
+    )
     assert result["items"][1]["properties"]["url"][0] == "http://tommorris.org/"
     # img should not have a "url" property
     assert "url" not in result["items"][4]["properties"]
     # href="" is relative to the base url
     assert result["items"][5]["properties"]["url"][0] == "http://foo.com/"
 
-def test_implied_photo():
 
+def test_implied_photo():
     result = parse_fixture("implied_properties/implied_photo.html")
 
     for i in range(12):
@@ -409,8 +454,8 @@ def test_implied_photo():
     for i in range(12, 23):
         assert "photo" not in result["items"][i]["properties"]
 
-def test_implied_url():
 
+def test_implied_url():
     result = parse_fixture("implied_properties/implied_url.html")
 
     for i in range(12):
@@ -422,6 +467,7 @@ def test_implied_url():
     for i in range(12, 23):
         assert "url" not in result["items"][i]["properties"]
 
+
 def test_stop_implied_url():
     """testing that explicit properties case implied url-parsing to be aborted"""
 
@@ -439,11 +485,22 @@ def test_stop_implied_url():
     assert result["items"][8]["properties"]["url"] == ["http://example.com/"]
     assert result["items"][9]["properties"]["url"] == ["http://example.com/"]
 
+
 def test_implied_nested_photo():
-    result = parse_fixture("implied_properties/implied_properties.html", url="http://bar.org")
-    assert result["items"][2]["properties"]["photo"][0] == {"alt": "", "value": "http://tommorris.org/photo.png"}
-    assert result["items"][3]["properties"]["photo"][0] == "http://tommorris.org/photo.png"
-    assert result["items"][4]["properties"]["photo"][0] == {"alt": "Tom Morris", "value": "http://tommorris.org/photo.png"}
+    result = parse_fixture(
+        "implied_properties/implied_properties.html", url="http://bar.org"
+    )
+    assert result["items"][2]["properties"]["photo"][0] == {
+        "alt": "",
+        "value": "http://tommorris.org/photo.png",
+    }
+    assert (
+        result["items"][3]["properties"]["photo"][0] == "http://tommorris.org/photo.png"
+    )
+    assert result["items"][4]["properties"]["photo"][0] == {
+        "alt": "Tom Morris",
+        "value": "http://tommorris.org/photo.png",
+    }
     # src="" is relative to the base url
     assert result["items"][6]["properties"]["photo"][0] == "http://bar.org"
 
@@ -455,65 +512,78 @@ def test_implied_nested_photo_alt_name():
 
 def test_implied_image():
     result = parse_fixture("implied_properties/implied_properties.html")
-    assert result["items"][4]["properties"]["photo"][0] == {"alt": "Tom Morris", "value": "http://tommorris.org/photo.png"}
+    assert result["items"][4]["properties"]["photo"][0] == {
+        "alt": "Tom Morris",
+        "value": "http://tommorris.org/photo.png",
+    }
     assert result["items"][4]["properties"]["name"][0] == "Tom Morris"
 
+
 def test_implied_name_empty_alt():
     """An empty alt text should not prevent us from including other
     children in the implied name.
     """
 
     result = parse_fixture("implied_properties/implied_name_empty_alt.html")
-    hcard = result['items'][0]
+    hcard = result["items"][0]
 
     assert {
-        'type': ['h-card'],
-        'properties': {
-            'name': ['@kylewmahan'],
-            'url': ['https://twitter.com/kylewmahan'],
-            'photo': [{'alt': '', 'value': 'https://example.org/test.jpg'}],
+        "type": ["h-card"],
+        "properties": {
+            "name": ["@kylewmahan"],
+            "url": ["https://twitter.com/kylewmahan"],
+            "photo": [{"alt": "", "value": "https://example.org/test.jpg"}],
         },
     } == hcard
 
+
 def test_relative_datetime():
     result = parse_fixture("implied_properties/implied_relative_datetimes.html")
-    assert result[u'items'][0][u'properties'][u'updated'][0] == '2015-01-02 05:06'
+    assert result["items"][0]["properties"]["updated"][0] == "2015-01-02 05:06"
+
 
 def test_stop_implied_name_nested_h():
     result = parse_fixture("implied_properties/stop_implied_name_nested_h.html")
-    assert 'name' not in result[u'items'][0][u'properties']
+    assert "name" not in result["items"][0]["properties"]
+
 
 def test_stop_implied_name_e_content():
     result = parse_fixture("implied_properties/stop_implied_name_e_content.html")
-    assert 'name' not in result[u'items'][0][u'properties']
+    assert "name" not in result["items"][0]["properties"]
+
 
 def test_stop_implied_name_p_content():
     result = parse_fixture("implied_properties/stop_implied_name_p_content.html")
-    assert 'name' not in result[u'items'][0][u'properties']
+    assert "name" not in result["items"][0]["properties"]
+
 
 def test_implied_properties_silo_pub():
-    result = parse_fixture('implied_properties/implied_properties_silo_pub.html')
-    item = result['items'][0]
+    result = parse_fixture("implied_properties/implied_properties_silo_pub.html")
+    item = result["items"][0]
 
-    #implied_name = item['properties']['name'][0]
-    #implied_name = re.sub('\s+', ' ', implied_name).strip()
-    #assert '@kylewmahan on Twitter', implied_name)
+    # implied_name = item['properties']['name'][0]
+    # implied_name = re.sub('\s+', ' ', implied_name).strip()
+    # assert '@kylewmahan on Twitter', implied_name)
 
     # no implied name expected under new rules
 
-    assert 'name' not in item[u'properties']
+    assert "name" not in item["properties"]
+
 
 def test_simple_person_reference_implied():
     result = parse_fixture("implied_properties/simple_person_reference_implied.html")
-    assert result["items"][0]["properties"] == {'name': ['Frances Berriman']}
+    assert result["items"][0]["properties"] == {"name": ["Frances Berriman"]}
 
 
 def test_implied_name_alt():
     result = parse_fixture("implied_properties/implied_name_alt.html")
-    assert result["items"][0]["children"][0] == \
-                 {'type': ['h-card'],
-                  'properties': {'name': ['Avatar of Stephen'],
-                                 'photo': [{'alt': 'Avatar of', 'value': 'avatar.jpg'}]}}
+    assert result["items"][0]["children"][0] == {
+        "type": ["h-card"],
+        "properties": {
+            "name": ["Avatar of Stephen"],
+            "photo": [{"alt": "Avatar of", "value": "avatar.jpg"}],
+        },
+    }
 
 
 def test_value_name_whitespace():
@@ -528,291 +598,396 @@ def test_value_name_whitespace():
         assert result["items"][i]["properties"]["name"][0] == "Hello\nWorld"
 
     for i in range(8, 10):
-        assert result["items"][i]["properties"]["content"][0]["value"] == "One\nTwo\nThree"
+        assert (
+            result["items"][i]["properties"]["content"][0]["value"] == "One\nTwo\nThree"
+        )
         assert result["items"][i]["properties"]["name"][0] == "One\nTwo\nThree"
 
-    assert result["items"][10]["properties"]["content"][0]["value"] == "Hello World      one\n      two\n      three\n    "
-    assert result["items"][10]["properties"]["name"][0] == "Hello World      one\n      two\n      three\n    "
-
-    assert result["items"][11]["properties"]["content"][0]["value"] == "Correct name Correct summary"
+    assert (
+        result["items"][10]["properties"]["content"][0]["value"]
+        == "Hello World      one\n      two\n      three\n    "
+    )
+    assert (
+        result["items"][10]["properties"]["name"][0]
+        == "Hello World      one\n      two\n      three\n    "
+    )
+
+    assert (
+        result["items"][11]["properties"]["content"][0]["value"]
+        == "Correct name Correct summary"
+    )
     assert result["items"][11]["properties"]["name"][0] == "Correct name"
 
+
 # backcompat tests
 
+
 def test_backcompat_hentry():
     result = parse_fixture("backcompat/hentry.html")
-    assert 'h-entry' in result['items'][0]['type']
-    assert 'Tom Morris' == result['items'][0]['properties']['author'][0]['properties']['name'][0]
-    assert 'A Title' == result['items'][0]['properties']['name'][0]
-    assert 'Some Content' == result['items'][0]['properties']['content'][0]['value']
+    assert "h-entry" in result["items"][0]["type"]
+    assert (
+        "Tom Morris"
+        == result["items"][0]["properties"]["author"][0]["properties"]["name"][0]
+    )
+    assert "A Title" == result["items"][0]["properties"]["name"][0]
+    assert "Some Content" == result["items"][0]["properties"]["content"][0]["value"]
+
 
 def test_backcompat_hproduct():
     result = parse_fixture("backcompat/hproduct.html")
     assert 1 == len(result["items"])
     assert ["h-product"] == result["items"][0]["type"]
-    assert ['bullshit'] == result["items"][0]["properties"]["category"]
-    assert ['Quacktastic Products'] == result["items"][0]["properties"]["brand"]
-    assert ['#BULLSHIT-001'] == result["items"][0]["properties"]["identifier"]
-    assert "Magical tasty sugar pills that don't do anything." == result["items"][0]["properties"]['description'][0]
+    assert ["bullshit"] == result["items"][0]["properties"]["category"]
+    assert ["Quacktastic Products"] == result["items"][0]["properties"]["brand"]
+    assert ["#BULLSHIT-001"] == result["items"][0]["properties"]["identifier"]
+    assert (
+        "Magical tasty sugar pills that don't do anything."
+        == result["items"][0]["properties"]["description"][0]
+    )
     assert ["Tom's Magical Quack Tincture"] == result["items"][0]["properties"]["name"]
 
 
 def test_backcompat_hproduct_nested_hreview():
     result = parse_fixture("backcompat/hproduct_hreview_nested.html")
-    assert ['h-review'] == result["items"][0]["children"][0]['type']
+    assert ["h-review"] == result["items"][0]["children"][0]["type"]
+
 
 def test_backcompat_hreview_nested_card_event_product():
     result = parse_fixture("backcompat/hreview_nested_card_event_product.html")
-    assert ['h-review'] == result["items"][0]['type']
-    items = result["items"][0]["properties"]['item']
+    assert ["h-review"] == result["items"][0]["type"]
+    items = result["items"][0]["properties"]["item"]
     assert 3 == len(items)
 
     event = items[0]
-    assert ['h-event'] == event['type']
-    assert ['http://example.com/event-url'] == event['properties']['url']
-    assert ['event name'] == event['properties']['name']
+    assert ["h-event"] == event["type"]
+    assert ["http://example.com/event-url"] == event["properties"]["url"]
+    assert ["event name"] == event["properties"]["name"]
 
     card = items[1]
-    assert ['h-card'] == card['type']
-    assert ['http://example.com/card-url'] == card['properties']['url']
-    assert ['card name'] == card['properties']['name']
+    assert ["h-card"] == card["type"]
+    assert ["http://example.com/card-url"] == card["properties"]["url"]
+    assert ["card name"] == card["properties"]["name"]
 
     product = items[2]
-    assert ['h-product'] == product['type']
-    assert ['http://example.com/product-url'] == product['properties']['url']
-    assert ['product name'] == product['properties']['name']
+    assert ["h-product"] == product["type"]
+    assert ["http://example.com/product-url"] == product["properties"]["url"]
+    assert ["product name"] == product["properties"]["name"]
 
 
 def test_backcompat_rel_bookmark():
     """Confirm that rel=bookmark inside of an h-entry is converted
     to u-url.
     """
-    result = parse_fixture('backcompat/feed_with_rel_bookmark.html')
-    for ii, url in enumerate((
-            '/2014/11/24/jump-rope',
-            '/2014/11/23/graffiti',
-            '/2014/11/21/earth',
-            '/2014/11/19/labor',
-    )):
-        assert ['h-entry'] == result['items'][ii]['type']
-        assert [url] == result['items'][ii]['properties']['url']
+    result = parse_fixture("backcompat/feed_with_rel_bookmark.html")
+    for ii, url in enumerate(
+        (
+            "/2014/11/24/jump-rope",
+            "/2014/11/23/graffiti",
+            "/2014/11/21/earth",
+            "/2014/11/19/labor",
+        )
+    ):
+        assert ["h-entry"] == result["items"][ii]["type"]
+        assert [url] == result["items"][ii]["properties"]["url"]
+
 
 def test_backcompat_rel_bookmark():
     """Confirm that rel=bookmark inside of an hentry and hreview is converted
     to a u-url and original u-url is ignored
     """
 
-    tests = ['backcompat/hentry_with_rel_bookmark.html', 'backcompat/hreview_with_rel_tag_bookmark.html']
+    tests = [
+        "backcompat/hentry_with_rel_bookmark.html",
+        "backcompat/hreview_with_rel_tag_bookmark.html",
+    ]
 
     results = [parse_fixture(x) for x in tests]
 
     for result in results:
-        assert ['https://example.com/bookmark', 'https://example.com/bookmark-url'] == result['items'][0]['properties']['url']
+        assert [
+            "https://example.com/bookmark",
+            "https://example.com/bookmark-url",
+        ] == result["items"][0]["properties"]["url"]
+
 
 def test_backcompat_rel_tag():
     """Confirm that rel=tag inside of an hentry is converted
     to a p-category and the last path segment of the href is used.
     """
 
-    tests = ['backcompat/hentry_with_rel_tag.html', 'backcompat/hfeed_with_rel_tag.html', 'backcompat/hrecipe_with_rel_tag.html', 'backcompat/hreview_with_rel_tag_bookmark.html']
+    tests = [
+        "backcompat/hentry_with_rel_tag.html",
+        "backcompat/hfeed_with_rel_tag.html",
+        "backcompat/hrecipe_with_rel_tag.html",
+        "backcompat/hreview_with_rel_tag_bookmark.html",
+    ]
 
     results = [parse_fixture(x) for x in tests]
     for result in results:
-        assert ['cat', 'dog', 'mountain lion', 'mouse', 'meerkat'] == result['items'][0]['properties']['category']
+        assert ["cat", "dog", "mountain lion", "mouse", "meerkat"] == result["items"][
+            0
+        ]["properties"]["category"]
+
 
 def test_backcompat_rel_tag_entry_title():
-    """Confirm that other backcompat properties on a rel=tag are parsed
-    """
+    """Confirm that other backcompat properties on a rel=tag are parsed"""
+
+    result = parse_fixture("backcompat/hentry_with_rel_tag_entry_title.html")
+    assert ["cat"] == result["items"][0]["properties"]["category"]
+    assert ["rhinoceros"] == result["items"][0]["properties"]["name"]
 
-    result = parse_fixture('backcompat/hentry_with_rel_tag_entry_title.html')
-    assert ['cat'] == result['items'][0]['properties']['category']
-    assert ['rhinoceros'] == result['items'][0]['properties']['name']
 
 def test_backcompat_rel_multiple_root():
     """Confirm that rel=tag and rel=bookmark inside of an hentry+hreview is parsed correctly"""
 
-    result = parse_fixture('backcompat/hreview_hentry_with_rel_tag_bookmark.html')
+    result = parse_fixture("backcompat/hreview_hentry_with_rel_tag_bookmark.html")
+
+    assert len(result["items"]) == 1
+    assert "h-entry" in result["items"][0]["type"]
+    assert "h-review" in result["items"][0]["type"]
 
-    assert len(result['items']) == 1
-    assert 'h-entry' in result['items'][0]['type']
-    assert 'h-review' in result['items'][0]['type']
+    assert ["cat", "dog", "mountain lion", "mouse", "meerkat"] == result["items"][0][
+        "properties"
+    ]["category"]
+    assert [
+        "https://example.com/bookmark",
+        "https://example.com/bookmark-url",
+    ] == result["items"][0]["properties"]["url"]
 
-    assert ['cat', 'dog', 'mountain lion', 'mouse', 'meerkat'] == result['items'][0]['properties']['category']
-    assert ['https://example.com/bookmark', 'https://example.com/bookmark-url'] == result['items'][0]['properties']['url']
 
 def test_backcompat_ignore_mf1_root_if_mf2_present():
-    """Confirm that mf1 root class is ignored if another mf2 root class is present.
-    """
-    result = parse_fixture('backcompat/ignore_mf1_root_if_mf2_present.html')
-    assert 'h-entry' not in result['items'][0]['type']
-    assert 'h-event' in result['items'][0]['type']
+    """Confirm that mf1 root class is ignored if another mf2 root class is present."""
+    result = parse_fixture("backcompat/ignore_mf1_root_if_mf2_present.html")
+    assert "h-entry" not in result["items"][0]["type"]
+    assert "h-event" in result["items"][0]["type"]
+
 
 def test_backcompat_no_implied_properties_mf1_root():
-    """Confirm that mf1 root class does not have implied properties
-    """
-    result = parse_fixture('backcompat/ignore_mf1_root_if_mf2_present.html')
-    assert 'h-entry' not in result['items'][0]['properties']
-    assert 'name' not in result['items'][0]['type']
-    assert 'url' not in result['items'][0]['properties']
-    assert 'photo' not in result['items'][0]['properties']
+    """Confirm that mf1 root class does not have implied properties"""
+    result = parse_fixture("backcompat/ignore_mf1_root_if_mf2_present.html")
+    assert "h-entry" not in result["items"][0]["properties"]
+    assert "name" not in result["items"][0]["type"]
+    assert "url" not in result["items"][0]["properties"]
+    assert "photo" not in result["items"][0]["properties"]
+
 
 def test_backcompat_ignore_mf2_properties_in_mf1_root():
-    """Confirm that mf2 properties are ignored in mf1 root class
-    """
-    result = parse_fixture('backcompat/ignore_mf2_properties_in_mf1_root.html')
-    assert 'Correct name' == result['items'][0]['properties']['name'][0]
-    assert 'Correct summary' == result['items'][0]['properties']['summary'][0]
+    """Confirm that mf2 properties are ignored in mf1 root class"""
+    result = parse_fixture("backcompat/ignore_mf2_properties_in_mf1_root.html")
+    assert "Correct name" == result["items"][0]["properties"]["name"][0]
+    assert "Correct summary" == result["items"][0]["properties"]["summary"][0]
+
 
 def test_backcompat_ignore_mf1_properties_in_mf2_root():
-    """Confirm that mf1 properties are ignored in mf2 root class
-    """
-    result = parse_fixture('backcompat/ignore_mf1_properties_in_mf2_root.html')
-    assert 'Correct name' == result['items'][0]['properties']['name'][0]
-    assert 'Correct summary' == result['items'][0]['properties']['summary'][0]
+    """Confirm that mf1 properties are ignored in mf2 root class"""
+    result = parse_fixture("backcompat/ignore_mf1_properties_in_mf2_root.html")
+    assert "Correct name" == result["items"][0]["properties"]["name"][0]
+    assert "Correct summary" == result["items"][0]["properties"]["summary"][0]
+
 
 def test_backcompat_nested_mf2_in_mf1():
-    """Confirm that mf2 roots nested inside mf1 root are parsed
-    """
-    result = parse_fixture('backcompat/nested_mf2_in_mf1.html')
-    assert 'h-feed' == result['items'][0]['type'][0]
-    assert 'h-entry' == result['items'][0]['children'][0]['type'][0]
-    assert 'Correct name' == result['items'][0]['children'][0]['properties']['name'][0]
-    assert 'Correct summary' == result['items'][0]['children'][0]['properties']['summary'][0]
+    """Confirm that mf2 roots nested inside mf1 root are parsed"""
+    result = parse_fixture("backcompat/nested_mf2_in_mf1.html")
+    assert "h-feed" == result["items"][0]["type"][0]
+    assert "h-entry" == result["items"][0]["children"][0]["type"][0]
+    assert "Correct name" == result["items"][0]["children"][0]["properties"]["name"][0]
+    assert (
+        "Correct summary"
+        == result["items"][0]["children"][0]["properties"]["summary"][0]
+    )
+
 
 def test_backcompat_nested_mf1_in_mf2():
-    """Confirm that mf1 roots nested inside mf2 root are parsed
-    """
-    result = parse_fixture('backcompat/nested_mf1_in_mf2.html')
-    assert 'h-feed' == result['items'][0]['type'][0]
-    assert 'h-entry' == result['items'][0]['children'][0]['type'][0]
-    assert 'Correct name' == result['items'][0]['children'][0]['properties']['name'][0]
-    assert 'Correct summary' == result['items'][0]['children'][0]['properties']['summary'][0]
+    """Confirm that mf1 roots nested inside mf2 root are parsed"""
+    result = parse_fixture("backcompat/nested_mf1_in_mf2.html")
+    assert "h-feed" == result["items"][0]["type"][0]
+    assert "h-entry" == result["items"][0]["children"][0]["type"][0]
+    assert "Correct name" == result["items"][0]["children"][0]["properties"]["name"][0]
+    assert (
+        "Correct summary"
+        == result["items"][0]["children"][0]["properties"]["summary"][0]
+    )
+
 
 def test_backcompat_nested_mf1_in_mf2_e_content():
-    """Confirm that mf1 roots nested inside mf2 root e-content are parsed as authored
-    """
-    result = parse_fixture('backcompat/nested_mf1_in_mf2_e_content.html')
+    """Confirm that mf1 roots nested inside mf2 root e-content are parsed as authored"""
+    result = parse_fixture("backcompat/nested_mf1_in_mf2_e_content.html")
+
+    mf2_entry = result["items"][0]
+    mf1_entry = mf2_entry["children"][0]
 
-    mf2_entry = result['items'][0]
-    mf1_entry = mf2_entry['children'][0]
+    assert (
+        '<div class="hentry">\n<span class="entry-title">Correct name</span>\n\n<span class="entry-summary">Correct summary</span>\n</div>'
+        == mf2_entry["properties"]["content"][0]["html"]
+    )
 
-    assert '<div class="hentry">\n<span class="entry-title">Correct name</span>\n\n<span class="entry-summary">Correct summary</span>\n</div>' == mf2_entry['properties']['content'][0]['html']
+    assert (
+        "Correct name Correct summary" == mf2_entry["properties"]["content"][0]["value"]
+    )
 
-    assert 'Correct name Correct summary' == mf2_entry['properties']['content'][0]['value']
+    assert "h-entry" == mf1_entry["type"][0]
+    assert "Correct name" == mf1_entry["properties"]["name"][0]
+    assert "Correct summary" == mf1_entry["properties"]["summary"][0]
 
-    assert 'h-entry' == mf1_entry['type'][0]
-    assert 'Correct name' == mf1_entry['properties']['name'][0]
-    assert 'Correct summary' == mf1_entry['properties']['summary'][0]
 
 def test_backcompat_hentry_content_html():
-    """Confirm that mf1 entry-content html is parsed as authored without mf2 replacements
-    """
-    result = parse_fixture('backcompat/hentry_content_html.html')
+    """Confirm that mf1 entry-content html is parsed as authored without mf2 replacements"""
+    result = parse_fixture("backcompat/hentry_content_html.html")
+
+    entry = result["items"][0]
 
-    entry = result['items'][0]
+    assert (
+        '<p class="entry-summary">This is a summary</p> \n        <p>This is <a href="/tags/mytag" rel="tag">mytag</a> inside content. </p>'
+        == entry["properties"]["content"][0]["html"]
+    )
 
-    assert '<p class="entry-summary">This is a summary</p> \n        <p>This is <a href="/tags/mytag" rel="tag">mytag</a> inside content. </p>' == entry['properties']['content'][0]['html']
 
 def test_whitespace_with_tags_inside_property():
     """Whitespace should only be trimmed at the ends of textContent, not inside.
 
     https://github.com/microformats/mf2py/issues/112
     """
-    result = parse_fixture('tag_whitespace_inside_p_value.html')
-    assert result['items'][0]['properties'] == {'name': ['foo bar']}
+    result = parse_fixture("tag_whitespace_inside_p_value.html")
+    assert result["items"][0]["properties"] == {"name": ["foo bar"]}
 
 
 # experimental features tests
 
+
 def test_photo_with_alt():
-    """Confirm that alt text in img is parsed with feature flag img_with_alt under as a u-* property and implied photo
-    """
+    """Confirm that alt text in img is parsed with feature flag img_with_alt under as a u-* property and implied photo"""
 
-    path = 'experimental/img_with_alt.html'
+    path = "experimental/img_with_alt.html"
 
     # without flag
     result = parse_fixture(path)
 
     # experimental img_with_alt=True
     with open(os.path.join(TEST_DIR, path)) as f:
-        exp_result = Parser(doc=f, html_parser='html5lib', img_with_alt=True).to_dict()
+        exp_result = Parser(doc=f, html_parser="html5lib", img_with_alt=True).to_dict()
 
     # simple img with u-*
-    assert '/photo.jpg' == result['items'][0]['properties']['photo'][0]
-    assert '/photo.jpg' == exp_result['items'][0]['properties']['photo'][0]
-
-    assert {'alt': 'alt text', 'value': '/photo.jpg'} == result['items'][1]['properties']['url'][0]
-    assert '/photo.jpg' == exp_result['items'][1]['properties']['url'][0]['value']
-    assert 'alt text' == exp_result['items'][1]['properties']['url'][0]['alt']
-
-    assert {'alt': '', 'value': '/photo.jpg'} == result['items'][2]['properties']['in-reply-to'][0]
-    assert '/photo.jpg' == exp_result['items'][2]['properties']['in-reply-to'][0]['value']
-    assert '' == exp_result['items'][2]['properties']['in-reply-to'][0]['alt']
+    assert "/photo.jpg" == result["items"][0]["properties"]["photo"][0]
+    assert "/photo.jpg" == exp_result["items"][0]["properties"]["photo"][0]
+
+    assert {"alt": "alt text", "value": "/photo.jpg"} == result["items"][1][
+        "properties"
+    ]["url"][0]
+    assert "/photo.jpg" == exp_result["items"][1]["properties"]["url"][0]["value"]
+    assert "alt text" == exp_result["items"][1]["properties"]["url"][0]["alt"]
+
+    assert {"alt": "", "value": "/photo.jpg"} == result["items"][2]["properties"][
+        "in-reply-to"
+    ][0]
+    assert (
+        "/photo.jpg" == exp_result["items"][2]["properties"]["in-reply-to"][0]["value"]
+    )
+    assert "" == exp_result["items"][2]["properties"]["in-reply-to"][0]["alt"]
 
     # img with u-* and h-* example
-    assert 'h-cite' in result['items'][3]['properties']['in-reply-to'][0]['type']
-    assert '/photo.jpg' == result['items'][3]['properties']['in-reply-to'][0]['properties']['photo'][0]
-    assert '/photo.jpg' == result['items'][3]['properties']['in-reply-to'][0]['value']
-    assert 'alt' not in result['items'][3]['properties']['in-reply-to'][0]
-
-    assert 'h-cite' in exp_result['items'][3]['properties']['in-reply-to'][0]['type']
-    assert '/photo.jpg' == exp_result['items'][3]['properties']['in-reply-to'][0]['properties']['photo'][0]
-    assert '/photo.jpg' == exp_result['items'][3]['properties']['in-reply-to'][0]['value']
-    assert 'alt' not in exp_result['items'][3]['properties']['in-reply-to'][0]
-
-    assert 'h-cite' in result['items'][4]['properties']['in-reply-to'][0]['type']
-    assert {'alt': 'alt text', 'value': '/photo.jpg'} == result['items'][4]['properties']['in-reply-to'][0]['properties']['photo'][0]
-    assert '/photo.jpg' == result['items'][4]['properties']['in-reply-to'][0]['value']
-    assert 'alt' in result['items'][4]['properties']['in-reply-to'][0]
-
-    assert 'h-cite' in exp_result['items'][4]['properties']['in-reply-to'][0]['type']
-    assert '/photo.jpg' == exp_result['items'][4]['properties']['in-reply-to'][0]['properties']['photo'][0]['value']
-    assert '/photo.jpg' == exp_result['items'][4]['properties']['in-reply-to'][0]['value']
-    assert 'alt text' == exp_result['items'][4]['properties']['in-reply-to'][0]['properties']['photo'][0]['alt']
-    assert 'alt text' == exp_result['items'][4]['properties']['in-reply-to'][0]['alt']
-
-    assert 'h-cite' in result['items'][5]['properties']['in-reply-to'][0]['type']
-    assert {'alt': '', 'value': '/photo.jpg'} == result['items'][5]['properties']['in-reply-to'][0]['properties']['photo'][0]
-    assert '/photo.jpg' == result['items'][5]['properties']['in-reply-to'][0]['value']
-    assert 'alt' in result['items'][5]['properties']['in-reply-to'][0]
-
-    assert 'h-cite' in exp_result['items'][5]['properties']['in-reply-to'][0]['type']
-    assert '/photo.jpg' == exp_result['items'][5]['properties']['in-reply-to'][0]['properties']['photo'][0]['value']
-    assert '/photo.jpg' == exp_result['items'][5]['properties']['in-reply-to'][0]['value']
-    assert '' == exp_result['items'][5]['properties']['in-reply-to'][0]['properties']['photo'][0]['alt']
-    assert '' == exp_result['items'][5]['properties']['in-reply-to'][0]['alt']
+    assert "h-cite" in result["items"][3]["properties"]["in-reply-to"][0]["type"]
+    assert (
+        "/photo.jpg"
+        == result["items"][3]["properties"]["in-reply-to"][0]["properties"]["photo"][0]
+    )
+    assert "/photo.jpg" == result["items"][3]["properties"]["in-reply-to"][0]["value"]
+    assert "alt" not in result["items"][3]["properties"]["in-reply-to"][0]
+
+    assert "h-cite" in exp_result["items"][3]["properties"]["in-reply-to"][0]["type"]
+    assert (
+        "/photo.jpg"
+        == exp_result["items"][3]["properties"]["in-reply-to"][0]["properties"][
+            "photo"
+        ][0]
+    )
+    assert (
+        "/photo.jpg" == exp_result["items"][3]["properties"]["in-reply-to"][0]["value"]
+    )
+    assert "alt" not in exp_result["items"][3]["properties"]["in-reply-to"][0]
+
+    assert "h-cite" in result["items"][4]["properties"]["in-reply-to"][0]["type"]
+    assert {"alt": "alt text", "value": "/photo.jpg"} == result["items"][4][
+        "properties"
+    ]["in-reply-to"][0]["properties"]["photo"][0]
+    assert "/photo.jpg" == result["items"][4]["properties"]["in-reply-to"][0]["value"]
+    assert "alt" in result["items"][4]["properties"]["in-reply-to"][0]
+
+    assert "h-cite" in exp_result["items"][4]["properties"]["in-reply-to"][0]["type"]
+    assert (
+        "/photo.jpg"
+        == exp_result["items"][4]["properties"]["in-reply-to"][0]["properties"][
+            "photo"
+        ][0]["value"]
+    )
+    assert (
+        "/photo.jpg" == exp_result["items"][4]["properties"]["in-reply-to"][0]["value"]
+    )
+    assert (
+        "alt text"
+        == exp_result["items"][4]["properties"]["in-reply-to"][0]["properties"][
+            "photo"
+        ][0]["alt"]
+    )
+    assert "alt text" == exp_result["items"][4]["properties"]["in-reply-to"][0]["alt"]
+
+    assert "h-cite" in result["items"][5]["properties"]["in-reply-to"][0]["type"]
+    assert {"alt": "", "value": "/photo.jpg"} == result["items"][5]["properties"][
+        "in-reply-to"
+    ][0]["properties"]["photo"][0]
+    assert "/photo.jpg" == result["items"][5]["properties"]["in-reply-to"][0]["value"]
+    assert "alt" in result["items"][5]["properties"]["in-reply-to"][0]
+
+    assert "h-cite" in exp_result["items"][5]["properties"]["in-reply-to"][0]["type"]
+    assert (
+        "/photo.jpg"
+        == exp_result["items"][5]["properties"]["in-reply-to"][0]["properties"][
+            "photo"
+        ][0]["value"]
+    )
+    assert (
+        "/photo.jpg" == exp_result["items"][5]["properties"]["in-reply-to"][0]["value"]
+    )
+    assert (
+        ""
+        == exp_result["items"][5]["properties"]["in-reply-to"][0]["properties"][
+            "photo"
+        ][0]["alt"]
+    )
+    assert "" == exp_result["items"][5]["properties"]["in-reply-to"][0]["alt"]
 
 
 def test_parse_id():
     result = parse_fixture("parse_id.html")
-    assert "recentArticles" == result['items'][0]['id']
-    assert "article" == result['items'][0]['children'][0]['id']
-    assert "id" not in result['items'][0]['children'][1]
-    assert "theAuthor" == result['items'][0]['properties']['author'][0]['id']
+    assert "recentArticles" == result["items"][0]["id"]
+    assert "article" == result["items"][0]["children"][0]["id"]
+    assert "id" not in result["items"][0]["children"][1]
+    assert "theAuthor" == result["items"][0]["properties"]["author"][0]["id"]
+
 
 # unicode tests
 
-def get_all_files():
 
+def get_all_files():
     all_files = []
 
     for dir_, _, files in os.walk(TEST_DIR):
         for filename in files:
             rel_dir = os.path.relpath(dir_, TEST_DIR)
-            all_files.append( os.path.join(rel_dir, filename))
+            all_files.append(os.path.join(rel_dir, filename))
 
     return all_files
 
+
 def assert_unicode_everywhere(obj):
     if isinstance(obj, dict):
         for k, v in obj.items():
-            assert not isinstance(k, bytes), 'key=%r; type=%r' % (k, type(k))
+            assert not isinstance(k, bytes), "key=%r; type=%r" % (k, type(k))
             assert_unicode_everywhere(v)
     elif isinstance(obj, list):
         for v in obj:
             assert_unicode_everywhere(v)
 
-    assert not isinstance(obj, bytes), 'value=%r; type=%r' % (obj, type(obj))
+    assert not isinstance(obj, bytes), "value=%r; type=%r" % (obj, type(obj))
 
 
 def check_unicode(filename, jsonblob):
@@ -820,21 +995,21 @@ def check_unicode(filename, jsonblob):
 
 
 def test_unicode_everywhere():
-    """ make sure everything is unicode """
+    """make sure everything is unicode"""
 
-    for h in get_all_files()  :
+    for h in get_all_files():
         result = parse_fixture(h)
         check_unicode(h, result)
 
 
 def test_input_tree_integrity():
-    """ make sure that if we parse a BS4 soup, our modifications do not leak into the document represented by it """
+    """make sure that if we parse a BS4 soup, our modifications do not leak into the document represented by it"""
 
     for path in get_all_files():
         with open(os.path.join(TEST_DIR, path)) as f:
-            soup = BeautifulSoup(f,features='lxml')
+            soup = BeautifulSoup(f, features="lxml")
             html1 = soup.prettify()
-            p = Parser(doc=soup, html_parser='lxml')
+            p = Parser(doc=soup, html_parser="lxml")
             html2 = soup.prettify()
         make_labelled_cmp("tree_integrity_" + path)(html1, html2)
 
@@ -842,15 +1017,19 @@ def test_input_tree_integrity():
 def make_labelled_cmp(label):
     def f(html1, html2):
         assert html1 == html2
+
     f.description = label
     return f
 
+
 def test_all_u_cases():
-    """ test variations of u- parsing and that relative urls are always resolved """
+    """test variations of u- parsing and that relative urls are always resolved"""
 
     URL_COUNT = 28
     result = parse_fixture("u_all_cases.html")
 
-    assert URL_COUNT == len(result['items'][0]['properties']['url'])
+    assert URL_COUNT == len(result["items"][0]["properties"]["url"])
     for i in range(URL_COUNT):
-        make_labelled_cmp("all_u_cases_" + str(i))("http://example.com/test", result['items'][0]['properties']['url'][i])
+        make_labelled_cmp("all_u_cases_" + str(i))(
+            "http://example.com/test", result["items"][0]["properties"]["url"][i]
+        )
diff --git a/test/test_suite.py b/test/test_suite.py
index fef0953..5ebb09e 100644
--- a/test/test_suite.py
+++ b/test/test_suite.py
@@ -7,12 +7,11 @@
 
 
 def test_mf2tests():
-    allfiles = glob.glob(
-        os.path.join('.', 'testsuite', 'tests', '*', '*', '*.json'))
+    allfiles = glob.glob(os.path.join(".", "testsuite", "tests", "*", "*", "*.json"))
     for jsonfile in allfiles:
-        htmlfile = jsonfile[:-4] + 'html'
+        htmlfile = jsonfile[:-4] + "html"
         with open(htmlfile) as f:
-            p = mf2py.parse(doc=f, url='http://example.com')
+            p = mf2py.parse(doc=f, url="http://example.com")
             check_unicode(htmlfile, p)
         with open(jsonfile) as jsonf:
             try:

From de1b5166b2f434001f1b39f191e3a7753a6b2c0b Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Thu, 29 Jun 2023 18:54:58 +0100
Subject: [PATCH 047/123] run isort

---
 mf2py/__init__.py            |  5 ++---
 mf2py/backcompat.py          | 14 ++++++++------
 mf2py/dom_helpers.py         |  5 ++---
 mf2py/implied_properties.py  |  9 ++-------
 mf2py/parse_property.py      |  9 +++++----
 mf2py/parser.py              | 16 ++++++++--------
 mf2py/value_class_pattern.py | 13 ++++---------
 test/test_parser.py          |  5 +++--
 test/test_suite.py           |  4 +++-
 9 files changed, 37 insertions(+), 43 deletions(-)

diff --git a/mf2py/__init__.py b/mf2py/__init__.py
index d5560e0..7c37637 100644
--- a/mf2py/__init__.py
+++ b/mf2py/__init__.py
@@ -5,9 +5,8 @@
 dictionary.
 """
 
-from .version import __version__
-from .parser import Parser, parse
 from .mf_helpers import get_url
-
+from .parser import Parser, parse
+from .version import __version__
 
 __all__ = ["Parser", "parse", "get_url", "__version__"]
diff --git a/mf2py/backcompat.py b/mf2py/backcompat.py
index b5ed93d..a29004d 100644
--- a/mf2py/backcompat.py
+++ b/mf2py/backcompat.py
@@ -23,16 +23,18 @@
 
 """
 
-from .dom_helpers import get_children
-from .mf_helpers import unordered_list
-from . import mf2_classes
-import bs4
-import copy
-import os
 import codecs
+import copy
 import json
+import os
 from urllib.parse import unquote
 
+import bs4
+
+from . import mf2_classes
+from .dom_helpers import get_children
+from .mf_helpers import unordered_list
+
 # Classic map
 _CLASSIC_MAP = {}
 
diff --git a/mf2py/dom_helpers.py b/mf2py/dom_helpers.py
index ec9ea99..211cf04 100644
--- a/mf2py/dom_helpers.py
+++ b/mf2py/dom_helpers.py
@@ -1,9 +1,8 @@
-import bs4
 import re
 from urllib.parse import urljoin
 
-from bs4.element import Tag, NavigableString, Comment
-
+import bs4
+from bs4.element import Comment, NavigableString, Tag
 
 _whitespace_to_space_regex = re.compile(r"[\n\t\r]+")
 _reduce_spaces_regex = re.compile(r" {2,}")
diff --git a/mf2py/implied_properties.py b/mf2py/implied_properties.py
index fa1f945..7aa08f1 100644
--- a/mf2py/implied_properties.py
+++ b/mf2py/implied_properties.py
@@ -1,11 +1,6 @@
 from . import mf2_classes
-from .dom_helpers import (
-    get_attr,
-    get_img_src_alt,
-    get_children,
-    get_textContent,
-    try_urljoin,
-)
+from .dom_helpers import (get_attr, get_children, get_img_src_alt,
+                          get_textContent, try_urljoin)
 
 
 def name(el, base_url=""):
diff --git a/mf2py/parse_property.py b/mf2py/parse_property.py
index 9db9c9d..4a9f498 100644
--- a/mf2py/parse_property.py
+++ b/mf2py/parse_property.py
@@ -1,11 +1,12 @@
 """functions to parse the properties of elements"""
 
-from .dom_helpers import get_attr, get_img_src_alt, get_textContent, try_urljoin
-from .datetime_helpers import normalize_datetime, DATETIME_RE, TIME_RE
-from . import value_class_pattern
-
 import re
 
+from . import value_class_pattern
+from .datetime_helpers import DATETIME_RE, TIME_RE, normalize_datetime
+from .dom_helpers import (get_attr, get_img_src_alt, get_textContent,
+                          try_urljoin)
+
 
 def text(el, base_url=""):
     """Process p-* properties"""
diff --git a/mf2py/parser.py b/mf2py/parser.py
index 035a2b8..9c61e57 100644
--- a/mf2py/parser.py
+++ b/mf2py/parser.py
@@ -1,16 +1,16 @@
+import copy
+import json
+from urllib.parse import urlparse
+
+import requests
 from bs4 import BeautifulSoup, FeatureNotFound
 from bs4.element import Tag
 
-from . import backcompat, mf2_classes, implied_properties, parse_property
-from . import temp_fixes
-from .version import __version__
+from . import (backcompat, implied_properties, mf2_classes, parse_property,
+               temp_fixes)
 from .dom_helpers import get_attr, get_children, get_descendents, try_urljoin
 from .mf_helpers import unordered_list
-
-import json
-import requests
-import copy
-from urllib.parse import urlparse
+from .version import __version__
 
 
 def parse(doc=None, url=None, html_parser=None, img_with_alt=False):
diff --git a/mf2py/value_class_pattern.py b/mf2py/value_class_pattern.py
index f7b53f6..e0a592f 100644
--- a/mf2py/value_class_pattern.py
+++ b/mf2py/value_class_pattern.py
@@ -1,16 +1,11 @@
 """functions to parse the properties of elements according to the value class pattern http://microformats.org/wiki/value-class-pattern """
 
-from .dom_helpers import get_children
-from .datetime_helpers import (
-    normalize_datetime,
-    DATETIME_RE,
-    TIME_RE,
-    DATE_RE,
-    TIMEZONE_RE,
-)
-
 import re
 
+from .datetime_helpers import (DATE_RE, DATETIME_RE, TIME_RE, TIMEZONE_RE,
+                               normalize_datetime)
+from .dom_helpers import get_children
+
 
 def _get_vcp_value(el):
     if "value-title" in el.get("class", []):
diff --git a/test/test_parser.py b/test/test_parser.py
index 8eea8ca..afa7016 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -1,11 +1,12 @@
 import os
 import re
 import sys
+from unittest import TestCase
 
 import mock
-from mf2py import Parser
 from bs4 import BeautifulSoup
-from unittest import TestCase
+
+from mf2py import Parser
 
 TestCase.maxDiff = None
 
diff --git a/test/test_suite.py b/test/test_suite.py
index 5ebb09e..4c4a89c 100644
--- a/test/test_suite.py
+++ b/test/test_suite.py
@@ -1,10 +1,12 @@
 import glob
 import json
-import mf2py
 import os.path
 import sys
+
 from test_parser import check_unicode
 
+import mf2py
+
 
 def test_mf2tests():
     allfiles = glob.glob(os.path.join(".", "testsuite", "tests", "*", "*", "*.json"))

From 4e99cf08d2cf814bc9d575cc020c589dabf4a804 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Thu, 29 Jun 2023 19:02:50 +0100
Subject: [PATCH 048/123] add black and isort to dev dependencies

---
 .github/workflows/tests.yml | 14 +++++++++++---
 pyproject.toml              |  2 ++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f07171d..31d0009 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,9 +14,17 @@ jobs:
         python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9"]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3-
+      - uses: psf/black@stable
         with:
-          python-version: ${{ matrix.python-version }}
+          options: "--check --verbose"
+          src: "./mf2py"
+          version: "21.5b1"
+          with:
+            python-version: ${{ matrix.python-version }}
+      - uses: isort/isort-action@v1
+        with:
+            requirements-files: "requirements.txt"
       - name: Install libxml2
         run: |
           sudo apt-get update
@@ -35,4 +43,4 @@ jobs:
       - name: Install library
         run: poetry install --no-interaction
       - name: Run tests
-        run: poetry run pytest
+        run: poetry run pytest
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index 0febd7b..009fc0d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,6 +16,8 @@ python = ">=3.8"
 html5lib = "^1.1"
 requests = "^2.28.2"
 beautifulsoup4 = "^4.11.1"
+black = "^23.3.0"
+isort = "^5.12.0"
 
 [tool.poetry.group.dev.dependencies]
 lxml = "^4.9.2"

From e58c01ec88320cc7c4b9c6af3239680d152d8b8f Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Thu, 29 Jun 2023 19:03:05 +0100
Subject: [PATCH 049/123] add black and isort to dev dependencies

---
 pyproject.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 009fc0d..fc8ea6e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,13 +16,13 @@ python = ">=3.8"
 html5lib = "^1.1"
 requests = "^2.28.2"
 beautifulsoup4 = "^4.11.1"
-black = "^23.3.0"
-isort = "^5.12.0"
 
 [tool.poetry.group.dev.dependencies]
 lxml = "^4.9.2"
 mock = "^5.0.1"
 pytest = "^7.2.1"
+black = "^23.3.0"
+isort = "^5.12.0"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

From b3afa6fb4f567755a9040b91339dfa1b31dc7c09 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Thu, 29 Jun 2023 19:06:41 +0100
Subject: [PATCH 050/123] fix order

---
 .github/workflows/tests.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 31d0009..909c103 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,17 +14,9 @@ jobs:
         python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9"]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3-
-      - uses: psf/black@stable
-        with:
-          options: "--check --verbose"
-          src: "./mf2py"
-          version: "21.5b1"
-          with:
-            python-version: ${{ matrix.python-version }}
-      - uses: isort/isort-action@v1
+      - uses: actions/checkout@v3
         with:
-            requirements-files: "requirements.txt"
+          python-version: ${{ matrix.python-version }}
       - name: Install libxml2
         run: |
           sudo apt-get update
@@ -43,4 +35,10 @@ jobs:
       - name: Install library
         run: poetry install --no-interaction
       - name: Run tests
-        run: poetry run pytest
\ No newline at end of file
+        run: poetry run pytest
+      - uses: psf/black@stable
+        with:
+          options: "--check --verbose"
+          src: "./mf2py"
+          version: "21.5b1"
+      - uses: isort/isort-action@v1
\ No newline at end of file

From dee0be78928bc5ef4ac94cc0b1f67e97c3a55c69 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Thu, 29 Jun 2023 19:20:29 +0100
Subject: [PATCH 051/123] update black action

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 909c103..fa932aa 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -40,5 +40,5 @@ jobs:
         with:
           options: "--check --verbose"
           src: "./mf2py"
-          version: "21.5b1"
+          version: "23.3"
       - uses: isort/isort-action@v1
\ No newline at end of file

From 0be41aa1e01cb42d7c0c5604b7ec9efc473ecef8 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Thu, 29 Jun 2023 19:21:05 +0100
Subject: [PATCH 052/123] run black on all codebase

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index fa932aa..af5cc2e 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -39,6 +39,6 @@ jobs:
       - uses: psf/black@stable
         with:
           options: "--check --verbose"
-          src: "./mf2py"
+          src: "./"
           version: "23.3"
       - uses: isort/isort-action@v1
\ No newline at end of file

From c5c69cb96adbda6eae8f13e68d32baa8db744ca9 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Thu, 29 Jun 2023 19:25:41 +0100
Subject: [PATCH 053/123] run black and isort on dumpout file

---
 dumpout.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/dumpout.py b/dumpout.py
index 5e99708..0f3328f 100644
--- a/dumpout.py
+++ b/dumpout.py
@@ -1,10 +1,11 @@
-from mf2py import Parser
-import os.path
 import glob
 import json
+import os.path
+
+from mf2py import Parser
 
-allfiles = glob.glob(os.path.join('.', 'tests', 'tests', '**', '**', '*.json'))
+allfiles = glob.glob(os.path.join(".", "tests", "tests", "**", "**", "*.json"))
 for jsonfile in allfiles:
-    htmlfile = jsonfile[:-4] + 'html'
+    htmlfile = jsonfile[:-4] + "html"
     with open(htmlfile) as f:
         p = json.loads(Parser(doc=f).to_json(pretty_print=True))

From 9b6613ad617ea747cf2aa692e8a5d722cf199abe Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Thu, 29 Jun 2023 19:29:32 +0100
Subject: [PATCH 054/123] remove check

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index af5cc2e..17fb62e 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -38,7 +38,7 @@ jobs:
         run: poetry run pytest
       - uses: psf/black@stable
         with:
-          options: "--check --verbose"
+          options: "--verbose"
           src: "./"
           version: "23.3"
       - uses: isort/isort-action@v1
\ No newline at end of file

From 8fc9e02774b08f999ec5e35bc46d5ae7af73e44e Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Thu, 29 Jun 2023 19:34:03 +0100
Subject: [PATCH 055/123] add blank isort config

---
 .github/workflows/tests.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 17fb62e..2d42ba2 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -41,4 +41,6 @@ jobs:
           options: "--verbose"
           src: "./"
           version: "23.3"
-      - uses: isort/isort-action@v1
\ No newline at end of file
+      - uses: isort/isort-action@v1
+        with:
+          configuration: ""
\ No newline at end of file

From e1177e108ab105ab6074d475b6ba58c912279a44 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Thu, 29 Jun 2023 19:45:21 +0100
Subject: [PATCH 056/123] roll back commits

---
 .github/workflows/tests.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2d42ba2..af5cc2e 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -38,9 +38,7 @@ jobs:
         run: poetry run pytest
       - uses: psf/black@stable
         with:
-          options: "--verbose"
+          options: "--check --verbose"
           src: "./"
           version: "23.3"
-      - uses: isort/isort-action@v1
-        with:
-          configuration: ""
\ No newline at end of file
+      - uses: isort/isort-action@v1
\ No newline at end of file

From 5f96c3061c21517ef25311384ab34d4500755350 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <ragt.ag>
Date: Thu, 29 Jun 2023 11:52:24 -0700
Subject: [PATCH 057/123] Make black and isort work together

---
 mf2py/implied_properties.py  | 9 +++++++--
 mf2py/parse_property.py      | 3 +--
 mf2py/parser.py              | 3 +--
 mf2py/value_class_pattern.py | 9 +++++++--
 pyproject.toml               | 3 +++
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/mf2py/implied_properties.py b/mf2py/implied_properties.py
index 7aa08f1..b3dfd70 100644
--- a/mf2py/implied_properties.py
+++ b/mf2py/implied_properties.py
@@ -1,6 +1,11 @@
 from . import mf2_classes
-from .dom_helpers import (get_attr, get_children, get_img_src_alt,
-                          get_textContent, try_urljoin)
+from .dom_helpers import (
+    get_attr,
+    get_children,
+    get_img_src_alt,
+    get_textContent,
+    try_urljoin,
+)
 
 
 def name(el, base_url=""):
diff --git a/mf2py/parse_property.py b/mf2py/parse_property.py
index 4a9f498..b0c8e2e 100644
--- a/mf2py/parse_property.py
+++ b/mf2py/parse_property.py
@@ -4,8 +4,7 @@
 
 from . import value_class_pattern
 from .datetime_helpers import DATETIME_RE, TIME_RE, normalize_datetime
-from .dom_helpers import (get_attr, get_img_src_alt, get_textContent,
-                          try_urljoin)
+from .dom_helpers import get_attr, get_img_src_alt, get_textContent, try_urljoin
 
 
 def text(el, base_url=""):
diff --git a/mf2py/parser.py b/mf2py/parser.py
index 9c61e57..f8d6b29 100644
--- a/mf2py/parser.py
+++ b/mf2py/parser.py
@@ -6,8 +6,7 @@
 from bs4 import BeautifulSoup, FeatureNotFound
 from bs4.element import Tag
 
-from . import (backcompat, implied_properties, mf2_classes, parse_property,
-               temp_fixes)
+from . import backcompat, implied_properties, mf2_classes, parse_property, temp_fixes
 from .dom_helpers import get_attr, get_children, get_descendents, try_urljoin
 from .mf_helpers import unordered_list
 from .version import __version__
diff --git a/mf2py/value_class_pattern.py b/mf2py/value_class_pattern.py
index e0a592f..42ad964 100644
--- a/mf2py/value_class_pattern.py
+++ b/mf2py/value_class_pattern.py
@@ -2,8 +2,13 @@
 
 import re
 
-from .datetime_helpers import (DATE_RE, DATETIME_RE, TIME_RE, TIMEZONE_RE,
-                               normalize_datetime)
+from .datetime_helpers import (
+    DATE_RE,
+    DATETIME_RE,
+    TIME_RE,
+    TIMEZONE_RE,
+    normalize_datetime,
+)
 from .dom_helpers import get_children
 
 
diff --git a/pyproject.toml b/pyproject.toml
index fc8ea6e..4ee0780 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,6 +24,9 @@ pytest = "^7.2.1"
 black = "^23.3.0"
 isort = "^5.12.0"
 
+[tool.isort]
+profile = "black"
+
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

From e27e7cf36bb49c6e6ef64cbc0ea377300bf773af Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Thu, 29 Jun 2023 19:58:11 +0100
Subject: [PATCH 058/123] modernise makefile

---
 Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 951eeb4..f050375 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,9 @@
-all:
-	pip install -r requirements.txt
+install:
+	poetry install
 test:
-	nosetests
+	poetry run pytest
+publish:
+	poetry publish --build
+lint:
+	poetry run black .
+	poetry run isort .

From 29beb266f3a7d334e33e1218c26cce46f3f577b7 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Thu, 29 Jun 2023 20:04:30 +0100
Subject: [PATCH 059/123] update contributors file, remove .gitmodules

---
 .gitmodules                |  0
 AUTHORS => CONTRIBUTORS.md |  6 +++++-
 dumpout.py                 | 11 -----------
 3 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 .gitmodules
 rename AUTHORS => CONTRIBUTORS.md (53%)
 delete mode 100644 dumpout.py

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e69de29..0000000
diff --git a/AUTHORS b/CONTRIBUTORS.md
similarity index 53%
rename from AUTHORS
rename to CONTRIBUTORS.md
index 3e99d23..fce929c 100644
--- a/AUTHORS
+++ b/CONTRIBUTORS.md
@@ -1,5 +1,9 @@
+# Contributors
+
 Tom Morris <tom@tommorris.org> http://tommorris.org/
 Barnaby Walters http://waterpigs.co.uk
 Kartik Prabhu <me@kartikprabhu.com> https://kartikprabhu.com
 Kyle Mahan <kyle@kylewm.com> https://kylewm.com
-Kevin Marks  <kevinmarks@gmail.com> http://www.kevinmarks.com/
+Kevin Marks <kevinmarks@gmail.com> http://www.kevinmarks.com/
+James <jamesg@jamesg.blog> https://jamesg.blog
+Angelo Gladding <angelo@ragt.ag> https://ragt.ag
\ No newline at end of file
diff --git a/dumpout.py b/dumpout.py
deleted file mode 100644
index 0f3328f..0000000
--- a/dumpout.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import glob
-import json
-import os.path
-
-from mf2py import Parser
-
-allfiles = glob.glob(os.path.join(".", "tests", "tests", "**", "**", "*.json"))
-for jsonfile in allfiles:
-    htmlfile = jsonfile[:-4] + "html"
-    with open(htmlfile) as f:
-        p = json.loads(Parser(doc=f).to_json(pretty_print=True))

From 6a20f7c93c8fb80f26556cfa155f3bac49329291 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Thu, 29 Jun 2023 20:08:49 +0100
Subject: [PATCH 060/123] reformat contributors file, add contributor

---
 CONTRIBUTORS.md | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index fce929c..d11835a 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1,9 +1,10 @@
 # Contributors
 
-Tom Morris <tom@tommorris.org> http://tommorris.org/
-Barnaby Walters http://waterpigs.co.uk
-Kartik Prabhu <me@kartikprabhu.com> https://kartikprabhu.com
-Kyle Mahan <kyle@kylewm.com> https://kylewm.com
-Kevin Marks <kevinmarks@gmail.com> http://www.kevinmarks.com/
-James <jamesg@jamesg.blog> https://jamesg.blog
-Angelo Gladding <angelo@ragt.ag> https://ragt.ag
\ No newline at end of file
+- Tom Morris <tom@tommorris.org> http://tommorris.org/
+- Barnaby Walters http://waterpigs.co.uk
+- Kartik Prabhu <me@kartikprabhu.com> https://kartikprabhu.com
+- Kyle Mahan <kyle@kylewm.com> https://kylewm.com
+- Kevin Marks <kevinmarks@gmail.com> http://www.kevinmarks.com/
+- James <jamesg@jamesg.blog> https://jamesg.blog
+- Angelo Gladding <angelo@ragt.ag> https://ragt.ag
+- Paweł Miech https://pawelmhm.github.io/
\ No newline at end of file

From 3e1021207bcd1ca14b6136a8e555081b33a181e9 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Thu, 29 Jun 2023 20:24:13 +0100
Subject: [PATCH 061/123] add sven

---
 CONTRIBUTORS.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index d11835a..2dafe1d 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -7,4 +7,5 @@
 - Kevin Marks <kevinmarks@gmail.com> http://www.kevinmarks.com/
 - James <jamesg@jamesg.blog> https://jamesg.blog
 - Angelo Gladding <angelo@ragt.ag> https://ragt.ag
-- Paweł Miech https://pawelmhm.github.io/
\ No newline at end of file
+- Paweł Miech https://pawelmhm.github.io/
+- Sven Knebel https://www.svenknebel.de
\ No newline at end of file

From 1e4493e3c1f6b080985b074bb3c676687c36e2bf Mon Sep 17 00:00:00 2001
From: Angelo Gladding <ragt.ag>
Date: Thu, 29 Jun 2023 15:01:32 -0700
Subject: [PATCH 062/123] Replace `dict_class` with standard `dict`

---
 mf2py/dom_helpers.py        |  4 +--
 mf2py/implied_properties.py |  7 +++--
 mf2py/parse_property.py     |  4 +--
 mf2py/parser.py             | 51 ++++++++++++++-----------------------
 4 files changed, 26 insertions(+), 40 deletions(-)

diff --git a/mf2py/dom_helpers.py b/mf2py/dom_helpers.py
index 211cf04..951ad6e 100644
--- a/mf2py/dom_helpers.py
+++ b/mf2py/dom_helpers.py
@@ -39,7 +39,7 @@ def get_attr(el, attr, check_name=None):
         return el.get(attr)
 
 
-def get_img_src_alt(img, dict_class, img_with_alt, base_url=""):
+def get_img_src_alt(img, img_with_alt, base_url=""):
     """given a img element, returns both src and alt attributes as a list of tuples if alt exists, else returns the src as a string
     use for alt parsing with img
     """
@@ -53,7 +53,7 @@ def get_img_src_alt(img, dict_class, img_with_alt, base_url=""):
         if alt is None or not img_with_alt:
             return src
         else:
-            return dict_class([("value", src), ("alt", alt)])
+            return {"value": src, "alt": alt}
 
 
 def get_children(node):
diff --git a/mf2py/implied_properties.py b/mf2py/implied_properties.py
index b3dfd70..2f4ae66 100644
--- a/mf2py/implied_properties.py
+++ b/mf2py/implied_properties.py
@@ -73,12 +73,11 @@ def non_empty(val):
     return get_textContent(el, replace_img=True, img_to_src=False, base_url=base_url)
 
 
-def photo(el, dict_class, img_with_alt, base_url=""):
+def photo(el, img_with_alt, base_url=""):
     """Find an implied photo property
 
     Args:
       el (bs4.element.Tag): a DOM element
-      dict_class: a python class used as a dictionary (set by the Parser object)
       img_with_alt: a flag to enable experimental parsing of alt attribute with img (set by the Parser object)
       base_url (string): the base URL to use, to reconcile relative URLs
 
@@ -106,7 +105,7 @@ def get_photo_child(children):
                 return poss_obj
 
     # if element is an img use source if exists
-    prop_value = get_img_src_alt(el, dict_class, img_with_alt, base_url)
+    prop_value = get_img_src_alt(el, img_with_alt, base_url)
     if prop_value is not None:
         return prop_value
 
@@ -133,7 +132,7 @@ def get_photo_child(children):
     # if a possible child was found parse
     if poss_child is not None:
         # img get src
-        prop_value = get_img_src_alt(poss_child, dict_class, img_with_alt, base_url)
+        prop_value = get_img_src_alt(poss_child, img_with_alt, base_url)
         if prop_value is not None:
             return prop_value
 
diff --git a/mf2py/parse_property.py b/mf2py/parse_property.py
index b0c8e2e..762f4eb 100644
--- a/mf2py/parse_property.py
+++ b/mf2py/parse_property.py
@@ -26,12 +26,12 @@ def text(el, base_url=""):
     return prop_value
 
 
-def url(el, dict_class, img_with_alt, base_url=""):
+def url(el, img_with_alt, base_url=""):
     """Process u-* properties"""
 
     prop_value = get_attr(el, "href", check_name=("a", "area", "link"))
     if prop_value is None:
-        prop_value = get_img_src_alt(el, dict_class, img_with_alt, base_url)
+        prop_value = get_img_src_alt(el, img_with_alt, base_url)
         if prop_value is not None:
             return prop_value
     if prop_value is None:
diff --git a/mf2py/parser.py b/mf2py/parser.py
index f8d6b29..520d29f 100644
--- a/mf2py/parser.py
+++ b/mf2py/parser.py
@@ -54,29 +54,20 @@ class Parser(object):
     ua_url = "https://github.com/microformats/mf2py"
     useragent = "{0} - version {1} - {2}".format(ua_desc, __version__, ua_url)
 
-    dict_class = dict
-
     def __init__(self, doc=None, url=None, html_parser=None, img_with_alt=True):
         self.__url__ = None
         self.__doc__ = None
         self._preserve_doc = False
-        self.__parsed__ = self.dict_class(
-            [
-                ("items", []),
-                ("rels", self.dict_class()),
-                ("rel-urls", self.dict_class()),
-                (
-                    "debug",
-                    self.dict_class(
-                        [
-                            ("description", self.ua_desc),
-                            ("source", self.ua_url),
-                            ("version", __version__),
-                        ]
-                    ),
-                ),
-            ]
-        )
+        self.__parsed__ = {
+            "items": [],
+            "rels": {},
+            "rel-urls": {},
+            "debug": {
+                "description": self.ua_desc,
+                "source": self.ua_url,
+                "version": __version__,
+            },
+        }
         self.__img_with_alt__ = img_with_alt
 
         # use default parser if none specified
@@ -161,7 +152,7 @@ def handle_microformat(
             backcompat_mode=False,
         ):
             """Handles a (possibly nested) microformat, i.e. h-*"""
-            properties = self.dict_class()
+            properties = {}
             children = []
             self._default_date = None
             # for processing implied properties: collects if property types (p, e, u, d(t)) or children (h) have been processed
@@ -205,7 +196,6 @@ def handle_microformat(
                 ):
                     x = implied_properties.photo(
                         el,
-                        self.dict_class,
                         self.__img_with_alt__,
                         base_url=self.__url__,
                     )
@@ -221,12 +211,10 @@ def handle_microformat(
                         properties["url"] = [x]
 
             # build microformat with type and properties
-            microformat = self.dict_class(
-                [
-                    ("type", [class_name for class_name in sorted(root_class_names)]),
-                    ("properties", properties),
-                ]
-            )
+            microformat = {
+                "type": [class_name for class_name in sorted(root_class_names)],
+                "properties": properties,
+            }
             if el.name == "area":
                 shape = get_attr(el, "shape")
                 if shape is not None:
@@ -260,7 +248,7 @@ def handle_microformat(
 
         def parse_props(el):
             """Parse the properties from a single element"""
-            props = self.dict_class()
+            props = {}
             children = []
             # for processing implied properties: collects if property types (p, e, u, d(t)) or children (h) have been processed
             parsed_types_aggregation = set()
@@ -318,7 +306,6 @@ def parse_props(el):
                 if u_value is None:
                     u_value = parse_property.url(
                         el,
-                        self.dict_class,
                         self.__img_with_alt__,
                         base_url=self.__url__,
                     )
@@ -334,7 +321,7 @@ def parse_props(el):
                         )
                     )
                 else:
-                    if isinstance(u_value, self.dict_class):
+                    if isinstance(u_value, dict):
                         prop_value.append(u_value)
                     else:
                         prop_value.append(u_value)
@@ -432,7 +419,7 @@ def parse_rels(el):
             if rel_attrs is not None:
                 # find the url and normalise it
                 url = try_urljoin(self.__url__, el.get("href", ""))
-                value_dict = self.__parsed__["rel-urls"].get(url, self.dict_class())
+                value_dict = self.__parsed__["rel-urls"].get(url, {})
 
                 # 1st one wins
                 if "text" not in value_dict:
@@ -459,7 +446,7 @@ def parse_rels(el):
                     self.__parsed__["rels"][rel_value] = value_list
                 if "alternate" in rel_attrs:
                     alternate_list = self.__parsed__.get("alternates", [])
-                    alternate_dict = self.dict_class()
+                    alternate_dict = {}
                     alternate_dict["url"] = url
                     x = " ".join([r for r in rel_attrs if not r == "alternate"])
                     if x != "":

From 39d0b35660cbb0afd1443daf73645b4af1f2ff55 Mon Sep 17 00:00:00 2001
From: James <37276661+capjamesg@users.noreply.github.com>
Date: Fri, 30 Jun 2023 10:39:02 +0100
Subject: [PATCH 063/123] add contributing guidelines

---
 CONTRIBUTING.md | 56 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..b8fac3b
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,56 @@
+## Contributing to mf2py 🛠️
+
+Thank you for your interest in contributing to mf2py! In this document, we outline all you need to know to submit a contribution to the mf2py project.
+
+## Contribution Guidelines
+
+We welcome contributions to:
+
+1. Add new parsing features to the library (see *Adding Parsing Features* below for more information).
+2. Improve documentation.
+3. Report bugs and issues.
+4. Submit a request for a new feature.
+5. Add more test cases.
+
+We encourage you to submit an Issue to discuss any new feature requests before submitting a PR.
+
+### Adding Parsing Features
+
+As the official `mf2py` parser, we will only implement new parsing features after they have been ratified into the Microformats parsing standard, or have achieved sufficient support among contributors to parsing discussions and requires implementations. The [microformats2 parsing](https://github.com/microformats/microformats2-parsing/issues) repository is the offical home to all issues pertaining to microformats2 parsing.
+
+## How to Contribute Changes
+
+First, fork this repository to your own GitHub account. Create a new branch that describes your changes (i.e. `line-counter-docs`). Push your changes to the branch on your fork and then submit a pull request to this repository.
+
+When creating new functions, please ensure you have the following:
+
+1. Docstrings for the function and all parameters.
+2. Unit tests for the function.
+3. Examples in the documentation for any public functions.
+4. Created an entry in our docs to autogenerate the documentation for the function, if the function is public.
+
+All pull requests will be reviewed by the maintainers of the project. We will provide feedback and ask for changes if necessary.
+
+PRs must pass all tests and linting requirements before they can be merged.
+
+## Code Quality
+
+Before you submit a PR to `mf2py`, run the following command in the base directory of the project:
+
+```bash
+make style
+```
+
+This will format your code using the linters configured with the project.
+
+## Tests
+
+Before you submit a PR, please run the `mf2py` test suite on your code. You can do so using the following command:
+
+```bash
+make test
+```
+
+## Join the Microformats Community
+
+Have a question about microformats or mf2py? Join the `#microformats` disussion on Slack, Discord, IRC, or Matrix. Guidance on how to join the community is available on the [IndieWeb wiki](https://indieweb.org/discuss).
\ No newline at end of file

From 4a6994f7199dee712b63c7b71750ea6e62750762 Mon Sep 17 00:00:00 2001
From: James <37276661+capjamesg@users.noreply.github.com>
Date: Fri, 30 Jun 2023 10:39:15 +0100
Subject: [PATCH 064/123] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b8fac3b..6efe68f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-## Contributing to mf2py 🛠️
+# Contributing to mf2py 🛠️
 
 Thank you for your interest in contributing to mf2py! In this document, we outline all you need to know to submit a contribution to the mf2py project.
 
@@ -53,4 +53,4 @@ make test
 
 ## Join the Microformats Community
 
-Have a question about microformats or mf2py? Join the `#microformats` disussion on Slack, Discord, IRC, or Matrix. Guidance on how to join the community is available on the [IndieWeb wiki](https://indieweb.org/discuss).
\ No newline at end of file
+Have a question about microformats or mf2py? Join the `#microformats` disussion on Slack, Discord, IRC, or Matrix. Guidance on how to join the community is available on the [IndieWeb wiki](https://indieweb.org/discuss).

From ed7e7fd5bf23d70b2dca092fb73dd101db54ff38 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 4 Jul 2023 22:31:42 +0100
Subject: [PATCH 065/123] add new test environments

---
 .github/workflows/tests.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index af5cc2e..8d8c0bc 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -12,7 +12,8 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9"]
-    runs-on: ubuntu-latest
+        os: ["ubuntu-latest", "macos-latest", "windows-latest"]
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
         with:

From f8ae7d136bfc0c90a8d43fd244986c4ff6588c6b Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 4 Jul 2023 22:32:27 +0100
Subject: [PATCH 066/123] add pypy3.10

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8d8c0bc..b01b787 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9"]
+        python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9", "pypy3.10"]
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
     runs-on: ${{ matrix.os }}
     steps:

From eb81466937d242fda6614658bc45be579b4ef535 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 4 Jul 2023 22:39:35 +0100
Subject: [PATCH 067/123] remove lxml import

---
 .github/workflows/tests.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b01b787..8ccc6c3 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -18,10 +18,6 @@ jobs:
       - uses: actions/checkout@v3
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install libxml2
-        run: |
-          sudo apt-get update
-          sudo apt-get install libxml2 libxml2-dev libxslt1-dev
       - name: Install Python
         uses: actions/setup-python@v4
         with:

From e5212387cef3934a9aa3be292d4cdeadb2e0106a Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 4 Jul 2023 22:47:58 +0100
Subject: [PATCH 068/123] add md5sha1sum

---
 .github/workflows/tests.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8ccc6c3..77e8d37 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,6 +8,11 @@ on:
       - main
 
 jobs:
+  prep:
+      runs-on: "macos-latest"
+      steps:
+        - run: brew install md5sha1sum
+
   build:
     strategy:
       matrix:

From 42fa640040d6000dd4303c39aabb720c5f019b83 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 4 Jul 2023 22:53:01 +0100
Subject: [PATCH 069/123] add if statement

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 77e8d37..32ea9af 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -12,13 +12,13 @@ jobs:
       runs-on: "macos-latest"
       steps:
         - run: brew install md5sha1sum
-
   build:
     strategy:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9", "pypy3.10"]
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
     runs-on: ${{ matrix.os }}
+    if: ${{ github.event.prep.conclusion == 'success' }}
     steps:
       - uses: actions/checkout@v3
         with:

From f9e04c0699ba30d5b422946130969b41be77d255 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 4 Jul 2023 22:55:35 +0100
Subject: [PATCH 070/123] add if statement

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 32ea9af..b4fe65e 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -18,7 +18,7 @@ jobs:
         python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9", "pypy3.10"]
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
     runs-on: ${{ matrix.os }}
-    if: ${{ github.event.prep.conclusion == 'success' }}
+    if: ${{ jobs.prep.result == 'success' }}
     steps:
       - uses: actions/checkout@v3
         with:

From b183dd2c687b85278eddd5201a0dea146aa5f5fd Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 4 Jul 2023 22:57:02 +0100
Subject: [PATCH 071/123] add if statement

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b4fe65e..9b475d6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -18,7 +18,7 @@ jobs:
         python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9", "pypy3.10"]
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
     runs-on: ${{ matrix.os }}
-    if: ${{ jobs.prep.result == 'success' }}
+    needs: prep
     steps:
       - uses: actions/checkout@v3
         with:

From 29f0c4cce502b5d95787e1cb8b7e9ff57f3d300b Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 4 Jul 2023 23:02:13 +0100
Subject: [PATCH 072/123] branch logic

---
 .github/workflows/tests.yml | 72 ++++++++++++++++++++++++++++++++-----
 1 file changed, 64 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 9b475d6..8ee50c5 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,18 +8,14 @@ on:
       - main
 
 jobs:
-  prep:
-      runs-on: "macos-latest"
-      steps:
-        - run: brew install md5sha1sum
-  build:
+  build-macos:
     strategy:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9", "pypy3.10"]
-        os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-    runs-on: ${{ matrix.os }}
-    needs: prep
+    runs-on: "macos-latest"
     steps:
+      - name: Install md5sha1sum
+        run: brew install md5sha1sum
       - uses: actions/checkout@v3
         with:
           python-version: ${{ matrix.python-version }}
@@ -43,4 +39,64 @@ jobs:
           options: "--check --verbose"
           src: "./"
           version: "23.3"
+      - uses: isort/isort-action@v1
+  build-linux:
+    strategy:
+      matrix:
+        python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9", "pypy3.10"]
+    runs-on: "ubuntu-latest"
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          version: 1.2.2
+          virtualenvs-in-project: true
+      - name: Install dependencies
+        run: poetry install --no-interaction --no-root
+      - name: Install library
+        run: poetry install --no-interaction
+      - name: Run tests
+        run: poetry run pytest
+      - uses: psf/black@stable
+        with:
+          options: "--check --verbose"
+          src: "./"
+          version: "23.3"
+      - uses: isort/isort-action@v1
+  build-windows:
+    strategy:
+      matrix:
+        python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9", "pypy3.10"]
+    runs-on: "windows-latest"
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          version: 1.2.2
+          virtualenvs-in-project: true
+      - name: Install dependencies
+        run: poetry install --no-interaction --no-root
+      - name: Install library
+        run: poetry install --no-interaction
+      - name: Run tests
+        run: poetry run pytest
+      - uses: psf/black@stable
+        with:
+          options: "--check --verbose"
+          src: "./"
+          version: "23.3"
       - uses: isort/isort-action@v1
\ No newline at end of file

From 014ab1eff8e014e6595177ba5be85ca7cd5dfa5d Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 4 Jul 2023 23:05:09 +0100
Subject: [PATCH 073/123] branch logic

---
 .github/workflows/tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8ee50c5..5a6f0c1 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -50,7 +50,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install Poetry
@@ -80,7 +80,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install Poetry

From 2d4760556ba34aa90f13b38f3259c0d29a0ebb0e Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 4 Jul 2023 23:16:17 +0100
Subject: [PATCH 074/123] add poetry to windows path

---
 .github/workflows/tests.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5a6f0c1..55ca6e8 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -46,6 +46,10 @@ jobs:
         python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9", "pypy3.10"]
     runs-on: "ubuntu-latest"
     steps:
+      - name: Install libxml2
+        run: |
+          sudo apt-get update
+          sudo apt-get install libxml2 libxml2-dev libxslt1-dev
       - uses: actions/checkout@v3
         with:
           python-version: ${{ matrix.python-version }}
@@ -58,6 +62,7 @@ jobs:
         with:
           version: 1.2.2
           virtualenvs-in-project: true
+      - run: echo "%APPDATA%\pypoetry\venv\Scripts\poetry" >> $GITHUB_PATH
       - name: Install dependencies
         run: poetry install --no-interaction --no-root
       - name: Install library

From c9bf42becb631234ab8e459e09172256054140d4 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 4 Jul 2023 23:17:57 +0100
Subject: [PATCH 075/123] comment out tests for testing

---
 .github/workflows/tests.yml | 134 ++++++++++++++++++------------------
 1 file changed, 67 insertions(+), 67 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 55ca6e8..4a4e0d1 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,73 +8,73 @@ on:
       - main
 
 jobs:
-  build-macos:
-    strategy:
-      matrix:
-        python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9", "pypy3.10"]
-    runs-on: "macos-latest"
-    steps:
-      - name: Install md5sha1sum
-        run: brew install md5sha1sum
-      - uses: actions/checkout@v3
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
-        with:
-          version: 1.2.2
-          virtualenvs-in-project: true
-      - name: Install dependencies
-        run: poetry install --no-interaction --no-root
-      - name: Install library
-        run: poetry install --no-interaction
-      - name: Run tests
-        run: poetry run pytest
-      - uses: psf/black@stable
-        with:
-          options: "--check --verbose"
-          src: "./"
-          version: "23.3"
-      - uses: isort/isort-action@v1
-  build-linux:
-    strategy:
-      matrix:
-        python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9", "pypy3.10"]
-    runs-on: "ubuntu-latest"
-    steps:
-      - name: Install libxml2
-        run: |
-          sudo apt-get update
-          sudo apt-get install libxml2 libxml2-dev libxslt1-dev
-      - uses: actions/checkout@v3
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
-        with:
-          version: 1.2.2
-          virtualenvs-in-project: true
-      - run: echo "%APPDATA%\pypoetry\venv\Scripts\poetry" >> $GITHUB_PATH
-      - name: Install dependencies
-        run: poetry install --no-interaction --no-root
-      - name: Install library
-        run: poetry install --no-interaction
-      - name: Run tests
-        run: poetry run pytest
-      - uses: psf/black@stable
-        with:
-          options: "--check --verbose"
-          src: "./"
-          version: "23.3"
-      - uses: isort/isort-action@v1
+  # build-macos:
+  #   strategy:
+  #     matrix:
+  #       python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9", "pypy3.10"]
+  #   runs-on: "macos-latest"
+  #   steps:
+  #     - name: Install md5sha1sum
+  #       run: brew install md5sha1sum
+  #     - uses: actions/checkout@v3
+  #       with:
+  #         python-version: ${{ matrix.python-version }}
+  #     - name: Install Python
+  #       uses: actions/setup-python@v4
+  #       with:
+  #         python-version: ${{ matrix.python-version }}
+  #     - name: Install Poetry
+  #       uses: snok/install-poetry@v1
+  #       with:
+  #         version: 1.2.2
+  #         virtualenvs-in-project: true
+  #     - name: Install dependencies
+  #       run: poetry install --no-interaction --no-root
+  #     - name: Install library
+  #       run: poetry install --no-interaction
+  #     - name: Run tests
+  #       run: poetry run pytest
+  #     - uses: psf/black@stable
+  #       with:
+  #         options: "--check --verbose"
+  #         src: "./"
+  #         version: "23.3"
+  #     - uses: isort/isort-action@v1
+  # build-linux:
+  #   strategy:
+  #     matrix:
+  #       python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9", "pypy3.10"]
+  #   runs-on: "ubuntu-latest"
+  #   steps:
+  #     - name: Install libxml2
+  #       run: |
+  #         sudo apt-get update
+  #         sudo apt-get install libxml2 libxml2-dev libxslt1-dev
+  #     - uses: actions/checkout@v3
+  #       with:
+  #         python-version: ${{ matrix.python-version }}
+  #     - name: Install Python
+  #       uses: actions/setup-python@v4
+  #       with:
+  #         python-version: ${{ matrix.python-version }}
+  #     - name: Install Poetry
+  #       uses: snok/install-poetry@v1
+  #       with:
+  #         version: 1.2.2
+  #         virtualenvs-in-project: true
+  #     - run: echo "%APPDATA%\pypoetry\venv\Scripts\poetry" >> $GITHUB_PATH
+  #     - name: Install dependencies
+  #       run: poetry install --no-interaction --no-root
+  #     - name: Install library
+  #       run: poetry install --no-interaction
+  #     - name: Run tests
+  #       run: poetry run pytest
+  #     - uses: psf/black@stable
+  #       with:
+  #         options: "--check --verbose"
+  #         src: "./"
+  #         version: "23.3"
+  #     - uses: isort/isort-action@v1
   build-windows:
     strategy:
       matrix:

From fccac4c258ff1dd3bfb9ca8ce80e2fa36ce39401 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 4 Jul 2023 23:18:40 +0100
Subject: [PATCH 076/123] comment out tests for testing

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4a4e0d1..ce4ad60 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -62,7 +62,6 @@ jobs:
   #       with:
   #         version: 1.2.2
   #         virtualenvs-in-project: true
-  #     - run: echo "%APPDATA%\pypoetry\venv\Scripts\poetry" >> $GITHUB_PATH
   #     - name: Install dependencies
   #       run: poetry install --no-interaction --no-root
   #     - name: Install library
@@ -93,6 +92,7 @@ jobs:
         with:
           version: 1.2.2
           virtualenvs-in-project: true
+      - run: echo "%APPDATA%\pypoetry\venv\Scripts\poetry" >> $GITHUB_PATH
       - name: Install dependencies
         run: poetry install --no-interaction --no-root
       - name: Install library

From 388ec9069e9e7eb607d5b94e3ac1a269e5489d33 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 4 Jul 2023 23:21:23 +0100
Subject: [PATCH 077/123] update windows path

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ce4ad60..01dcff6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -92,7 +92,7 @@ jobs:
         with:
           version: 1.2.2
           virtualenvs-in-project: true
-      - run: echo "%APPDATA%\pypoetry\venv\Scripts\poetry" >> $GITHUB_PATH
+      - run: echo "%APPDATA%\pypoetry\venv\Scripts\poetry | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
       - name: Install dependencies
         run: poetry install --no-interaction --no-root
       - name: Install library

From 56c62e5fe4c73d2175d7cf7ada9779fbd2144838 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 4 Jul 2023 23:22:45 +0100
Subject: [PATCH 078/123] update windows path

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 01dcff6..2ed5740 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -92,7 +92,7 @@ jobs:
         with:
           version: 1.2.2
           virtualenvs-in-project: true
-      - run: echo "%APPDATA%\pypoetry\venv\Scripts\poetry | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+      - run: echo "%APPDATA%\pypoetry\venv\Scripts\poetry" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
       - name: Install dependencies
         run: poetry install --no-interaction --no-root
       - name: Install library

From ff59f74bc795ab619af5ea3b27c487a2443796b4 Mon Sep 17 00:00:00 2001
From: capjamesg <jamesg@jamesg.blog>
Date: Tue, 4 Jul 2023 23:27:09 +0100
Subject: [PATCH 079/123] update windows path

---
 .github/workflows/tests.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2ed5740..472d9f9 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -79,6 +79,9 @@ jobs:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9", "pypy3.10"]
     runs-on: "windows-latest"
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@v3
         with:
@@ -92,7 +95,6 @@ jobs:
         with:
           version: 1.2.2
           virtualenvs-in-project: true
-      - run: echo "%APPDATA%\pypoetry\venv\Scripts\poetry" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
       - name: Install dependencies
         run: poetry install --no-interaction --no-root
       - name: Install library

From cd8a7862927b8b952e010186ae0f8c01e3bd3551 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <ragt.ag>
Date: Tue, 4 Jul 2023 15:44:25 -0700
Subject: [PATCH 080/123] Skip isort on Windows contributions until action is
 fixed

---
 .github/workflows/tests.yml | 134 ++++++++++++++++++------------------
 1 file changed, 67 insertions(+), 67 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 472d9f9..cbd1145 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,72 +8,72 @@ on:
       - main
 
 jobs:
-  # build-macos:
-  #   strategy:
-  #     matrix:
-  #       python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9", "pypy3.10"]
-  #   runs-on: "macos-latest"
-  #   steps:
-  #     - name: Install md5sha1sum
-  #       run: brew install md5sha1sum
-  #     - uses: actions/checkout@v3
-  #       with:
-  #         python-version: ${{ matrix.python-version }}
-  #     - name: Install Python
-  #       uses: actions/setup-python@v4
-  #       with:
-  #         python-version: ${{ matrix.python-version }}
-  #     - name: Install Poetry
-  #       uses: snok/install-poetry@v1
-  #       with:
-  #         version: 1.2.2
-  #         virtualenvs-in-project: true
-  #     - name: Install dependencies
-  #       run: poetry install --no-interaction --no-root
-  #     - name: Install library
-  #       run: poetry install --no-interaction
-  #     - name: Run tests
-  #       run: poetry run pytest
-  #     - uses: psf/black@stable
-  #       with:
-  #         options: "--check --verbose"
-  #         src: "./"
-  #         version: "23.3"
-  #     - uses: isort/isort-action@v1
-  # build-linux:
-  #   strategy:
-  #     matrix:
-  #       python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9", "pypy3.10"]
-  #   runs-on: "ubuntu-latest"
-  #   steps:
-  #     - name: Install libxml2
-  #       run: |
-  #         sudo apt-get update
-  #         sudo apt-get install libxml2 libxml2-dev libxslt1-dev
-  #     - uses: actions/checkout@v3
-  #       with:
-  #         python-version: ${{ matrix.python-version }}
-  #     - name: Install Python
-  #       uses: actions/setup-python@v4
-  #       with:
-  #         python-version: ${{ matrix.python-version }}
-  #     - name: Install Poetry
-  #       uses: snok/install-poetry@v1
-  #       with:
-  #         version: 1.2.2
-  #         virtualenvs-in-project: true
-  #     - name: Install dependencies
-  #       run: poetry install --no-interaction --no-root
-  #     - name: Install library
-  #       run: poetry install --no-interaction
-  #     - name: Run tests
-  #       run: poetry run pytest
-  #     - uses: psf/black@stable
-  #       with:
-  #         options: "--check --verbose"
-  #         src: "./"
-  #         version: "23.3"
-  #     - uses: isort/isort-action@v1
+  build-macos:
+    strategy:
+      matrix:
+        python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9", "pypy3.10"]
+    runs-on: "macos-latest"
+    steps:
+      - name: Install md5sha1sum
+        run: brew install md5sha1sum
+      - uses: actions/checkout@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          version: 1.2.2
+          virtualenvs-in-project: true
+      - name: Install dependencies
+        run: poetry install --no-interaction --no-root
+      - name: Install library
+        run: poetry install --no-interaction
+      - name: Run tests
+        run: poetry run pytest
+      - uses: psf/black@stable
+        with:
+          options: "--check --verbose"
+          src: "./"
+          version: "23.3"
+      - uses: isort/isort-action@v1
+  build-linux:
+    strategy:
+      matrix:
+        python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9", "pypy3.10"]
+    runs-on: "ubuntu-latest"
+    steps:
+      - name: Install libxml2
+        run: |
+          sudo apt-get update
+          sudo apt-get install libxml2 libxml2-dev libxslt1-dev
+      - uses: actions/checkout@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          version: 1.2.2
+          virtualenvs-in-project: true
+      - name: Install dependencies
+        run: poetry install --no-interaction --no-root
+      - name: Install library
+        run: poetry install --no-interaction
+      - name: Run tests
+        run: poetry run pytest
+      - uses: psf/black@stable
+        with:
+          options: "--check --verbose"
+          src: "./"
+          version: "23.3"
+      - uses: isort/isort-action@v1
   build-windows:
     strategy:
       matrix:
@@ -106,4 +106,4 @@ jobs:
           options: "--check --verbose"
           src: "./"
           version: "23.3"
-      - uses: isort/isort-action@v1
\ No newline at end of file
+      # - uses: isort/isort-action@v1

From f4d839cc1d8901b742e1a6844c7400bfe8f5321b Mon Sep 17 00:00:00 2001
From: Angelo Gladding <ragt.ag>
Date: Tue, 4 Jul 2023 15:54:59 -0700
Subject: [PATCH 081/123] Remove PyPy tests for Windows; lack of Poetry support

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index cbd1145..b731371 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -77,7 +77,7 @@ jobs:
   build-windows:
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9", "pypy3.10"]
+        python-version: ["3.8", "3.9", "3.10"]
     runs-on: "windows-latest"
     defaults:
       run:

From 3f750a2f22700cb5542bad117abf533beba96f3d Mon Sep 17 00:00:00 2001
From: Angelo Gladding <ragt.ag>
Date: Wed, 5 Jul 2023 18:07:09 -0700
Subject: [PATCH 082/123] Remove `img_with_alt` option entirely

---
 README.md                                     |  4 ++--
 mf2py/dom_helpers.py                          |  4 ++--
 mf2py/implied_properties.py                   |  7 +++----
 mf2py/parse_property.py                       |  4 ++--
 mf2py/parser.py                               | 19 +++++--------------
 .../{experimental => }/img_with_alt.html      |  0
 test/test_parser.py                           | 11 +++--------
 7 files changed, 17 insertions(+), 32 deletions(-)
 rename test/examples/{experimental => }/img_with_alt.html (100%)

diff --git a/README.md b/README.md
index bd765bd..155222b 100644
--- a/README.md
+++ b/README.md
@@ -76,9 +76,9 @@ p.to_dict(filter_by_type="h-entry")
 p.to_json(filter_by_type="h-entry")
 ```
 
-## Experimental Features 🧪
+## Breaking Changes in v2
 
-- Pass the optional argument `img_with_alt=True` to either the `Parser` object or to the `parse` method to enable parsing of the `alt` attribute of `<img>` tags according to [issue: image alt text is lost during parsing](https://github.com/microformats/microformats2-parsing/issues/2). By default this is `False` to be backwards compatible.
+- img alt support is now on by default
 
 ## FAQs ❓
 
diff --git a/mf2py/dom_helpers.py b/mf2py/dom_helpers.py
index 951ad6e..1882db5 100644
--- a/mf2py/dom_helpers.py
+++ b/mf2py/dom_helpers.py
@@ -39,7 +39,7 @@ def get_attr(el, attr, check_name=None):
         return el.get(attr)
 
 
-def get_img_src_alt(img, img_with_alt, base_url=""):
+def get_img_src_alt(img, base_url=""):
     """given a img element, returns both src and alt attributes as a list of tuples if alt exists, else returns the src as a string
     use for alt parsing with img
     """
@@ -50,7 +50,7 @@ def get_img_src_alt(img, img_with_alt, base_url=""):
     if src is not None:
         src = try_urljoin(base_url, src)
 
-        if alt is None or not img_with_alt:
+        if alt is None:
             return src
         else:
             return {"value": src, "alt": alt}
diff --git a/mf2py/implied_properties.py b/mf2py/implied_properties.py
index 2f4ae66..c3e1bcd 100644
--- a/mf2py/implied_properties.py
+++ b/mf2py/implied_properties.py
@@ -73,12 +73,11 @@ def non_empty(val):
     return get_textContent(el, replace_img=True, img_to_src=False, base_url=base_url)
 
 
-def photo(el, img_with_alt, base_url=""):
+def photo(el, base_url=""):
     """Find an implied photo property
 
     Args:
       el (bs4.element.Tag): a DOM element
-      img_with_alt: a flag to enable experimental parsing of alt attribute with img (set by the Parser object)
       base_url (string): the base URL to use, to reconcile relative URLs
 
     Returns:
@@ -105,7 +104,7 @@ def get_photo_child(children):
                 return poss_obj
 
     # if element is an img use source if exists
-    prop_value = get_img_src_alt(el, img_with_alt, base_url)
+    prop_value = get_img_src_alt(el, base_url)
     if prop_value is not None:
         return prop_value
 
@@ -132,7 +131,7 @@ def get_photo_child(children):
     # if a possible child was found parse
     if poss_child is not None:
         # img get src
-        prop_value = get_img_src_alt(poss_child, img_with_alt, base_url)
+        prop_value = get_img_src_alt(poss_child, base_url)
         if prop_value is not None:
             return prop_value
 
diff --git a/mf2py/parse_property.py b/mf2py/parse_property.py
index 762f4eb..5be3a71 100644
--- a/mf2py/parse_property.py
+++ b/mf2py/parse_property.py
@@ -26,12 +26,12 @@ def text(el, base_url=""):
     return prop_value
 
 
-def url(el, img_with_alt, base_url=""):
+def url(el, base_url=""):
     """Process u-* properties"""
 
     prop_value = get_attr(el, "href", check_name=("a", "area", "link"))
     if prop_value is None:
-        prop_value = get_img_src_alt(el, img_with_alt, base_url)
+        prop_value = get_img_src_alt(el, base_url)
         if prop_value is not None:
             return prop_value
     if prop_value is None:
diff --git a/mf2py/parser.py b/mf2py/parser.py
index 520d29f..414ede6 100644
--- a/mf2py/parser.py
+++ b/mf2py/parser.py
@@ -12,7 +12,7 @@
 from .version import __version__
 
 
-def parse(doc=None, url=None, html_parser=None, img_with_alt=False):
+def parse(doc=None, url=None, html_parser=None):
     """
     Parse a microformats2 document or url and return a json dictionary.
 
@@ -28,7 +28,7 @@ def parse(doc=None, url=None, html_parser=None, img_with_alt=False):
 
     Return: a json dict represented the structured data in this document.
     """
-    return Parser(doc, url, html_parser, img_with_alt).to_dict()
+    return Parser(doc, url, html_parser).to_dict()
 
 
 class Parser(object):
@@ -54,7 +54,7 @@ class Parser(object):
     ua_url = "https://github.com/microformats/mf2py"
     useragent = "{0} - version {1} - {2}".format(ua_desc, __version__, ua_url)
 
-    def __init__(self, doc=None, url=None, html_parser=None, img_with_alt=True):
+    def __init__(self, doc=None, url=None, html_parser=None):
         self.__url__ = None
         self.__doc__ = None
         self._preserve_doc = False
@@ -68,7 +68,6 @@ def __init__(self, doc=None, url=None, html_parser=None, img_with_alt=True):
                 "version": __version__,
             },
         }
-        self.__img_with_alt__ = img_with_alt
 
         # use default parser if none specified
         self.__html_parser__ = html_parser or "html5lib"
@@ -194,11 +193,7 @@ def handle_microformat(
                 if "photo" not in properties and parsed_types_aggregation.isdisjoint(
                     "uh"
                 ):
-                    x = implied_properties.photo(
-                        el,
-                        self.__img_with_alt__,
-                        base_url=self.__url__,
-                    )
+                    x = implied_properties.photo(el, base_url=self.__url__)
                     if x is not None:
                         properties["photo"] = [x]
 
@@ -304,11 +299,7 @@ def parse_props(el):
 
                 # if value has not been parsed then parse it
                 if u_value is None:
-                    u_value = parse_property.url(
-                        el,
-                        self.__img_with_alt__,
-                        base_url=self.__url__,
-                    )
+                    u_value = parse_property.url(el, base_url=self.__url__)
 
                 if root_class_names:
                     prop_value.append(
diff --git a/test/examples/experimental/img_with_alt.html b/test/examples/img_with_alt.html
similarity index 100%
rename from test/examples/experimental/img_with_alt.html
rename to test/examples/img_with_alt.html
diff --git a/test/test_parser.py b/test/test_parser.py
index afa7016..250316e 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -852,20 +852,15 @@ def test_whitespace_with_tags_inside_property():
     assert result["items"][0]["properties"] == {"name": ["foo bar"]}
 
 
-# experimental features tests
-
-
 def test_photo_with_alt():
-    """Confirm that alt text in img is parsed with feature flag img_with_alt under as a u-* property and implied photo"""
+    """Confirm that alt text in img is parsed as a u-* property and implied photo"""
 
-    path = "experimental/img_with_alt.html"
+    path = "img_with_alt.html"
 
-    # without flag
     result = parse_fixture(path)
 
-    # experimental img_with_alt=True
     with open(os.path.join(TEST_DIR, path)) as f:
-        exp_result = Parser(doc=f, html_parser="html5lib", img_with_alt=True).to_dict()
+        exp_result = Parser(doc=f, html_parser="html5lib").to_dict()
 
     # simple img with u-*
     assert "/photo.jpg" == result["items"][0]["properties"]["photo"][0]

From 0abe5e08ffa5c21a2f3fa09de35fc14a4c61efad Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Fri, 13 Oct 2023 19:15:10 -0700
Subject: [PATCH 083/123] Update tests.yml

---
 .github/workflows/tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b731371..ec13c9b 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.2.2
+          version: 1.5.1
           virtualenvs-in-project: true
       - name: Install dependencies
         run: poetry install --no-interaction --no-root
@@ -60,7 +60,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.2.2
+          version: 1.5.1
           virtualenvs-in-project: true
       - name: Install dependencies
         run: poetry install --no-interaction --no-root
@@ -93,7 +93,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.2.2
+          version: 1.5.1
           virtualenvs-in-project: true
       - name: Install dependencies
         run: poetry install --no-interaction --no-root

From 6e85dadc1a4aa14e963793f29f955d6a7def0b97 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Fri, 13 Oct 2023 19:27:45 -0700
Subject: [PATCH 084/123] Update tests.yml

Bump poetry to 1.6 and remove pypy from matrix
---
 .github/workflows/tests.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ec13c9b..a019a6d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
   build-macos:
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9", "pypy3.10"]
+        python-version: ["3.8", "3.9", "3.10"]
     runs-on: "macos-latest"
     steps:
       - name: Install md5sha1sum
@@ -26,7 +26,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.5.1
+          version: 1.6
           virtualenvs-in-project: true
       - name: Install dependencies
         run: poetry install --no-interaction --no-root
@@ -43,7 +43,7 @@ jobs:
   build-linux:
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "pypy3.8", "pypy3.9", "pypy3.10"]
+        python-version: ["3.8", "3.9", "3.10"]
     runs-on: "ubuntu-latest"
     steps:
       - name: Install libxml2
@@ -60,7 +60,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.5.1
+          version: 1.6
           virtualenvs-in-project: true
       - name: Install dependencies
         run: poetry install --no-interaction --no-root
@@ -93,7 +93,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.5.1
+          version: 1.6
           virtualenvs-in-project: true
       - name: Install dependencies
         run: poetry install --no-interaction --no-root

From 1eefde442f1b692c60cf899a041d0d07b9a768c4 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Fri, 13 Oct 2023 19:30:41 -0700
Subject: [PATCH 085/123] Update tests.yml

Revert to latest poetry version supported by poetry action
---
 .github/workflows/tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a019a6d..f5e1c36 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.6
+          version: 1.5.1
           virtualenvs-in-project: true
       - name: Install dependencies
         run: poetry install --no-interaction --no-root
@@ -60,7 +60,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.6
+          version: 1.5.1
           virtualenvs-in-project: true
       - name: Install dependencies
         run: poetry install --no-interaction --no-root
@@ -93,7 +93,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.6
+          version: 1.5.1
           virtualenvs-in-project: true
       - name: Install dependencies
         run: poetry install --no-interaction --no-root

From 8e651fdd532186dfd6c0298216334b15b8df3686 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Fri, 13 Oct 2023 19:38:13 -0700
Subject: [PATCH 086/123] Update tests.yml

Add python versions 3.11 and 3.12 to matrix
---
 .github/workflows/tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f5e1c36..2417a3d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
   build-macos:
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
     runs-on: "macos-latest"
     steps:
       - name: Install md5sha1sum
@@ -43,7 +43,7 @@ jobs:
   build-linux:
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
     runs-on: "ubuntu-latest"
     steps:
       - name: Install libxml2
@@ -77,7 +77,7 @@ jobs:
   build-windows:
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
     runs-on: "windows-latest"
     defaults:
       run:

From 15553777bb4835e6331dfb2e7043b3cd0bdaf8d0 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Sun, 15 Oct 2023 11:56:40 -0700
Subject: [PATCH 087/123] Resolve implied photo relative paths (#205)

Co-authored-by: Angelo Gladding <ragt.ag>
---
 mf2py/implied_properties.py                   | 27 ++++++++++---------
 .../implied_photo_relative_url.html           |  5 ++++
 test/test_parser.py                           | 11 ++++++++
 3 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 test/examples/implied_properties/implied_photo_relative_url.html

diff --git a/mf2py/implied_properties.py b/mf2py/implied_properties.py
index c3e1bcd..20ae2a5 100644
--- a/mf2py/implied_properties.py
+++ b/mf2py/implied_properties.py
@@ -103,15 +103,20 @@ def get_photo_child(children):
             if not mf2_classes.root(poss_obj.get("class", [])):
                 return poss_obj
 
-    # if element is an img use source if exists
-    prop_value = get_img_src_alt(el, base_url)
-    if prop_value is not None:
+    def resolve_relative_url(prop_value):
+        if isinstance(prop_value, dict):
+            prop_value["value"] = try_urljoin(base_url, prop_value["value"])
+        else:
+            prop_value = try_urljoin(base_url, prop_value)
         return prop_value
 
+    # if element is an img use source if exists
+    if prop_value := get_img_src_alt(el, base_url):
+        return resolve_relative_url(prop_value)
+
     # if element is an object use data if exists
-    prop_value = get_attr(el, "data", check_name="object")
-    if prop_value is not None:
-        return prop_value
+    if prop_value := get_attr(el, "data", check_name="object"):
+        return resolve_relative_url(prop_value)
 
     # find candidate child or grandchild
     poss_child = None
@@ -131,14 +136,12 @@ def get_photo_child(children):
     # if a possible child was found parse
     if poss_child is not None:
         # img get src
-        prop_value = get_img_src_alt(poss_child, base_url)
-        if prop_value is not None:
-            return prop_value
+        if prop_value := get_img_src_alt(poss_child, base_url):
+            return resolve_relative_url(prop_value)
 
         # object get data
-        prop_value = get_attr(poss_child, "data", check_name="object")
-        if prop_value is not None:
-            return prop_value
+        if prop_value := get_attr(poss_child, "data", check_name="object"):
+            return resolve_relative_url(prop_value)
 
 
 def url(el, base_url=""):
diff --git a/test/examples/implied_properties/implied_photo_relative_url.html b/test/examples/implied_properties/implied_photo_relative_url.html
new file mode 100644
index 0000000..f9db03f
--- /dev/null
+++ b/test/examples/implied_properties/implied_photo_relative_url.html
@@ -0,0 +1,5 @@
+<html>
+<base href="http://example.com">
+<img class="h-card" alt="Jane Doe" src="jane-img.jpeg">
+<object class="h-card" data="jane-object.jpeg">Jane Doe</object>
+</html>
diff --git a/test/test_parser.py b/test/test_parser.py
index 250316e..b9ab5a2 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -455,6 +455,17 @@ def test_implied_photo():
     for i in range(12, 23):
         assert "photo" not in result["items"][i]["properties"]
 
+    result = parse_fixture("implied_properties/implied_photo_relative_url.html")
+
+    assert (
+        result["items"][0]["properties"]["photo"][0]["value"]
+        == "http://example.com/jane-img.jpeg"
+    )
+    assert (
+        result["items"][1]["properties"]["photo"][0]
+        == "http://example.com/jane-object.jpeg"
+    )
+
 
 def test_implied_url():
     result = parse_fixture("implied_properties/implied_url.html")

From 5b48e7a0dbdd960710ca50bb58fda18c33e5949e Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Mon, 16 Oct 2023 01:36:20 -0700
Subject: [PATCH 088/123] Add timezone offset normalisation (#206)

Applies to VCP and standard dt- objects.

Co-authored-by: Angelo Gladding <ragt.ag>
---
 mf2py/datetime_helpers.py |  2 +-
 test/test_parser.py       | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/mf2py/datetime_helpers.py b/mf2py/datetime_helpers.py
index 93032e3..9f4328b 100644
--- a/mf2py/datetime_helpers.py
+++ b/mf2py/datetime_helpers.py
@@ -58,5 +58,5 @@ def normalize_datetime(dtstr, match=None):
 
         tzstr = match.group("tz")
         if tzstr:
-            dtstr += tzstr
+            dtstr += tzstr.replace(":", "")
     return dtstr
diff --git a/test/test_parser.py b/test/test_parser.py
index b9ab5a2..6a131f8 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -136,11 +136,11 @@ def test_plain_child_microformat():
 
 def test_datetime_parsing():
     result = parse_fixture("datetimes.html")
-    assert result["items"][0]["properties"]["start"][0] == "2014-01-01T12:00:00+00:00"
-    assert result["items"][0]["properties"]["end"][0] == "3014-01-01T18:00:00+00:00"
+    assert result["items"][0]["properties"]["start"][0] == "2014-01-01T12:00:00+0000"
+    assert result["items"][0]["properties"]["end"][0] == "3014-01-01T18:00:00+0000"
     assert result["items"][0]["properties"]["duration"][0] == "P1000Y"
-    assert result["items"][0]["properties"]["updated"][0] == "2011-08-26T00:01:21+00:00"
-    assert result["items"][0]["properties"]["updated"][1] == "2011-08-26T00:01:21+00:00"
+    assert result["items"][0]["properties"]["updated"][0] == "2011-08-26T00:01:21+0000"
+    assert result["items"][0]["properties"]["updated"][1] == "2011-08-26T00:01:21+0000"
 
 
 def test_datetime_vcp_parsing():
@@ -149,19 +149,19 @@ def test_datetime_vcp_parsing():
     assert result["items"][1]["properties"]["published"][0] == "3014-01-01 01:21Z"
     assert result["items"][2]["properties"]["updated"][0] == "2014-03-11 09:55"
     assert result["items"][3]["properties"]["published"][0] == "2014-01-30 15:28"
-    assert result["items"][4]["properties"]["published"][0] == "9999-01-14T11:52+08:00"
-    assert result["items"][5]["properties"]["published"][0] == "2014-06-01 12:30-06:00"
-    assert result["items"][8]["properties"]["start"][0] == "2014-06-01 12:30-06:00"
-    assert result["items"][9]["properties"]["start"][0] == "2014-06-01 12:30-06:00"
-    assert result["items"][10]["properties"]["start"][0] == "2014-06-01 00:30-06:00"
+    assert result["items"][4]["properties"]["published"][0] == "9999-01-14T11:52+0800"
+    assert result["items"][5]["properties"]["published"][0] == "2014-06-01 12:30-0600"
+    assert result["items"][8]["properties"]["start"][0] == "2014-06-01 12:30-0600"
+    assert result["items"][9]["properties"]["start"][0] == "2014-06-01 12:30-0600"
+    assert result["items"][10]["properties"]["start"][0] == "2014-06-01 00:30-0600"
     assert result["items"][10]["properties"]["end"][0] == "2014-06-01 12:15"
-    assert result["items"][10]["properties"]["start"][1] == "2014-06-01 00:30-06:00"
+    assert result["items"][10]["properties"]["start"][1] == "2014-06-01 00:30-0600"
     assert result["items"][10]["properties"]["end"][1] == "2014-06-01 12:15"
-    assert result["items"][11]["properties"]["start"][0] == "2016-03-02 00:30-06:00"
-    assert result["items"][12]["properties"]["start"][0] == "2014-06-01 12:30-6:00"
-    assert result["items"][13]["properties"]["start"][0] == "2014-06-01 12:30+6:00"
+    assert result["items"][11]["properties"]["start"][0] == "2016-03-02 00:30-0600"
+    assert result["items"][12]["properties"]["start"][0] == "2014-06-01 12:30-600"
+    assert result["items"][13]["properties"]["start"][0] == "2014-06-01 12:30+600"
     assert result["items"][14]["properties"]["start"][0] == "2014-06-01 12:30Z"
-    assert result["items"][15]["properties"]["start"][0] == "2014-06-01 12:30-6:00"
+    assert result["items"][15]["properties"]["start"][0] == "2014-06-01 12:30-600"
 
 
 def test_dt_end_implied_date():
@@ -175,8 +175,8 @@ def test_dt_end_implied_date():
     assert event_wo_tz["properties"]["end"][0] == "2014-05-21 19:30"
 
     event_w_tz = result["items"][7]
-    assert event_w_tz["properties"]["start"][0] == "2014-06-01 12:30-06:00"
-    assert event_w_tz["properties"]["end"][0] == "2014-06-01 19:30-06:00"
+    assert event_w_tz["properties"]["start"][0] == "2014-06-01 12:30-0600"
+    assert event_w_tz["properties"]["end"][0] == "2014-06-01 19:30-0600"
 
 
 def test_embedded_parsing():

From e2a6e00369374be26c8132b612b8118e08946b5e Mon Sep 17 00:00:00 2001
From: Angelo Gladding <ragt.ag>
Date: Tue, 24 Oct 2023 16:24:06 -0700
Subject: [PATCH 089/123] Make README testable

---
 Makefile     |  4 ++--
 README.md    | 40 +++++++++++++++++++++++++++++++++-------
 example.html | 12 ++++++++++++
 pytest.ini   |  2 ++
 4 files changed, 49 insertions(+), 9 deletions(-)
 create mode 100644 example.html
 create mode 100644 pytest.ini

diff --git a/Makefile b/Makefile
index f050375..a0fc119 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 install:
 	poetry install
-test:
-	poetry run pytest
+tests:
+	poetry run pytest --doctest-modules -s -vv --doctest-glob README*
 publish:
 	poetry publish --build
 lint:
diff --git a/README.md b/README.md
index 155222b..bdbf0a9 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,9 @@ mf2py implements the full mf2 specification, including backward compatibility wi
 To install `mf2py`, run the following command:
 
 ```bash
+
 pip install mf2py
+
 ```
 
 ## Quickstart 🚀
@@ -24,7 +26,9 @@ pip install mf2py
 Import the parser using:
 
 ```python
-import mf2py
+
+>>> import mf2py
+
 ```
 
 ### Parse a File
@@ -32,8 +36,21 @@ import mf2py
 Parse a file containing HTML:
 
 ```python
-with open('file/content.html','r') as file:
-    obj = mf2py.parse(doc=file)
+
+>>> with open("example.html", "r") as file:
+...     mf2json = mf2py.parse(doc=file)
+>>> mf2json
+{'items': [{'type': ['h-entry'],
+            'properties': {'name': ['Hello'],
+                           'content': [{'html': 'Just saying hi.',
+                                        'value': 'Just saying hi.'}]}}],
+ 'rels': {},
+ 'rel-urls': {},
+ 'debug': {'description': 'mf2py - microformats2 parser for python',
+           'source': 'https://github.com/microformats/mf2py',
+           'version': '1.1.3',
+           'markup parser': 'html5lib'}}
+
 ```
 
 ### Parse a String
@@ -41,16 +58,21 @@ with open('file/content.html','r') as file:
 Parse string containing HTML content:
 
 ```python
-content = '<article class="h-entry"><h1 class="p-name">Hello</h1></article>'
-obj = mf2py.parse(doc=content)
+
+>>> content = '<article class="h-entry"><h1 class="p-name">Hello</h1></article>'
+>>> mf2py.parse(doc=content)["items"]
+[{'type': ['h-entry'], 'properties': {'name': ['Hello']}}]
+
 ```
 
-### Parse a HTML Document Retrieved from a URL
+### Parse an HTML Document Retrieved from a URL
 
 Parse content from a URL:
 
 ```python
-obj = mf2py.parse(url="http://tommorris.org/")
+
+>>> mf2json = mf2py.parse(url="https://indieweb.org")
+
 ```
 
 `parse` is a convenience method that actually delegates to
@@ -62,9 +84,11 @@ available by invoking the object directly.
 Retrieve parsed microformats as a Python dictionary or JSON string:
 
 ```python
+
 p = mf2py.Parser(...)
 p.to_dict()  # returns a python dictionary
 p.to_json()  # returns a JSON string
+
 ```
 
 ### Filter by Microformat Type
@@ -72,8 +96,10 @@ p.to_json()  # returns a JSON string
 Filter by microformat type:
 
 ```python
+
 p.to_dict(filter_by_type="h-entry")
 p.to_json(filter_by_type="h-entry")
+
 ```
 
 ## Breaking Changes in v2
diff --git a/example.html b/example.html
new file mode 100644
index 0000000..140f331
--- /dev/null
+++ b/example.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<html lang=en-us>
+<head>
+<base href=https://example.com>
+</head>
+<body>
+<div class=h-entry>
+<h1 class=p-name>Hello</h1>
+<div class=e-content>Just saying hi.</div>
+</div>
+</body>
+</html>
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 0000000..5a96837
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+doctest_optionflags = NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL

From cb760872aa6fc6f0bfc4d2af3dcb9f277754a0fe Mon Sep 17 00:00:00 2001
From: Angelo Gladding <ragt.ag>
Date: Tue, 24 Oct 2023 16:47:23 -0700
Subject: [PATCH 090/123] Use Makefile to run tests in workflow

---
 .github/workflows/tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2417a3d..cd5e412 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Install library
         run: poetry install --no-interaction
       - name: Run tests
-        run: poetry run pytest
+        run: make tests
       - uses: psf/black@stable
         with:
           options: "--check --verbose"
@@ -67,7 +67,7 @@ jobs:
       - name: Install library
         run: poetry install --no-interaction
       - name: Run tests
-        run: poetry run pytest
+        run: make tests
       - uses: psf/black@stable
         with:
           options: "--check --verbose"
@@ -100,7 +100,7 @@ jobs:
       - name: Install library
         run: poetry install --no-interaction
       - name: Run tests
-        run: poetry run pytest
+        run: make tests
       - uses: psf/black@stable
         with:
           options: "--check --verbose"

From 6e50b12b172a56550f5ec8a99fb6f1011a5558d7 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Tue, 28 Nov 2023 14:00:32 -0800
Subject: [PATCH 091/123] Clean up whitespace in CHANGELOG.md

---
 CHANGELOG.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f401ec..3a578fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@ All notable changes to this project will be documented in this file.
 ## 1.1.1 - 2018-06-15
 
 - streamline backcompat to use JSON only.
-- fix multiple mf1 root rel-tag parsing 
+- fix multiple mf1 root rel-tag parsing
 - correct url and photo for hreview.
 - add rules for nested hreview. update backcompat to use multiple matches in old properties.
 - fix `rel-tag` to `p-category` conversion so that other classes are not lost.
@@ -34,11 +34,11 @@ All notable changes to this project will be documented in this file.
 - better whitespace algorithm for `name` and `html.value` parsing
 - experimental flag for including `alt` in `u-photo` parsing
 - make a copy of the BeautifulSoup given by user to work on for parsing to prevent changes to original doc
-- bump version to 1.1.1 
+- bump version to 1.1.1
 
 ## 1.1.0 - 2018-03-16
 
-- bump version to 1.1.0 since it is a "major" change 
+- bump version to 1.1.0 since it is a "major" change
 - added tests for new implied name rules
 - modified earlier tests to accommodate new rules
 - use space separator instead of "T"
@@ -56,12 +56,12 @@ All notable changes to this project will be documented in this file.
 ## 1.0.6 - 2018-03-04
 
 - strip leading/trailing white space for `e-*[html]`. update the corresponding tests
-- blank values explicitly authored are allowed as property values 
+- blank values explicitly authored are allowed as property values
 - include `alt` or `src` from `<img>` in parsing for `p-*` and `e-*[value]`
-- parse `title` from `<link>` for `p-*` resolves #84 
-- and `poster` from `<video>` for `u-*` resolves #76 
+- parse `title` from `<link>` for `p-*` resolves #84
+- and `poster` from `<video>` for `u-*` resolves #76
 - use `html5lib` as default parser
-- use the final redirect URL resolves #62 
+- use the final redirect URL resolves #62
 - update requirements to use BS4 v4.6.0 and html5lib v1.0.1
 - drop support for Python 2.6 as html5lib dropped support
 

From 1cd05c6050629d72805b4866e5fa3203230aed79 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Tue, 28 Nov 2023 14:01:45 -0800
Subject: [PATCH 092/123] Fix lint instructions in CONTRIBUTING.md

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6efe68f..29ce771 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -38,7 +38,7 @@ PRs must pass all tests and linting requirements before they can be merged.
 Before you submit a PR to `mf2py`, run the following command in the base directory of the project:
 
 ```bash
-make style
+make lint
 ```
 
 This will format your code using the linters configured with the project.

From ab580f608e1c5bbf22c7ac372453852cc962b79f Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Tue, 28 Nov 2023 15:48:22 -0800
Subject: [PATCH 093/123] Prepare CHANGELOG for 2.0 release

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a578fa..dc861a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 2.0 - unreleased
+
 ## 1.1.3 - 2023-06-28
 - reduce instances where photo is implied (#135)
 - always do relative URL resolution (#138)

From a0edfdbc7d36480ea95d2cad9d65b1ba00060fe7 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Thu, 30 Nov 2023 01:06:53 -0800
Subject: [PATCH 094/123] Make relative URLs in `e-*` properties absolute
 (#201)

---
 CHANGELOG.md                         |  1 +
 mf2py/parse_property.py              |  4 ++++
 test/examples/relative_url_in_e.html | 13 +++++++++++++
 test/test_parser.py                  | 10 ++++++++++
 4 files changed, 28 insertions(+)
 create mode 100644 test/examples/relative_url_in_e.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc861a6..953bee2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 All notable changes to this project will be documented in this file.
 
 ## 2.0 - unreleased
+- make relative URLs in e-* properties absolute (#201)
 
 ## 1.1.3 - 2023-06-28
 - reduce instances where photo is implied (#135)
diff --git a/mf2py/parse_property.py b/mf2py/parse_property.py
index 5be3a71..d654d7c 100644
--- a/mf2py/parse_property.py
+++ b/mf2py/parse_property.py
@@ -96,6 +96,10 @@ def datetime(el, default_date=None):
 
 def embedded(el, base_url=""):
     """Process e-* properties"""
+    for tag in el.find_all():
+        for attr in ("href", "src", "cite", "data", "poster"):
+            if attr in tag.attrs:
+                tag.attrs[attr] = try_urljoin(base_url, tag.attrs[attr])
     return {
         "html": el.decode_contents().strip(),  # secret bs4 method to get innerHTML
         "value": get_textContent(el, replace_img=True, base_url=base_url),
diff --git a/test/examples/relative_url_in_e.html b/test/examples/relative_url_in_e.html
new file mode 100644
index 0000000..19f19ed
--- /dev/null
+++ b/test/examples/relative_url_in_e.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8">
+  <title>Relative URLs in e-content</title>
+  <base href="http://example.com/" />
+</head>
+<body>
+<div class="h-entry">
+<div class="e-content"><p><a href=/cat.html>Cat <img src=cat.jpg></a></p></div>
+</div>
+</body>
+</html>
diff --git a/test/test_parser.py b/test/test_parser.py
index 6a131f8..b081fc2 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -389,6 +389,16 @@ def test_complex_e_content():
     } == result["items"][0]
 
 
+def test_relative_url_in_e():
+    """When parsing e-* properties, make relative URLs absolute."""
+    result = parse_fixture("relative_url_in_e.html")
+
+    assert (
+        '<p><a href="http://example.com/cat.html">Cat '
+        '<img src="http://example.com/cat.jpg"/></a></p>'
+    ) == result["items"][0]["properties"]["content"][0]["html"]
+
+
 def test_nested_values():
     """When parsing nested microformats, check that value is the value of
     the simple property element"""

From f5e43b1e394bce9f18b8905e95e216d5afb50705 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Thu, 30 Nov 2023 01:10:57 -0800
Subject: [PATCH 095/123] Fix whitespace in plaintext conversion (#207)

---
 CHANGELOG.md                                |  1 +
 mf2py/dom_helpers.py                        |  3 +-
 test/examples/plaintext_img_whitespace.html | 19 ++++++++++
 test/examples/plaintext_p_whitespace.html   | 17 +++++++++
 test/examples/value_name_whitespace.html    | 18 ++++-----
 test/test_parser.py                         | 42 +++++++++++++++++----
 6 files changed, 82 insertions(+), 18 deletions(-)
 create mode 100644 test/examples/plaintext_img_whitespace.html
 create mode 100644 test/examples/plaintext_p_whitespace.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 953bee2..57c41de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 
 ## 2.0 - unreleased
 - make relative URLs in e-* properties absolute (#201)
+- fix whitespace in plaintext conversion (#207)
 
 ## 1.1.3 - 2023-06-28
 - reduce instances where photo is implied (#135)
diff --git a/mf2py/dom_helpers.py b/mf2py/dom_helpers.py
index 1882db5..26839cd 100644
--- a/mf2py/dom_helpers.py
+++ b/mf2py/dom_helpers.py
@@ -119,8 +119,7 @@ def text_collection(el, replace_img=False, img_to_src=True, base_url=""):
                 items.extend(child_items)
 
             if el.name == "p":
-                items = [P_BREAK_BEFORE] + items
-                items.append(P_BREAK_AFTER)
+                items = [P_BREAK_BEFORE] + items + [P_BREAK_AFTER, "\n"]
 
         return items
 
diff --git a/test/examples/plaintext_img_whitespace.html b/test/examples/plaintext_img_whitespace.html
new file mode 100644
index 0000000..7929b4b
--- /dev/null
+++ b/test/examples/plaintext_img_whitespace.html
@@ -0,0 +1,19 @@
+<base href="https://example.com">
+
+<div class="h-entry">
+  <div class="e-content">
+    <img src="/photo.jpg" alt="selfie">At some tourist spot
+  </div>
+</div>
+
+<div class="h-entry">
+  <div class="e-content">
+    <img src="/photo.jpg" alt="">At another tourist spot
+  </div>
+</div>
+
+<div class="h-entry">
+  <div class="e-content">
+    <img src="/photo.jpg">At yet another tourist spot
+  </div>
+</div>
diff --git a/test/examples/plaintext_p_whitespace.html b/test/examples/plaintext_p_whitespace.html
new file mode 100644
index 0000000..22ad75e
--- /dev/null
+++ b/test/examples/plaintext_p_whitespace.html
@@ -0,0 +1,17 @@
+<div class="h-entry">
+  <div class="e-content">
+    <p>foo</p><img src="pic.png" alt="bar">baz
+  </div>
+</div>
+
+<div class="h-entry">
+  <div class="e-content">
+    <p>foo</p>bar baz
+  </div>
+</div>
+
+<div class="h-entry">
+  <div class="e-content">
+    foo bar<p>baz</p>
+  </div>
+</div>
diff --git a/test/examples/value_name_whitespace.html b/test/examples/value_name_whitespace.html
index 33aca40..ce8b3f3 100644
--- a/test/examples/value_name_whitespace.html
+++ b/test/examples/value_name_whitespace.html
@@ -22,10 +22,6 @@
 World</p></div>
 </div>
 
-<div class="h-entry">
-  <div class="e-content p-name"><p>Hello</p><p>World</p></div>
-</div>
-
 <div class="h-entry">
   <div class="e-content p-name">Hello<br>
     World</div>
@@ -36,11 +32,7 @@
 </div>
 
 <div class="h-entry">
-  <div class="e-content p-name">
-    <p>One</p>
-    <p>Two</p>
-    <p>Three</p>
-  </div>
+  <div class="e-content p-name"><p>Hello</p><p>World</p></div>
 </div>
 
 <div class="h-entry">
@@ -51,6 +43,14 @@
   </div>
 </div>
 
+<div class="h-entry">
+  <div class="e-content p-name">
+    <p>One</p>
+    <p>Two</p>
+    <p>Three</p>
+  </div>
+</div>
+
 <div class="h-entry">
   <div class="e-content p-name">
     Hello World
diff --git a/test/test_parser.py b/test/test_parser.py
index b081fc2..4d95118 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -187,7 +187,7 @@ def test_embedded_parsing():
     )
     assert (
         result["items"][0]["properties"]["content"][0]["value"]
-        == "Blah blah blah blah blah.\nBlah.\nBlah blah blah."
+        == "Blah blah blah blah blah.\n\nBlah.\n\nBlah blah blah."
     )
 
 
@@ -615,15 +615,20 @@ def test_value_name_whitespace():
         assert result["items"][i]["properties"]["content"][0]["value"] == "Hello World"
         assert result["items"][i]["properties"]["name"][0] == "Hello World"
 
-    for i in range(3, 8):
+    for i in range(3, 7):
         assert result["items"][i]["properties"]["content"][0]["value"] == "Hello\nWorld"
         assert result["items"][i]["properties"]["name"][0] == "Hello\nWorld"
 
-    for i in range(8, 10):
-        assert (
-            result["items"][i]["properties"]["content"][0]["value"] == "One\nTwo\nThree"
-        )
-        assert result["items"][i]["properties"]["name"][0] == "One\nTwo\nThree"
+    assert result["items"][7]["properties"]["content"][0]["value"] == "Hello\n\nWorld"
+    assert result["items"][7]["properties"]["name"][0] == "Hello\n\nWorld"
+
+    assert result["items"][8]["properties"]["content"][0]["value"] == "One\nTwo\nThree"
+    assert result["items"][8]["properties"]["name"][0] == "One\nTwo\nThree"
+
+    assert (
+        result["items"][9]["properties"]["content"][0]["value"] == "One\n\nTwo\n\nThree"
+    )
+    assert result["items"][9]["properties"]["name"][0] == "One\n\nTwo\n\nThree"
 
     assert (
         result["items"][10]["properties"]["content"][0]["value"]
@@ -873,6 +878,29 @@ def test_whitespace_with_tags_inside_property():
     assert result["items"][0]["properties"] == {"name": ["foo bar"]}
 
 
+def test_plaintext_p_whitespace():
+    result = parse_fixture("plaintext_p_whitespace.html")
+    assert result["items"][0]["properties"]["content"][0]["value"] == "foo\nbar baz"
+    assert result["items"][1]["properties"]["content"][0]["value"] == "foo\nbar baz"
+    assert result["items"][2]["properties"]["content"][0]["value"] == "foo bar\nbaz"
+
+
+def test_plaintext_img_whitespace():
+    result = parse_fixture("plaintext_img_whitespace.html")
+    assert (
+        result["items"][0]["properties"]["content"][0]["value"]
+        == "selfie At some tourist spot"
+    )
+    assert (
+        result["items"][1]["properties"]["content"][0]["value"]
+        == "At another tourist spot"
+    )
+    assert (
+        result["items"][2]["properties"]["content"][0]["value"]
+        == "https://example.com/photo.jpg At yet another tourist spot"
+    )
+
+
 def test_photo_with_alt():
     """Confirm that alt text in img is parsed as a u-* property and implied photo"""
 

From cf322c49dfdba8eec2685b4736c34e00c35db80a Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Thu, 30 Nov 2023 01:14:18 -0800
Subject: [PATCH 096/123] Add srcset support (#209)

- a source without a descriptor defaults to `1x`
- sources with already seen descriptors are ignored
- URLs may contain a comma
---
 CHANGELOG.md                                 |  1 +
 mf2py/dom_helpers.py                         | 45 ++++++++----
 mf2py/implied_properties.py                  | 12 +--
 mf2py/parse_property.py                      |  4 +-
 test/examples/img_with_srcset.html           | 77 ++++++++++++++++++++
 test/examples/img_with_srcset_with_base.html | 11 +++
 test/test_parser.py                          | 38 ++++++++++
 7 files changed, 163 insertions(+), 25 deletions(-)
 create mode 100644 test/examples/img_with_srcset.html
 create mode 100644 test/examples/img_with_srcset_with_base.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57c41de..b100367 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
 ## 2.0 - unreleased
 - make relative URLs in e-* properties absolute (#201)
 - fix whitespace in plaintext conversion (#207)
+- add srcset support (#209)
 
 ## 1.1.3 - 2023-06-28
 - reduce instances where photo is implied (#135)
diff --git a/mf2py/dom_helpers.py b/mf2py/dom_helpers.py
index 26839cd..f3b87ad 100644
--- a/mf2py/dom_helpers.py
+++ b/mf2py/dom_helpers.py
@@ -39,21 +39,38 @@ def get_attr(el, attr, check_name=None):
         return el.get(attr)
 
 
-def get_img_src_alt(img, base_url=""):
-    """given a img element, returns both src and alt attributes as a list of tuples if alt exists, else returns the src as a string
-    use for alt parsing with img
-    """
-
-    alt = get_attr(img, "alt", check_name="img")
+def parse_srcset(srcset, base_url):
+    """Return a dictionary of sources found in srcset."""
+    sources = {}
+    for url, descriptor in re.findall(
+        r"(\S+)\s*([\d.]+[xw])?\s*,?\s*",
+        srcset,
+        re.MULTILINE,
+    ):
+        if not descriptor:
+            descriptor = "1x"
+        if descriptor not in sources:
+            sources[descriptor] = try_urljoin(base_url, url.strip(","))
+    return sources
+
+
+def get_img(img, base_url):
+    """Return a dictionary with src and alt/srcset if present, else just string src."""
     src = get_attr(img, "src", check_name="img")
-
-    if src is not None:
-        src = try_urljoin(base_url, src)
-
-        if alt is None:
-            return src
-        else:
-            return {"value": src, "alt": alt}
+    if src is None:
+        return
+    src = try_urljoin(base_url, src)
+    alt = get_attr(img, "alt", check_name="img")
+    srcset = get_attr(img, "srcset", check_name="img")
+    if alt is not None or srcset:
+        prop_value = {"value": src}
+        if alt is not None:
+            prop_value["alt"] = alt
+        if srcset:
+            prop_value["srcset"] = parse_srcset(srcset, base_url)
+        return prop_value
+    else:
+        return src
 
 
 def get_children(node):
diff --git a/mf2py/implied_properties.py b/mf2py/implied_properties.py
index 20ae2a5..de422ab 100644
--- a/mf2py/implied_properties.py
+++ b/mf2py/implied_properties.py
@@ -1,11 +1,5 @@
 from . import mf2_classes
-from .dom_helpers import (
-    get_attr,
-    get_children,
-    get_img_src_alt,
-    get_textContent,
-    try_urljoin,
-)
+from .dom_helpers import get_attr, get_children, get_img, get_textContent, try_urljoin
 
 
 def name(el, base_url=""):
@@ -111,7 +105,7 @@ def resolve_relative_url(prop_value):
         return prop_value
 
     # if element is an img use source if exists
-    if prop_value := get_img_src_alt(el, base_url):
+    if prop_value := get_img(el, base_url):
         return resolve_relative_url(prop_value)
 
     # if element is an object use data if exists
@@ -136,7 +130,7 @@ def resolve_relative_url(prop_value):
     # if a possible child was found parse
     if poss_child is not None:
         # img get src
-        if prop_value := get_img_src_alt(poss_child, base_url):
+        if prop_value := get_img(poss_child, base_url):
             return resolve_relative_url(prop_value)
 
         # object get data
diff --git a/mf2py/parse_property.py b/mf2py/parse_property.py
index d654d7c..286e621 100644
--- a/mf2py/parse_property.py
+++ b/mf2py/parse_property.py
@@ -4,7 +4,7 @@
 
 from . import value_class_pattern
 from .datetime_helpers import DATETIME_RE, TIME_RE, normalize_datetime
-from .dom_helpers import get_attr, get_img_src_alt, get_textContent, try_urljoin
+from .dom_helpers import get_attr, get_img, get_textContent, try_urljoin
 
 
 def text(el, base_url=""):
@@ -31,7 +31,7 @@ def url(el, base_url=""):
 
     prop_value = get_attr(el, "href", check_name=("a", "area", "link"))
     if prop_value is None:
-        prop_value = get_img_src_alt(el, base_url)
+        prop_value = get_img(el, base_url)
         if prop_value is not None:
             return prop_value
     if prop_value is None:
diff --git a/test/examples/img_with_srcset.html b/test/examples/img_with_srcset.html
new file mode 100644
index 0000000..88f33c5
--- /dev/null
+++ b/test/examples/img_with_srcset.html
@@ -0,0 +1,77 @@
+<div class="h-entry">
+  <img class="u-photo"
+       srcset="elva-fairy-480w.jpg 480w,
+               elva-fairy-800w.jpg 800w"
+       sizes="(max-width: 600px) 480px,
+              800px"
+       src="elva-fairy-800w.jpg"
+       alt="Elva dressed as a fairy">
+</div>
+
+<div class="h-entry">
+  <img class="u-photo"
+       srcset="elva-fairy-320w.jpg,
+               elva-fairy-480w.jpg 1.5x,
+               elva-fairy-640w.jpg 2x,
+               elva-fairy-1.5w.jpg 1.5x,
+               elva-fairy-2w.jpg 2x"
+       src="elva-fairy-320w.jpg"
+       alt="Elva dressed as a fairy">
+</div>
+
+<div class="h-entry">
+  <img class="u-photo"
+       srcset="elva-fairy,320w.jpg, elva-fairy,480w.jpg 1.5x"
+       src="elva-fairy-320w.jpg"
+       alt="Elva dressed as a fairy">
+</div>
+
+<div class="h-entry">
+  <img class="u-photo"
+       srcset="elva-fairy,320w.jpg ,elva-fairy,480w.jpg 1.5x"
+       src="elva-fairy-320w.jpg"
+       alt="Elva dressed as a fairy">
+</div>
+
+<div class="h-entry">
+  <img class="u-photo"
+       srcset="elva-fairy,320w.jpg 1x,elva-fairy,480w.jpg 1.5x"
+       src="elva-fairy-320w.jpg"
+       alt="Elva dressed as a fairy">
+</div>
+
+<div class="h-entry">
+  <img class="u-photo"
+       srcset="elva-fairy,320w.jpg 1x ,elva-fairy,480w.jpg 1.5x"
+       src="elva-fairy-320w.jpg"
+       alt="Elva dressed as a fairy">
+</div>
+
+<div class="h-entry">
+  <img class="u-photo"
+       srcset="elva-fairy,320w.jpg 1x , elva-fairy,480w.jpg 1.5x"
+       src="elva-fairy-320w.jpg"
+       alt="Elva dressed as a fairy">
+</div>
+
+<div class="h-entry">
+  <img class="u-photo"
+       srcset="elva-fairy,320w.jpg"
+       src="elva-fairy-320w.jpg"
+       alt="Elva dressed as a fairy">
+</div>
+
+<div class="h-entry">
+  <img class="u-photo"
+       srcset="
+           elva-fairy,320w.jpg,
+               elva-fairy,480w.jpg
+       1.5x,
+               elva-fairy,640w.jpg 2x   ,
+
+               elva-fairy,1.5w.jpg     1.5x     ,
+               elva-fairy,2w.jpg 2x
+       "
+       src="elva-fairy-320w.jpg"
+       alt="Elva dressed as a fairy">
+</div>
diff --git a/test/examples/img_with_srcset_with_base.html b/test/examples/img_with_srcset_with_base.html
new file mode 100644
index 0000000..467b428
--- /dev/null
+++ b/test/examples/img_with_srcset_with_base.html
@@ -0,0 +1,11 @@
+<base href="https://example.com">
+
+<div class="h-entry">
+  <img class="u-photo"
+       srcset="elva-fairy-480w.jpg 480w,
+               elva-fairy-800w.jpg 800w"
+       sizes="(max-width: 600px) 480px,
+              800px"
+       src="elva-fairy-800w.jpg"
+       alt="Elva dressed as a fairy">
+</div>
diff --git a/test/test_parser.py b/test/test_parser.py
index 4d95118..2dc2f6a 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -1001,6 +1001,44 @@ def test_photo_with_alt():
     assert "" == exp_result["items"][5]["properties"]["in-reply-to"][0]["alt"]
 
 
+def test_photo_with_srcset():
+    result = parse_fixture("img_with_srcset.html")
+
+    assert result["items"][0]["properties"]["photo"][0]["srcset"] == {
+        "480w": "elva-fairy-480w.jpg",
+        "800w": "elva-fairy-800w.jpg",
+    }
+    assert result["items"][1]["properties"]["photo"][0]["srcset"] == {
+        "1x": "elva-fairy-320w.jpg",
+        "1.5x": "elva-fairy-480w.jpg",
+        "2x": "elva-fairy-640w.jpg",
+    }
+    assert (
+        result["items"][1]["properties"]["photo"][0]["srcset"]["2x"]
+        != "elva-fairy-2w.jpg"
+    )
+    for i in range(2, 7):
+        assert result["items"][i]["properties"]["photo"][0]["srcset"] == {
+            "1x": "elva-fairy,320w.jpg",
+            "1.5x": "elva-fairy,480w.jpg",
+        }
+    assert result["items"][7]["properties"]["photo"][0]["srcset"] == {
+        "1x": "elva-fairy,320w.jpg",
+    }
+    assert result["items"][8]["properties"]["photo"][0]["srcset"] == {
+        "1x": "elva-fairy,320w.jpg",
+        "1.5x": "elva-fairy,480w.jpg",
+        "2x": "elva-fairy,640w.jpg",
+    }
+
+    result = parse_fixture("img_with_srcset_with_base.html")
+
+    assert result["items"][0]["properties"]["photo"][0]["srcset"] == {
+        "480w": "https://example.com/elva-fairy-480w.jpg",
+        "800w": "https://example.com/elva-fairy-800w.jpg",
+    }
+
+
 def test_parse_id():
     result = parse_fixture("parse_id.html")
     assert "recentArticles" == result["items"][0]["id"]

From f6afda7fa8f94317c56b21eec15027295652a834 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Thu, 30 Nov 2023 01:27:55 -0800
Subject: [PATCH 097/123] Add language support (#210)

Add language details to embedded properties and root microformats using the following order of specificity:

- embedded properties (class=e-* lang=..)
- root microformats (class=h-* lang=..)
- document root (<html lang=..>)
---
 CHANGELOG.md                |  1 +
 mf2py/parse_property.py     | 11 +++++++++--
 mf2py/parser.py             | 17 +++++++++++++----
 test/examples/language.html | 15 +++++++++++++++
 test/test_parser.py         | 11 +++++++++++
 5 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 test/examples/language.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b100367..996773a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 - make relative URLs in e-* properties absolute (#201)
 - fix whitespace in plaintext conversion (#207)
 - add srcset support (#209)
+- add language support (#210)
 
 ## 1.1.3 - 2023-06-28
 - reduce instances where photo is implied (#135)
diff --git a/mf2py/parse_property.py b/mf2py/parse_property.py
index 286e621..30c565a 100644
--- a/mf2py/parse_property.py
+++ b/mf2py/parse_property.py
@@ -94,13 +94,20 @@ def datetime(el, default_date=None):
     )
 
 
-def embedded(el, base_url=""):
+def embedded(el, root_lang, document_lang, base_url=""):
     """Process e-* properties"""
     for tag in el.find_all():
         for attr in ("href", "src", "cite", "data", "poster"):
             if attr in tag.attrs:
                 tag.attrs[attr] = try_urljoin(base_url, tag.attrs[attr])
-    return {
+    prop_value = {
         "html": el.decode_contents().strip(),  # secret bs4 method to get innerHTML
         "value": get_textContent(el, replace_img=True, base_url=base_url),
     }
+    if lang := el.attrs.get("lang"):
+        prop_value["lang"] = lang
+    elif root_lang:
+        prop_value["lang"] = root_lang
+    elif document_lang:
+        prop_value["lang"] = document_lang
+    return prop_value
diff --git a/mf2py/parser.py b/mf2py/parser.py
index 414ede6..5cba036 100644
--- a/mf2py/parser.py
+++ b/mf2py/parser.py
@@ -68,6 +68,7 @@ def __init__(self, doc=None, url=None, html_parser=None):
                 "version": __version__,
             },
         }
+        self.lang = None
 
         # use default parser if none specified
         self.__html_parser__ = html_parser or "html5lib"
@@ -128,6 +129,8 @@ def __init__(self, doc=None, url=None, html_parser=None):
                         self.__url__ = try_urljoin(self.__url__, poss_base_url)
 
         if self.__doc__ is not None:
+            if document := self.__doc__.find("html"):
+                self.lang = document.attrs.get("lang")
             # parse!
             self.parse()
 
@@ -161,13 +164,15 @@ def handle_microformat(
                 el = backcompat.apply_rules(el, self.__html_parser__)
                 root_class_names = mf2_classes.root(el.get("class", []))
 
+            root_lang = el.attrs.get("lang")
+
             # parse for properties and children
             for child in get_children(el):
                 (
                     child_props,
                     child_children,
                     child_parsed_types_aggregation,
-                ) = parse_props(child)
+                ) = parse_props(child, root_lang)
                 for key, new_value in child_props.items():
                     prop_value = properties.get(key, [])
                     prop_value.extend(new_value)
@@ -239,9 +244,13 @@ def handle_microformat(
                 else:
                     microformat["value"] = simple_value
 
+            if root_lang:
+                microformat["lang"] = root_lang
+            elif self.lang:
+                microformat["lang"] = self.lang
             return microformat
 
-        def parse_props(el):
+        def parse_props(el, root_lang):
             """Parse the properties from a single element"""
             props = {}
             children = []
@@ -363,7 +372,7 @@ def parse_props(el):
                         embedded_el = copy.copy(embedded_el)
                     temp_fixes.rm_templates(embedded_el)
                     e_value = parse_property.embedded(
-                        embedded_el, base_url=self.__url__
+                        embedded_el, root_lang, self.lang, base_url=self.__url__
                     )
 
                 if root_class_names:
@@ -394,7 +403,7 @@ def parse_props(el):
                         child_properties,
                         child_microformats,
                         child_parsed_types_aggregation,
-                    ) = parse_props(child)
+                    ) = parse_props(child, root_lang)
                     for prop_name in child_properties:
                         v = props.get(prop_name, [])
                         v.extend(child_properties[prop_name])
diff --git a/test/examples/language.html b/test/examples/language.html
new file mode 100644
index 0000000..79273ee
--- /dev/null
+++ b/test/examples/language.html
@@ -0,0 +1,15 @@
+<html lang="it">
+  <div class="h-card">
+    <h1 class="p-name">Romero</h1>
+  </div>
+  <div class="h-entry">
+    <h1 class="p-name">Un titolo italiano</h1>
+    <div class="e-content" lang="en">With an <em>english</em> summary</div>
+    <div class="e-content">Con un riassunto <em>italiano</em></div>
+  </div>
+  <div class="h-entry" lang="sv">
+    <h1 class="p-name">En svensk titel</h1>
+    <div class="e-content" lang="en">With an <em>english</em> summary</div>
+    <div class="e-content">Och <em>svensk</em> huvudtext</div>
+  </div>
+</html>
diff --git a/test/test_parser.py b/test/test_parser.py
index 2dc2f6a..9f2f53a 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -1116,3 +1116,14 @@ def test_all_u_cases():
         make_labelled_cmp("all_u_cases_" + str(i))(
             "http://example.com/test", result["items"][0]["properties"]["url"][i]
         )
+
+
+def test_language():
+    result = parse_fixture("language.html")
+    assert result["items"][0]["lang"] == "it"
+    assert result["items"][1]["lang"] == "it"
+    assert result["items"][1]["properties"]["content"][0]["lang"] == "en"
+    assert result["items"][1]["properties"]["content"][1]["lang"] == "it"
+    assert result["items"][2]["lang"] == "sv"
+    assert result["items"][2]["properties"]["content"][0]["lang"] == "en"
+    assert result["items"][2]["properties"]["content"][1]["lang"] == "sv"

From 70bbb6a215854b8657ab7d44209a7ab0c4e3b92e Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Thu, 30 Nov 2023 01:33:43 -0800
Subject: [PATCH 098/123] Prepare tests and README for extensions (#214)

---
 README.md           |  4 ++++
 test/test_parser.py | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 155222b..f7e0136 100644
--- a/README.md
+++ b/README.md
@@ -53,6 +53,10 @@ Parse content from a URL:
 obj = mf2py.parse(url="http://tommorris.org/")
 ```
 
+### Extensions
+
+---
+
 `parse` is a convenience method that actually delegates to
 `mf2py.Parser` to do the real work. More sophisticated behaviors are
 available by invoking the object directly.
diff --git a/test/test_parser.py b/test/test_parser.py
index 9f2f53a..a781619 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -14,9 +14,9 @@
 TEST_DIR = "test/examples/"
 
 
-def parse_fixture(path, url=None):
+def parse_fixture(path, **kwargs):
     with open(os.path.join(TEST_DIR, path)) as f:
-        p = Parser(doc=f, url=url, html_parser="html5lib")
+        p = Parser(doc=f, html_parser="html5lib", **kwargs)
         return p.to_dict()
 
 
@@ -338,14 +338,14 @@ def test_enclosures():
 
 
 def test_empty_href():
-    result = parse_fixture("hcard_with_empty_url.html", "http://foo.com")
+    result = parse_fixture("hcard_with_empty_url.html", url="http://foo.com")
 
     for hcard in result["items"]:
         assert ["http://foo.com"] == hcard["properties"]["url"]
 
 
 def test_link_with_u_url():
-    result = parse_fixture("link_with_u-url.html", "http://foo.com")
+    result = parse_fixture("link_with_u-url.html", url="http://foo.com")
     assert {
         "type": ["h-card"],
         "properties": {
@@ -356,7 +356,7 @@ def test_link_with_u_url():
 
 
 def test_broken_url():
-    result = parse_fixture("broken_url.html", "http://example.com")
+    result = parse_fixture("broken_url.html", url="http://example.com")
     assert (
         result["items"][0]["properties"]["relative"][0] == "http://example.com/foo.html"
     )

From c073fe1bfd06037c88e96c265fe8527a4c15cb8f Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Thu, 30 Nov 2023 02:03:34 -0800
Subject: [PATCH 099/123] Add extension to expose DOM for embedded properties
 (#208)

---
 CHANGELOG.md            |  1 +
 README.md               |  2 ++
 mf2py/parse_property.py |  7 +++++--
 mf2py/parser.py         | 11 +++++++----
 test/test_parser.py     |  8 ++++++++
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 996773a..387bd65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.
 - fix whitespace in plaintext conversion (#207)
 - add srcset support (#209)
 - add language support (#210)
+- add extension to expose the DOM for embedded properties (#208)
 
 ## 1.1.3 - 2023-06-28
 - reduce instances where photo is implied (#135)
diff --git a/README.md b/README.md
index f7e0136..47f21a9 100644
--- a/README.md
+++ b/README.md
@@ -55,6 +55,8 @@ obj = mf2py.parse(url="http://tommorris.org/")
 
 ### Extensions
 
+Use `expose_dom=True` to expose the DOM of embedded properties.
+
 ---
 
 `parse` is a convenience method that actually delegates to
diff --git a/mf2py/parse_property.py b/mf2py/parse_property.py
index 30c565a..3d2222b 100644
--- a/mf2py/parse_property.py
+++ b/mf2py/parse_property.py
@@ -94,14 +94,13 @@ def datetime(el, default_date=None):
     )
 
 
-def embedded(el, root_lang, document_lang, base_url=""):
+def embedded(el, base_url, root_lang, document_lang, expose_dom):
     """Process e-* properties"""
     for tag in el.find_all():
         for attr in ("href", "src", "cite", "data", "poster"):
             if attr in tag.attrs:
                 tag.attrs[attr] = try_urljoin(base_url, tag.attrs[attr])
     prop_value = {
-        "html": el.decode_contents().strip(),  # secret bs4 method to get innerHTML
         "value": get_textContent(el, replace_img=True, base_url=base_url),
     }
     if lang := el.attrs.get("lang"):
@@ -110,4 +109,8 @@ def embedded(el, root_lang, document_lang, base_url=""):
         prop_value["lang"] = root_lang
     elif document_lang:
         prop_value["lang"] = document_lang
+    if expose_dom:
+        prop_value["dom"] = el
+    else:
+        prop_value["html"] = el.decode_contents().strip()
     return prop_value
diff --git a/mf2py/parser.py b/mf2py/parser.py
index 5cba036..9ae691f 100644
--- a/mf2py/parser.py
+++ b/mf2py/parser.py
@@ -12,7 +12,7 @@
 from .version import __version__
 
 
-def parse(doc=None, url=None, html_parser=None):
+def parse(doc=None, url=None, html_parser=None, expose_dom=False):
     """
     Parse a microformats2 document or url and return a json dictionary.
 
@@ -25,10 +25,11 @@ def parse(doc=None, url=None, html_parser=None):
       html_parser (string): optional, select a specific HTML parser. Valid
         options from the BeautifulSoup documentation are:
         "html", "xml", "html5", "lxml", "html5lib", and "html.parser"
+      expose_dom (boolean): optional, expose the DOM of embedded properties.
 
     Return: a json dict represented the structured data in this document.
     """
-    return Parser(doc, url, html_parser).to_dict()
+    return Parser(doc, url, html_parser, expose_dom).to_dict()
 
 
 class Parser(object):
@@ -45,6 +46,7 @@ class Parser(object):
         options from the BeautifulSoup documentation are:
         "html", "xml", "html5", "lxml", "html5lib", and "html.parser"
         defaults to "html5lib"
+      expose_dom (boolean): optional, expose the DOM of embedded properties.
 
     Attributes:
       useragent (string): the User-Agent string for the Parser
@@ -54,7 +56,7 @@ class Parser(object):
     ua_url = "https://github.com/microformats/mf2py"
     useragent = "{0} - version {1} - {2}".format(ua_desc, __version__, ua_url)
 
-    def __init__(self, doc=None, url=None, html_parser=None):
+    def __init__(self, doc=None, url=None, html_parser=None, expose_dom=False):
         self.__url__ = None
         self.__doc__ = None
         self._preserve_doc = False
@@ -68,6 +70,7 @@ def __init__(self, doc=None, url=None, html_parser=None):
                 "version": __version__,
             },
         }
+        self.expose_dom = expose_dom
         self.lang = None
 
         # use default parser if none specified
@@ -372,7 +375,7 @@ def parse_props(el, root_lang):
                         embedded_el = copy.copy(embedded_el)
                     temp_fixes.rm_templates(embedded_el)
                     e_value = parse_property.embedded(
-                        embedded_el, root_lang, self.lang, base_url=self.__url__
+                        embedded_el, self.__url__, root_lang, self.lang, self.expose_dom
                     )
 
                 if root_class_names:
diff --git a/test/test_parser.py b/test/test_parser.py
index a781619..b5b5ee9 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -3,6 +3,7 @@
 import sys
 from unittest import TestCase
 
+import bs4
 import mock
 from bs4 import BeautifulSoup
 
@@ -191,6 +192,13 @@ def test_embedded_parsing():
     )
 
 
+def test_embedded_exposed_dom():
+    result = parse_fixture("embedded.html", expose_dom=True)
+    content = result["items"][0]["properties"]["content"][0]
+    assert "html" not in content
+    assert isinstance(content["dom"], bs4.element.Tag)
+
+
 def test_hoisting_nested_hcard():
     result = parse_fixture("nested_hcards.html")
     expected = [

From cb2c64f01893eb9817c695ed16164dc5c4cb558e Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Thu, 30 Nov 2023 02:08:06 -0800
Subject: [PATCH 100/123] Fix whitespace in CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 387bd65..d93457d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,7 +58,7 @@ All notable changes to this project will be documented in this file.
 - reorganise tests
 - remove Heroku frontend, point to mf2py-web and python.microformats.io instead in README.
 - remove Flask and gunicorn requirements
-- add debug info with description, version, url and the html parser used 
+- add debug info with description, version, url and the html parser used
 
 ## 1.0.6 - 2018-03-04
 

From 793d6e00ee2b67ce50aa8e4fd1790fe21033b824 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <ragt.ag>
Date: Thu, 30 Nov 2023 02:14:22 -0800
Subject: [PATCH 101/123] Reorder Makefile arguments

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a0fc119..326c37e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 install:
 	poetry install
 tests:
-	poetry run pytest --doctest-modules -s -vv --doctest-glob README*
+	poetry run pytest -s -vv --doctest-modules --doctest-glob README*
 publish:
 	poetry publish --build
 lint:

From 855f5ba0e486317eac0e506c69b0924be5046998 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <ragt.ag>
Date: Thu, 30 Nov 2023 02:14:37 -0800
Subject: [PATCH 102/123] Fix formatting and doctests in README

---
 README.md | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index bdbf0a9..9fec7c8 100644
--- a/README.md
+++ b/README.md
@@ -16,17 +16,14 @@ mf2py implements the full mf2 specification, including backward compatibility wi
 To install `mf2py`, run the following command:
 
 ```bash
-
 pip install mf2py
-
 ```
 
 ## Quickstart 🚀
 
 Import the parser using:
 
-```python
-
+```pycon
 >>> import mf2py
 
 ```
@@ -35,8 +32,7 @@ Import the parser using:
 
 Parse a file containing HTML:
 
-```python
-
+```pycon
 >>> with open("example.html", "r") as file:
 ...     mf2json = mf2py.parse(doc=file)
 >>> mf2json
@@ -57,8 +53,7 @@ Parse a file containing HTML:
 
 Parse string containing HTML content:
 
-```python
-
+```pycon
 >>> content = '<article class="h-entry"><h1 class="p-name">Hello</h1></article>'
 >>> mf2py.parse(doc=content)["items"]
 [{'type': ['h-entry'], 'properties': {'name': ['Hello']}}]
@@ -69,36 +64,39 @@ Parse string containing HTML content:
 
 Parse content from a URL:
 
-```python
-
+```pycon
 >>> mf2json = mf2py.parse(url="https://indieweb.org")
 
 ```
 
+### Parser Object
+
 `parse` is a convenience method that actually delegates to
 `mf2py.Parser` to do the real work. More sophisticated behaviors are
 available by invoking the object directly.
 
-### Format Options
+```pycon
+>>> p = mf2py.Parser()
 
-Retrieve parsed microformats as a Python dictionary or JSON string:
+```
 
-```python
+#### JSON Output
 
-p = mf2py.Parser(...)
-p.to_dict()  # returns a python dictionary
-p.to_json()  # returns a JSON string
+Retrieve parsed microformats as a Python dictionary or JSON string:
 
-```
+```pycon
+>>> mf2dict = p.to_dict()
+>>> mf2json = p.to_json()
 
-### Filter by Microformat Type
+```
 
-Filter by microformat type:
+#### Filter by Microformat Type
 
-```python
+Filter by microformat type.
 
-p.to_dict(filter_by_type="h-entry")
-p.to_json(filter_by_type="h-entry")
+```pycon
+>>> dict_entries = p.to_dict(filter_by_type="h-entry")
+>>> json_entries = p.to_json(filter_by_type="h-entry")
 
 ```
 

From 553f4b41777fac9bae7fe4e457cc32ff2a1bda25 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Thu, 30 Nov 2023 02:33:55 -0800
Subject: [PATCH 103/123] Fix README testing in workflow

---
 .github/workflows/tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index cd5e412..0c4e610 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Install library
         run: poetry install --no-interaction
       - name: Run tests
-        run: make tests
+        run: poetry run make tests
       - uses: psf/black@stable
         with:
           options: "--check --verbose"
@@ -67,7 +67,7 @@ jobs:
       - name: Install library
         run: poetry install --no-interaction
       - name: Run tests
-        run: make tests
+        run: poetry run make tests
       - uses: psf/black@stable
         with:
           options: "--check --verbose"
@@ -100,7 +100,7 @@ jobs:
       - name: Install library
         run: poetry install --no-interaction
       - name: Run tests
-        run: make tests
+        run: poetry run make tests
       - uses: psf/black@stable
         with:
           options: "--check --verbose"

From 99db3de53137caebd71c214f33711e79bb9a2fe8 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Thu, 30 Nov 2023 03:13:41 -0800
Subject: [PATCH 104/123] Bring README doctests up-to-date (#215)

---
 README.md      | 6 ++++--
 pyproject.toml | 3 +++
 pytest.ini     | 2 --
 3 files changed, 7 insertions(+), 4 deletions(-)
 delete mode 100644 pytest.ini

diff --git a/README.md b/README.md
index f7fe56f..3ed4689 100644
--- a/README.md
+++ b/README.md
@@ -38,8 +38,10 @@ Parse a file containing HTML:
 >>> mf2json
 {'items': [{'type': ['h-entry'],
             'properties': {'name': ['Hello'],
-                           'content': [{'html': 'Just saying hi.',
-                                        'value': 'Just saying hi.'}]}}],
+                           'content': [{'value': 'Just saying hi.',
+                                        'lang': 'en-us',
+                                        'html': 'Just saying hi.'}]},
+            'lang': 'en-us'}],
  'rels': {},
  'rel-urls': {},
  'debug': {'description': 'mf2py - microformats2 parser for python',
diff --git a/pyproject.toml b/pyproject.toml
index 4ee0780..9a595fe 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,6 +24,9 @@ pytest = "^7.2.1"
 black = "^23.3.0"
 isort = "^5.12.0"
 
+[tool.pytest.ini_options]
+doctest_optionflags = "NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL"
+
 [tool.isort]
 profile = "black"
 
diff --git a/pytest.ini b/pytest.ini
deleted file mode 100644
index 5a96837..0000000
--- a/pytest.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[pytest]
-doctest_optionflags = NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL

From e3f52fb3a9064a86acc2b1ad4711e2442f82bcd8 Mon Sep 17 00:00:00 2001
From: James <37276661+capjamesg@users.noreply.github.com>
Date: Thu, 30 Nov 2023 23:16:25 +0000
Subject: [PATCH 105/123] Update tests.yml

---
 .github/workflows/tests.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0c4e610..048ee8d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,11 +1,5 @@
 name: Run Python Tests
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
+on: push
 
 jobs:
   build-macos:

From 043c2f6a6acc6688e474de70de1acff0bd7075d6 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Thu, 30 Nov 2023 16:25:21 -0800
Subject: [PATCH 106/123] Update README (#216)

---
 CONTRIBUTING.md         |   2 +-
 README.md               | 112 ++++++++++++++++++++++------------------
 example.html            |  12 -----
 test/examples/eras.html |  17 ++++++
 4 files changed, 80 insertions(+), 63 deletions(-)
 delete mode 100644 example.html
 create mode 100644 test/examples/eras.html

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 29ce771..4da8ff5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -53,4 +53,4 @@ make test
 
 ## Join the Microformats Community
 
-Have a question about microformats or mf2py? Join the `#microformats` disussion on Slack, Discord, IRC, or Matrix. Guidance on how to join the community is available on the [IndieWeb wiki](https://indieweb.org/discuss).
+Have a question about microformats or mf2py? Join the `#microformats` disussion on Slack, Discord, or IRC. Guidance on how to join the community is available on the [IndieWeb wiki](https://indieweb.org/discuss).
diff --git a/README.md b/README.md
index 3ed4689..b6654f2 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![mf2py banner](http://microformats.github.io/mf2py/banner.png)
+![mf2py banner](https://microformats.github.io/mf2py/banner.png)
 
 [![version](https://badge.fury.io/py/mf2py.svg?)](https://badge.fury.io/py/mf2py)
 [![downloads](https://img.shields.io/pypi/dm/mf2py)](https://pypistats.org/packages/mf2py)
@@ -7,9 +7,7 @@
 
 ## Welcome 👋
 
-`mf2py` is a full-featured microformats2 (mf2) parser implemented in Python.
-
-mf2py implements the full mf2 specification, including backward compatibility with microformats1.
+`mf2py` is a Python [microformats](https://microformats.org/wiki/microformats) parser with full support for `microformats2` and `microformats1`.
 
 ## Installation 💻
 
@@ -28,22 +26,30 @@ Import the parser using:
 
 ```
 
-### Parse a File
-
-Parse a file containing HTML:
+### Parse an HTML File
 
 ```pycon
->>> with open("example.html", "r") as file:
+>>> with open("test/examples/eras.html", "r") as file:
 ...     mf2json = mf2py.parse(doc=file)
 >>> mf2json
 {'items': [{'type': ['h-entry'],
-            'properties': {'name': ['Hello'],
-                           'content': [{'value': 'Just saying hi.',
+            'properties': {'name': ['Excited for the Taylor Swift Eras Tour'],
+                           'author': [{'type': ['h-card'],
+                                       'properties': {'name': ['James'],
+                                                      'url': ['https://example.com/']},
+                                       'value': 'James',
+                                       'lang': 'en-us'}],
+                           'published': ['2023-11-30T19:08:09'],
+                           'featured': [{'value': 'https://example.com/eras.jpg',
+                                         'alt': 'Eras tour poster'}],
+                           'content': [{'value': "I can't decide which era is my favorite.",
                                         'lang': 'en-us',
-                                        'html': 'Just saying hi.'}]},
+                                        'html': "<p>I can't decide which era is my favorite.</p>"}],
+                           'category': ['music', 'Taylor Swift']},
             'lang': 'en-us'}],
- 'rels': {},
- 'rel-urls': {},
+ 'rels': {'webmention': ['https://example.com/mentions']},
+ 'rel-urls': {'https://example.com/mentions': {'text': '',
+                                               'rels': ['webmention']}},
  'debug': {'description': 'mf2py - microformats2 parser for python',
            'source': 'https://github.com/microformats/mf2py',
            'version': '1.1.3',
@@ -51,80 +57,86 @@ Parse a file containing HTML:
 
 ```
 
-### Parse a String
-
-Parse string containing HTML content:
+### Parse an HTML String
 
 ```pycon
->>> content = '<article class="h-entry"><h1 class="p-name">Hello</h1></article>'
->>> mf2py.parse(doc=content)["items"]
-[{'type': ['h-entry'], 'properties': {'name': ['Hello']}}]
+>>> html = '''<article class="h-entry"><p class="p-content">The best time
+... to plant a tree was 30 years ago, and the second best time to plant a
+... tree is now.</p></article>'''
+>>> mf2py.parse(doc=html)["items"]
+[{'type': ['h-entry'], 'properties': {'content': ['The best time to plant
+a tree was 30 years ago, and the second best time to plant a tree is now.']}}]
 
 ```
 
 ### Parse an HTML Document Retrieved from a URL
 
-Parse content from a URL:
-
 ```pycon
->>> mf2json = mf2py.parse(url="https://indieweb.org")
+>>> mf2json = mf2py.parse(url="https://events.indieweb.org")
+>>> mf2json["items"][0]["type"]
+['h-feed']
+>>> mf2json["items"][0]["children"][0]["type"]
+['h-event']
 
 ```
 
-### Extensions
+## Extensions
+
+### `expose_dom`
 
 Use `expose_dom=True` to expose the DOM of embedded properties.
 
-### Parser Object
+## Advanced Usage
 
-`parse` is a convenience method that actually delegates to
-`mf2py.Parser` to do the real work. More sophisticated behaviors are
-available by invoking the object directly.
+`parse` is a convenience method that delegates to `Parser`. More sophisticated
+behaviors are available by invoking the parser object directly.
 
 ```pycon
->>> p = mf2py.Parser()
+>>> html = '''<h1><span class=h-card>Frank</span> and <span class=h-card>Cosmo</span></h1>
+... <p class=h-entry><q class=p-content>It's time for the Festivus feats of
+... strength.</q></p>
+... <p class=h-entry><q class=p-content>It's a Festivus miracle!</q></p>
+... <p class=h-entry><q class=p-content>The tradition of Festivus begins with
+... the airing of grievances.</q></p>'''
+>>> mf2parser = mf2py.Parser(doc=html)
 
 ```
 
-#### JSON Output
-
-Retrieve parsed microformats as a Python dictionary or JSON string:
+#### Filter by Microformat Type
 
 ```pycon
->>> mf2dict = p.to_dict()
->>> mf2json = p.to_json()
+>>> mf2json = mf2parser.to_dict()
+>>> len(mf2json["items"])
+5
+>>> len(mf2parser.to_dict(filter_by_type="h-card"))
+2
+>>> len(mf2parser.to_dict(filter_by_type="h-entry"))
+3
 
 ```
 
-#### Filter by Microformat Type
-
-Filter by microformat type.
+#### JSON Output
 
 ```pycon
->>> dict_entries = p.to_dict(filter_by_type="h-entry")
->>> json_entries = p.to_json(filter_by_type="h-entry")
+>>> json = mf2parser.to_json()
+>>> json_cards = mf2parser.to_json(filter_by_type="h-card")
 
 ```
 
-## Breaking Changes in v2
-
-- img alt support is now on by default
-
-## FAQs ❓
-
-* I passed `mf2py.parse()` a BeautifulSoup document, and it got modified!
+## Breaking Changes in `mf2py` 2.0
 
-Yes, mf2py currently does that. We're working on preventing it! Hopefully soon.
+- Image `alt` support is now on by default.
 
-## Testing Environments 🌐
+## Notes 📝
 
-A hosted live version of mf2py can be found at [python.microformats.io](https://python.microformats.io).
+- If you pass a BeautifulSoup document it may be modified.
+- A hosted version of `mf2py` is available at [python.microformats.io](https://python.microformats.io).
 
 ## Contributing 🛠️
 
-We welcome contributions and bug reports via Github, and on the microformats wiki.
+We welcome contributions and bug reports via GitHub.
 
-We to follow the [IndieWebCamp code of conduct](http://indiewebcamp.com/code-of-conduct). Please be respectful of other contributors, and forge a spirit of positive co-operation without discrimination or disrespect.
+This project follows the [IndieWeb code of conduct](https://indieweb.org/code-of-conduct). Please be respectful of other contributors and forge a spirit of positive co-operation without discrimination or disrespect.
 
 ## License 🧑‍⚖️
 
diff --git a/example.html b/example.html
deleted file mode 100644
index 140f331..0000000
--- a/example.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!doctype html>
-<html lang=en-us>
-<head>
-<base href=https://example.com>
-</head>
-<body>
-<div class=h-entry>
-<h1 class=p-name>Hello</h1>
-<div class=e-content>Just saying hi.</div>
-</div>
-</body>
-</html>
diff --git a/test/examples/eras.html b/test/examples/eras.html
new file mode 100644
index 0000000..ad5dcc9
--- /dev/null
+++ b/test/examples/eras.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<html lang=en-us>
+<head>
+<base href=https://example.com>
+<link rel=webmention href=/mentions>
+</head>
+<body>
+<div class=h-entry>
+  <h1 class=p-name>Excited for the Taylor Swift Eras Tour</h1>
+  <p>Published by <a class="p-author h-card" href=/>James</a>
+    <time class=dt-published datetime=2023-11-30T19:08:09>Thursday, November 30</time></p>
+  <div><img class=u-featured alt="Eras tour poster" src=/eras.jpg></div>
+  <div class=e-content><p>I can't decide which era is my favorite.</p></div>
+  <p><span class=p-category>music</span>, <span class=p-category>Taylor Swift</span></p>
+</div>
+</body>
+</html>

From 698f2bbd6b4a1e2b16ea60eff8772a3a838b6cba Mon Sep 17 00:00:00 2001
From: Ryan Barrett <git@ryanb.org>
Date: Thu, 30 Nov 2023 16:29:36 -0800
Subject: [PATCH 107/123] Add extension to support metaformats (#213)

---
 CHANGELOG.md                             |  1 +
 mf2py/metaformats.py                     | 89 ++++++++++++++++++++++++
 mf2py/parser.py                          | 40 +++++++++--
 test/examples/metaformats_html_meta.html | 12 ++++
 test/examples/metaformats_ogp.html       | 20 ++++++
 test/examples/metaformats_twitter.html   | 14 ++++
 test/test_parser.py                      | 63 +++++++++++++++++
 7 files changed, 235 insertions(+), 4 deletions(-)
 create mode 100644 mf2py/metaformats.py
 create mode 100644 test/examples/metaformats_html_meta.html
 create mode 100644 test/examples/metaformats_ogp.html
 create mode 100644 test/examples/metaformats_twitter.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d93457d..4b7cff5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 - add srcset support (#209)
 - add language support (#210)
 - add extension to expose the DOM for embedded properties (#208)
+- add extension to support metaformats (#212)
 
 ## 1.1.3 - 2023-06-28
 - reduce instances where photo is implied (#135)
diff --git a/mf2py/metaformats.py b/mf2py/metaformats.py
new file mode 100644
index 0000000..316104d
--- /dev/null
+++ b/mf2py/metaformats.py
@@ -0,0 +1,89 @@
+"""Metaformats parser.
+
+https://microformats.org/wiki/metaformats
+
+TODO:
+* explicit mf2 classes on meta tags
+  https://microformats.org/wiki/metaformats#parsing_an_element_for_properties
+"""
+from .dom_helpers import try_urljoin
+from .mf2_classes import filter_classes
+
+METAFORMAT_TO_MF2 = [
+    # in priority order, descending
+    # OGP
+    ("property", "article:author", "author"),
+    ("property", "article:published_time", "published"),
+    ("property", "article:modified_time", "updated"),
+    ("property", "og:audio", "audio"),
+    ("property", "og:description", "summary"),
+    ("property", "og:image", "photo"),
+    ("property", "og:title", "name"),
+    ("property", "og:video", "video"),
+    # Twitter
+    ("name", "twitter:title", "name"),
+    ("name", "twitter:description", "summary"),
+    ("name", "twitter:image", "photo"),
+    # HTML standard meta names
+    # https://developer.mozilla.org/en-US/docs/Web/HTML/Element/meta/name
+    ("name", "description", "summary"),
+]
+OGP_TYPE_TO_MF2 = {
+    "article": "h-entry",
+    "movie": "h-cite",
+    "music": "h-cite",
+    "profile": "h-card",
+}
+URL_PROPERTIES = {
+    "article:author",
+    "og:audio",
+    "og:image",
+    "og:video",
+    "twitter:image",
+}
+
+
+def parse(soup, url=None):
+    """Extracts and returns a metaformats item from a BeautifulSoup parse tree.
+
+    Args:
+      soup (bs4.BeautifulSoup): parsed HTML
+      url (str): URL of document
+
+    Returns:
+      dict: mf2 item, or None if the input is not eligible for metaformats
+    """
+    if not soup.head:
+        return None
+
+    # Is there a microformat2 root class on the html element?
+    if filter_classes(soup.get("class", []))["h"]:
+        return None
+
+    parsed = {"properties": {}}
+    props = parsed["properties"]
+
+    # Properties
+    for attr, meta, mf2 in METAFORMAT_TO_MF2:
+        if val := soup.head.find("meta", attrs={attr: meta}):
+            if content := val.get("content"):
+                if meta in URL_PROPERTIES:
+                    content = try_urljoin(url, content)
+                props.setdefault(mf2, [content])
+
+    if soup.head.title:
+        if text := soup.head.title.text:
+            props.setdefault("name", [text])
+
+    if not props:
+        # No OGP or Twitter properties
+        return None
+
+    # type from OGP or default to h-entry
+    parsed["type"] = ["h-entry"]
+    if ogp_type := soup.head.find("meta", property="og:type"):
+        if content := ogp_type.get("content"):
+            if mf2_type := OGP_TYPE_TO_MF2.get(content.split(".")[0]):
+                parsed["type"] = [mf2_type]
+
+    return parsed
diff --git a/mf2py/parser.py b/mf2py/parser.py
index 9ae691f..0c1bee3 100644
--- a/mf2py/parser.py
+++ b/mf2py/parser.py
@@ -6,13 +6,20 @@
 from bs4 import BeautifulSoup, FeatureNotFound
 from bs4.element import Tag
 
-from . import backcompat, implied_properties, mf2_classes, parse_property, temp_fixes
+from . import (
+    backcompat,
+    implied_properties,
+    metaformats,
+    mf2_classes,
+    parse_property,
+    temp_fixes,
+)
 from .dom_helpers import get_attr, get_children, get_descendents, try_urljoin
 from .mf_helpers import unordered_list
 from .version import __version__
 
 
-def parse(doc=None, url=None, html_parser=None, expose_dom=False):
+def parse(doc=None, url=None, html_parser=None, expose_dom=False, metaformats=False):
     """
     Parse a microformats2 document or url and return a json dictionary.
 
@@ -26,10 +33,18 @@ def parse(doc=None, url=None, html_parser=None, expose_dom=False):
         options from the BeautifulSoup documentation are:
         "html", "xml", "html5", "lxml", "html5lib", and "html.parser"
       expose_dom (boolean): optional, expose the DOM of embedded properties.
+      metaformats (boolean): whether to include metaformats extracted from OGP
+        and Twitter card data: https://microformats.org/wiki/metaformats
 
     Return: a json dict represented the structured data in this document.
     """
-    return Parser(doc, url, html_parser, expose_dom).to_dict()
+    return Parser(
+        doc,
+        url,
+        html_parser,
+        expose_dom=expose_dom,
+        metaformats=metaformats,
+    ).to_dict()
 
 
 class Parser(object):
@@ -47,6 +62,8 @@ class Parser(object):
         "html", "xml", "html5", "lxml", "html5lib", and "html.parser"
         defaults to "html5lib"
       expose_dom (boolean): optional, expose the DOM of embedded properties.
+      metaformats (boolean): whether to include metaformats extracted from OGP
+        and Twitter card data: https://microformats.org/wiki/metaformats
 
     Attributes:
       useragent (string): the User-Agent string for the Parser
@@ -56,7 +73,14 @@ class Parser(object):
     ua_url = "https://github.com/microformats/mf2py"
     useragent = "{0} - version {1} - {2}".format(ua_desc, __version__, ua_url)
 
-    def __init__(self, doc=None, url=None, html_parser=None, expose_dom=False):
+    def __init__(
+        self,
+        doc=None,
+        url=None,
+        html_parser=None,
+        expose_dom=False,
+        metaformats=False,
+    ):
         self.__url__ = None
         self.__doc__ = None
         self._preserve_doc = False
@@ -70,6 +94,7 @@ def __init__(self, doc=None, url=None, html_parser=None, expose_dom=False):
                 "version": __version__,
             },
         }
+        self.__metaformats = metaformats
         self.expose_dom = expose_dom
         self.lang = None
 
@@ -487,9 +512,16 @@ def parse_el(el, ctx):
                         parse_el(child, ctx)
 
         ctx = []
+
+        if self.__metaformats:
+            # extract out a metaformats item, if available
+            self.__metaformats_item = metaformats.parse(self.__doc__, url=self.__url__)
+
         # start parsing at root element of the document
         parse_el(self.__doc__, ctx)
         self.__parsed__["items"] = ctx
+        if self.__metaformats and self.__metaformats_item:
+            self.__parsed__["items"].append(self.__metaformats_item)
 
         # parse for rel values
         for el in get_descendents(self.__doc__):
diff --git a/test/examples/metaformats_html_meta.html b/test/examples/metaformats_html_meta.html
new file mode 100644
index 0000000..25f251e
--- /dev/null
+++ b/test/examples/metaformats_html_meta.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8">
+  <title>Hello World</title>
+  <base href="http://tantek.com/" />
+  <meta name="description" content="Descrypshun bar" />
+</head>
+<body>
+  <p>Hello world!</p>
+</body>
+</html>
diff --git a/test/examples/metaformats_ogp.html b/test/examples/metaformats_ogp.html
new file mode 100644
index 0000000..a865469
--- /dev/null
+++ b/test/examples/metaformats_ogp.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8">
+  <title>Hello World</title>
+  <base href="http://tantek.com/" />
+  <meta property="og:type" content="article" />
+  <meta property="og:title" content="Titull foo" />
+  <meta property="og:description" content="Descrypshun bar" />
+  <meta property="og:image" content="http://example.com/baz.jpg" />
+  <meta property="og:audio" content="http://example.com/biff.mp3" />
+  <meta property="og:video" content="http://example.com/boff.mov" />
+  <meta property="article:author" content="/me" />
+  <meta property="article:published_time" content="2023-01-02T03:04Z" />
+  <meta property="article:modified_time" content="2023-01-02T05:06Z" />
+</head>
+<body>
+  <p>Hello world!</p>
+</body>
+</html>
diff --git a/test/examples/metaformats_twitter.html b/test/examples/metaformats_twitter.html
new file mode 100644
index 0000000..9ad9495
--- /dev/null
+++ b/test/examples/metaformats_twitter.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8">
+  <title>Hello World</title>
+  <base href="http://tantek.com/" />
+  <meta name="twitter:title" content="Titull foo" />
+  <meta name="twitter:description" content="Descrypshun bar" />
+  <meta name="twitter:image" content="/baz.jpg" />
+</head>
+<body>
+  <p>Hello world!</p>
+</body>
+</html>
diff --git a/test/test_parser.py b/test/test_parser.py
index b5b5ee9..a04825a 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -1126,6 +1126,69 @@ def test_all_u_cases():
         )
 
 
+def test_metaformats_flag_false():
+    result = parse_fixture("metaformats_ogp.html")
+    assert result["items"] == []
+
+
+def test_metaformats_title_only():
+    result = parse_fixture("base.html", metaformats=True)
+    assert result["items"] == [
+        {
+            "type": ["h-entry"],
+            "properties": {
+                "name": ["Hello World"],
+            },
+        }
+    ]
+
+
+def test_metaformats_ogp():
+    result = parse_fixture("metaformats_ogp.html", metaformats=True)
+    assert result["items"] == [
+        {
+            "type": ["h-entry"],
+            "properties": {
+                "name": ["Titull foo"],
+                "summary": ["Descrypshun bar"],
+                "photo": ["http://example.com/baz.jpg"],
+                "audio": ["http://example.com/biff.mp3"],
+                "video": ["http://example.com/boff.mov"],
+                "author": ["http://tantek.com/me"],
+                "published": ["2023-01-02T03:04Z"],
+                "updated": ["2023-01-02T05:06Z"],
+            },
+        }
+    ]
+
+
+def test_metaformats_twitter():
+    result = parse_fixture("metaformats_twitter.html", metaformats=True)
+    assert result["items"] == [
+        {
+            "type": ["h-entry"],
+            "properties": {
+                "name": ["Titull foo"],
+                "summary": ["Descrypshun bar"],
+                "photo": ["http://tantek.com/baz.jpg"],
+            },
+        }
+    ]
+
+
+def test_metaformats_html_meta():
+    result = parse_fixture("metaformats_html_meta.html", metaformats=True)
+    assert result["items"] == [
+        {
+            "type": ["h-entry"],
+            "properties": {
+                "name": ["Hello World"],
+                "summary": ["Descrypshun bar"],
+            },
+        }
+    ]
+
+
 def test_language():
     result = parse_fixture("language.html")
     assert result["items"][0]["lang"] == "it"

From 50b5d5777bd633d70f6198bc2f285f809ab75e65 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Thu, 30 Nov 2023 16:33:41 -0800
Subject: [PATCH 108/123] Add `metaformats` to README

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index b6654f2..f49cb09 100644
--- a/README.md
+++ b/README.md
@@ -82,10 +82,17 @@ a tree was 30 years ago, and the second best time to plant a tree is now.']}}]
 
 ## Extensions
 
+The following extensions can be invoked via keyword arguments to `parse()` and `Parser()`.
+
 ### `expose_dom`
 
 Use `expose_dom=True` to expose the DOM of embedded properties.
 
+### `metaformats`
+
+Use `metaformats=True` to include any [metaformats](https://microformats.org/wiki/metaformats)
+found.
+
 ## Advanced Usage
 
 `parse` is a convenience method that delegates to `Parser`. More sophisticated

From bfee398511273a92517a561e91b10b3f1df71c46 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Fri, 1 Dec 2023 11:12:16 -0800
Subject: [PATCH 109/123] Fix tests/doctests (#217)

---
 README.md                   | 39 +++++++++++--------------------------
 test/examples/festivus.html | 10 ++++++++++
 test/test_parser.py         | 13 +++++++++++++
 3 files changed, 34 insertions(+), 28 deletions(-)
 create mode 100644 test/examples/festivus.html

diff --git a/README.md b/README.md
index f49cb09..a4f8cc9 100644
--- a/README.md
+++ b/README.md
@@ -26,11 +26,11 @@ Import the parser using:
 
 ```
 
-### Parse an HTML File
+### Parse an HTML Document from a string
 
 ```pycon
->>> with open("test/examples/eras.html", "r") as file:
-...     mf2json = mf2py.parse(doc=file)
+>>> with open("test/examples/eras.html") as fp:
+...     mf2json = mf2py.parse(doc=fp)
 >>> mf2json
 {'items': [{'type': ['h-entry'],
             'properties': {'name': ['Excited for the Taylor Swift Eras Tour'],
@@ -57,19 +57,7 @@ Import the parser using:
 
 ```
 
-### Parse an HTML String
-
-```pycon
->>> html = '''<article class="h-entry"><p class="p-content">The best time
-... to plant a tree was 30 years ago, and the second best time to plant a
-... tree is now.</p></article>'''
->>> mf2py.parse(doc=html)["items"]
-[{'type': ['h-entry'], 'properties': {'content': ['The best time to plant
-a tree was 30 years ago, and the second best time to plant a tree is now.']}}]
-
-```
-
-### Parse an HTML Document Retrieved from a URL
+### Parse an HTML Document from a URL
 
 ```pycon
 >>> mf2json = mf2py.parse(url="https://events.indieweb.org")
@@ -95,17 +83,12 @@ found.
 
 ## Advanced Usage
 
-`parse` is a convenience method that delegates to `Parser`. More sophisticated
-behaviors are available by invoking the parser object directly.
+`parse` is a convenience function for `Parser`. More sophisticated behaviors are
+available by invoking the parser object directly.
 
 ```pycon
->>> html = '''<h1><span class=h-card>Frank</span> and <span class=h-card>Cosmo</span></h1>
-... <p class=h-entry><q class=p-content>It's time for the Festivus feats of
-... strength.</q></p>
-... <p class=h-entry><q class=p-content>It's a Festivus miracle!</q></p>
-... <p class=h-entry><q class=p-content>The tradition of Festivus begins with
-... the airing of grievances.</q></p>'''
->>> mf2parser = mf2py.Parser(doc=html)
+>>> with open("test/examples/festivus.html") as fp:
+...     mf2parser = mf2py.Parser(doc=fp)
 
 ```
 
@@ -114,11 +97,11 @@ behaviors are available by invoking the parser object directly.
 ```pycon
 >>> mf2json = mf2parser.to_dict()
 >>> len(mf2json["items"])
-5
+7
 >>> len(mf2parser.to_dict(filter_by_type="h-card"))
-2
->>> len(mf2parser.to_dict(filter_by_type="h-entry"))
 3
+>>> len(mf2parser.to_dict(filter_by_type="h-entry"))
+4
 
 ```
 
diff --git a/test/examples/festivus.html b/test/examples/festivus.html
new file mode 100644
index 0000000..11d94f7
--- /dev/null
+++ b/test/examples/festivus.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<h2 class=h-card>Jerry</h2>
+<p class=h-entry><q class=p-content>Happy Festivus!</q></p>
+<h2 class=h-card>Frank</h2>
+<p class=h-entry><q class=p-content>It's time for the Festivus feats of
+strength.</q></p>
+<p class=h-entry><q class=p-content>The tradition of Festivus begins with
+the airing of grievances.</q></p>
+<h2 class=h-card>Cosmo</h2>
+<p class=h-entry><q class=p-content>It's a Festivus miracle!</q></p>
diff --git a/test/test_parser.py b/test/test_parser.py
index a04825a..7a5cea5 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -1198,3 +1198,16 @@ def test_language():
     assert result["items"][2]["lang"] == "sv"
     assert result["items"][2]["properties"]["content"][0]["lang"] == "en"
     assert result["items"][2]["properties"]["content"][1]["lang"] == "sv"
+
+
+def test_parser_object():
+    with open(os.path.join(TEST_DIR, "festivus.html")) as f:
+        p = Parser(doc=f)
+    assert len(p.to_dict(filter_by_type="h-card")) == 3
+    assert len(p.to_dict(filter_by_type="h-entry")) == 4
+    assert (
+        p.to_json(filter_by_type="h-card")
+        == '[{"type": ["h-card"], "properties": {"name": ["Jerry"]}}, {"type": '
+        '["h-card"], "properties": {"name": ["Frank"]}}, {"type": ["h-card"], '
+        '"properties": {"name": ["Cosmo"]}}]'
+    )

From b2b0f28b116199126e922100cbdba59785ac99db Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Fri, 1 Dec 2023 11:38:59 -0800
Subject: [PATCH 110/123] Update CHANGELOG.md

---
 CHANGELOG.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b7cff5..c3d68c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,15 @@
 All notable changes to this project will be documented in this file.
 
 ## 2.0 - unreleased
-- make relative URLs in e-* properties absolute (#201)
+- enable image `alt` processing by default (#184)
+- make relative URLs in `e-*` properties absolute (#201)
+- fix implied photo relative paths (#205)
+- add timezone offset normalisation (#206)
 - fix whitespace in plaintext conversion (#207)
-- add srcset support (#209)
-- add language support (#210)
 - add extension to expose the DOM for embedded properties (#208)
-- add extension to support metaformats (#212)
+- add `srcset` support (#209)
+- add `lang` support (#210)
+- add extension to support `metaformats` (#212)
 
 ## 1.1.3 - 2023-06-28
 - reduce instances where photo is implied (#135)

From 0354be07da5401fad75a6fc71e65b83ca71f990f Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Sat, 2 Dec 2023 17:00:01 -0800
Subject: [PATCH 111/123] Add back string parsing example

---
 README.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a4f8cc9..2b9587e 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Import the parser using:
 
 ```
 
-### Parse an HTML Document from a string
+### Parse an HTML Document from a file or string
 
 ```pycon
 >>> with open("test/examples/eras.html") as fp:
@@ -57,6 +57,15 @@ Import the parser using:
 
 ```
 
+```pycon
+>>> mf2json = mf2py.parse(doc="<a class=h-card href=https://example.com>James</a>")
+>>> mf2json["items"]
+[{'type': ['h-card'],
+  'properties': {'name': ['James'],
+                 'url': ['https://example.com']}}]
+
+```
+
 ### Parse an HTML Document from a URL
 
 ```pycon

From 398d06ee920436b4b2610ced85721851ec718b80 Mon Sep 17 00:00:00 2001
From: James <37276661+capjamesg@users.noreply.github.com>
Date: Mon, 4 Dec 2023 18:04:43 +0000
Subject: [PATCH 112/123] Update changelog.md

---
 docs/changelog.md | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/docs/changelog.md b/docs/changelog.md
index d7f6c2e..5577c5a 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,6 +1,50 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## v2.0.0 - 2023-12-04
+
+The mf2py library is excited to transition into 2.0. This version increase incorporates months of work from contributors, informed by active discussions among implementers and users.
+
+This release officially deprecates support for versions of Python lower than 3.8.
+
+Below are the changes we have made in this release.
+
+## New Features
+
+* Enable img_with_alt by default by @capjamesg in https://github.com/microformats/mf2py/pull/184
+* Add timezone offset normalisation by @angelogladding in https://github.com/microformats/mf2py/pull/206
+* Add extension to expose DOM for embedded properties by @angelogladding in https://github.com/microformats/mf2py/pull/208
+* Add srcset support by @angelogladding in https://github.com/microformats/mf2py/pull/209
+* Add language support by @angelogladding in https://github.com/microformats/mf2py/pull/210
+* Add extension to support metaformats by @snarfed in https://github.com/microformats/mf2py/pull/213
+
+## Changes
+
+* Remove `img_with_alt` option entirely by @angelogladding in https://github.com/microformats/mf2py/pull/200
+* Resolve implied photo relative paths by @angelogladding in https://github.com/microformats/mf2py/pull/205
+* Make relative URLs in `e-` properties absolute by @angelogladding in https://github.com/microformats/mf2py/pull/201
+* Fix whitespace in plaintext conversion by @angelogladding in https://github.com/microformats/mf2py/pull/207
+* Replace `dict_class` with standard `dict` by @angelogladding in https://github.com/microformats/mf2py/pull/196
+
+## Tests, Library and Documentation Maintenance
+
+* Update tests to include alt texts by default by @angelogladding in https://github.com/microformats/mf2py/pull/190
+* Add Windows and macOS tests by @capjamesg in https://github.com/microformats/mf2py/pull/198
+* Use poetry for dependency management by @angelogladding in https://github.com/microformats/mf2py/pull/189
+* Deprecate Python 2 support by @angelogladding in https://github.com/microformats/mf2py/pull/179
+* Code linted with `black` and `isort` by @capjamesg 
+* Bump requests from 2.21.0 to 2.31.0 by @dependabot in https://github.com/microformats/mf2py/pull/185
+* Add linting CI actions by @capjamesg in https://github.com/microformats/mf2py/pull/193
+* Move from nose2 to pytest by @capjamesg in https://github.com/microformats/mf2py/pull/186
+* Switch from nosetests to pytest by @angelogladding in https://github.com/microformats/mf2py/pull/178
+* Add 3.11, 3.12 and drop pypy from test matrix; upgrade poetry action by @angelogladding in https://github.com/microformats/mf2py/pull/204
+* Prepare tests to test extensions by @angelogladding in https://github.com/microformats/mf2py/pull/214
+* Bring README doctests up-to-date by @angelogladding in https://github.com/microformats/mf2py/pull/215
+* Update README by @angelogladding in https://github.com/microformats/mf2py/pull/216
+* Fix tests/doctests by @angelogladding in https://github.com/microformats/mf2py/pull/217
+
+**Full Changelog**: https://github.com/microformats/mf2py/compare/v1.1.3...v2.0.0
+
 ## 1.1.3 - 2022-06-28
 - reduce instances where photo is implied (#135)
 - always do relative URL resolution (#138)

From 5493eea212c29fc3d568fff28647b1a81ce7aa8b Mon Sep 17 00:00:00 2001
From: James <37276661+capjamesg@users.noreply.github.com>
Date: Mon, 4 Dec 2023 18:05:00 +0000
Subject: [PATCH 113/123] Delete CHANGELOG.md

---
 CHANGELOG.md | 163 ---------------------------------------------------
 1 file changed, 163 deletions(-)
 delete mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index c3d68c8..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,163 +0,0 @@
-# Change Log
-All notable changes to this project will be documented in this file.
-
-## 2.0 - unreleased
-- enable image `alt` processing by default (#184)
-- make relative URLs in `e-*` properties absolute (#201)
-- fix implied photo relative paths (#205)
-- add timezone offset normalisation (#206)
-- fix whitespace in plaintext conversion (#207)
-- add extension to expose the DOM for embedded properties (#208)
-- add `srcset` support (#209)
-- add `lang` support (#210)
-- add extension to support `metaformats` (#212)
-
-## 1.1.3 - 2023-06-28
-- reduce instances where photo is implied (#135)
-- always do relative URL resolution (#138)
-- VCP now handles tz offsets without leading zeros (#142)
-- implement id parsing (#143)
-- fix outdated syntax causing SyntaxWarning (#157)
-
-## 1.1.2 - 2018-08-08
-- add parsing for iframe.u-*[src] (#116)
-- bug fix: reduced implied urls (#117)
-- bug fix: don't collapse whitespace between tags
-- specify explicit versions for dependencies
-- revert BeautifulSoup copying added in 1.1.1 due to bugs (eg #108)
-- misc performance improvements
-
-## 1.1.1 - 2018-06-15
-
-- streamline backcompat to use JSON only.
-- fix multiple mf1 root rel-tag parsing
-- correct url and photo for hreview.
-- add rules for nested hreview. update backcompat to use multiple matches in old properties.
-- fix `rel-tag` to `p-category` conversion so that other classes are not lost.
-- use original authored html for `e-*` parsing in backcompat
-- make classes and rels into unordered (alphabetically ordered) deduped arrays.
-- only use class names for mf2 which follow the naming rules
-- fix `parse` method to use default html parser.
-- always use the first value for attributes for rels.
-- correct AM/PM conversion in datetime value class pattern.
- - add ordinal date parsing to datetimes value class pattern. ordinal date is normalised to YYYY-MM-DD
-- remove hack for html tag classes since that is fixed in new BS
-- better whitespace algorithm for `name` and `html.value` parsing
-- experimental flag for including `alt` in `u-photo` parsing
-- make a copy of the BeautifulSoup given by user to work on for parsing to prevent changes to original doc
-- bump version to 1.1.1
-
-## 1.1.0 - 2018-03-16
-
-- bump version to 1.1.0 since it is a "major" change
-- added tests for new implied name rules
-- modified earlier tests to accommodate new rules
-- use space separator instead of "T"
-- Don't add "00" seconds unless authored
-- use TZ authored in separate `value` element
-- only use first found `value` of a particular type `date`, `time`, or `timezone`.
-- move backcompat rules into JSON files
-- reorganise value class pattern parsing into new files
-- add datetime_helpers to organise datetime parsing rules
-- reorganise tests
-- remove Heroku frontend, point to mf2py-web and python.microformats.io instead in README.
-- remove Flask and gunicorn requirements
-- add debug info with description, version, url and the html parser used
-
-## 1.0.6 - 2018-03-04
-
-- strip leading/trailing white space for `e-*[html]`. update the corresponding tests
-- blank values explicitly authored are allowed as property values
-- include `alt` or `src` from `<img>` in parsing for `p-*` and `e-*[value]`
-- parse `title` from `<link>` for `p-*` resolves #84
-- and `poster` from `<video>` for `u-*` resolves #76
-- use `html5lib` as default parser
-- use the final redirect URL resolves #62
-- update requirements to use BS4 v4.6.0 and html5lib v1.0.1
-- drop support for Python 2.6 as html5lib dropped support
-
-## 1.0.5 - 2016-05-09
-
-- Implied property checks now ignore alt="", treating it the same as
-  if no alt value is defined.
-- Support for using a custom dict implementation by setting
-  mf2py.Parser.dict_class. collections.OrderedDict yields much nicer
-  output for hosted parsers.
-
-## 1.0.4 - 2016-03-21
-### Changed
-- Performance improvement changing simple calls to soup.find_all to
-  a manual iteration over .contents.
-
-## 1.0.3 - 2016-02-05
-### Changed
-- Performance improvement by limiting number of calls to soup.find_all
-  in backcompat module. Should not be any functional changes.
-
-## 1.0.2 - 2016-01-26
-### Added
-- Backward compatibility parsing for rel=tag properties. These are now converted
-  to p-category based on the last path segment of the tag URI as spec'd in
-  http://microformats.org/wiki/h-entry#Parser_Compatibility
-- Optional property html_parser to specify the html parser that BeautifulSoup
-  should use (e.g., "lxml" or "html5lib")
-
-## 1.0.1 - 2015-12-11
-### Changed
-- `u-*` properties are now parsed from `<link>` elements per the updated spec
-  http://microformats.org/wiki/microformats2-parsing-issues#link_elements_and_u-_parsing
-
-## 1.0.0 - 2015-10-05
-### Changed
-- Version number bumped to 1.0.0 following community discussion.
-
-## 0.2.8 - 2015-09-21
-### Changed
-- Stricter checks that Parser.__init__ params are actually None before
-  ignoring them.
-
-## 0.2.7 - 2015-08-03
-### Changed
-- Now produces unicode strings for every key and value, no more byte
-  strings anywhere.
-- Do not add 'T' between date and time when normalizing dates
-### Added
-- Unit tests for running the microformats test suite
-
-## 0.2.6 - 2015-05-06
-### Added
-- New top-level "rel-urls" entry, contains rich data parsed from rel
-  links, organized by URL.
-
-## 0.2.5 - 2015-03-01
-### Added
-- convenience method `mf2py.parse` that takes the same arguments as Parser
-  and returns a dict.
-### Changed
-- nested h-* classes now parse their "value" based on the property
-  they represent (p-*, u-*, dt-*), so for example "p-in-reply-to
-  h-cite" would have a name as its value and "u-in-reply-to h-cite"
-  will have a URL.
-
-## 0.2.4 - 2015-02-13
-### Added
-- Add rel=bookmark to backward compat parsing rules based (translated
-  to u-url in mf2)
-### Changed
-- Parser constructor now takes explicit named arguments instead of
-  **kwargs, for saner behavior when called with unnamed arguments.
-- Bugfix: Empty href="" attributes are now properly interpreted as
-  the current document's URL.
-
-## 0.2.3 - 2015-02-07
-### Changed
-- Minor Py3 compatibility fix
-- Correct typo `test_requires` -> `tests_require` in setup.py
-
-## 0.2.2 - 2015-02-05
-### Changed
-- Started keeping a changelog!
-- Use a better method for extracting HTML for an e-* property
-- Correct BeautifulSoup4 dependency in setup.py to fix error with
-  installation from PyPI.
-- Buffed up docstrings for public methods.

From 033ee80265fe9ea79c577dad040b30ff5320c622 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <ragt.ag>
Date: Thu, 7 Dec 2023 17:31:14 -0800
Subject: [PATCH 114/123] Update project meta files

- Bump version in pyproject
- Tighten changelog
- Tighten makefile
- Tighten/update contributors
- Tighten/update/automate documentation
  - Add dev deps to pyproject
  - Add docs generation to makefile
  - Reuse readme and changelog from project root
  - Hide `Parser.parse()`
---
 .gitignore        |   3 +-
 CHANGELOG.md      | 167 +++++++++++++++++++++++++++++++++++++++
 CONTRIBUTORS.md   |  12 +--
 Makefile          |   8 +-
 README.md         |  13 +--
 docs/changelog.md | 197 +---------------------------------------------
 docs/index.md     |  99 +----------------------
 docs/parser.md    |   6 +-
 mf2py/parser.py   |   4 +-
 mkdocs.yml        |   6 +-
 pyproject.toml    |   5 +-
 11 files changed, 201 insertions(+), 319 deletions(-)
 create mode 100644 CHANGELOG.md
 mode change 100644 => 120000 docs/changelog.md
 mode change 100644 => 120000 docs/index.md

diff --git a/.gitignore b/.gitignore
index 717d41c..1a4195c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ mf2py.egg-info/
 nbproject/
 venv/
 *~
-poetry.lock
\ No newline at end of file
+poetry.lock
+site/
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..993fea9
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,167 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+## 2.0.0 - 2023-12-07
+The mf2py library is excited to transition into 2.0. This version increase incorporates months of work from contributors, informed by active discussions among implementers and users.
+
+This release officially deprecates support for versions of Python lower than 3.8.
+
+Below are the changes we have made in this release.
+
+### New Features
+- Enable `img_with_alt` by default (#184)
+- Add timezone offset normalisation (#206)
+- Add option for exposing DOM for embedded properties (#208)
+- Add srcset support (#209)
+- Add language support (#210)
+- Add option for metaformats support (#213)
+
+### Changes
+- Remove `img_with_alt` option entirely (#200)
+- Resolve implied photo relative paths (#205)
+- Make relative URLs in embedded properties absolute (#201)
+- Fix whitespace in plaintext conversion (#207)
+- Replace `dict_class` with standard `dict` (#196)
+
+### Tests, Library and Documentation Maintenance
+- Update tests to include alt texts by default (#190)
+- Add Windows and macOS tests (#198)
+- Use poetry for dependency management (#189)
+- Deprecate Python 2 support (#179)
+- Lint code with `black` and `isort`
+- Add linting CI actions (#193)
+- Move from `nosetests` to `pytest` (#186)
+- Add 3.11, 3.12 and drop pypy from test matrix; upgrade poetry action (#204)
+- Prepare tests to test options (#214)
+- Bring README doctests up-to-date (#215)
+
+## 1.1.3 - 2022-06-28
+- reduce instances where photo is implied (#135)
+- always do relative URL resolution (#138)
+- VCP now handles tz offsets without leading zeros (#142)
+- implement id parsing (#143)
+- fix outdated syntax causing SyntaxWarning (#157)
+
+## 1.1.2 - 2018-08-08
+- add parsing for iframe.u-*[src] (#116)
+- bug fix: reduced implied urls (#117)
+- bug fix: don't collapse whitespace between tags
+- specify explicit versions for dependencies
+- revert BeautifulSoup copying added in 1.1.1 due to bugs (eg #108)
+- misc performance improvements
+
+## 1.1.1 - 2018-06-15
+- streamline backcompat to use JSON only.
+- fix multiple mf1 root rel-tag parsing
+- correct url and photo for hreview.
+- add rules for nested hreview. update backcompat to use multiple matches in old properties.
+- fix `rel-tag` to `p-category` conversion so that other classes are not lost.
+- use original authored html for `e-*` parsing in backcompat
+- make classes and rels into unordered (alphabetically ordered) deduped arrays.
+- only use class names for mf2 which follow the naming rules
+- fix `parse` method to use default html parser.
+- always use the first value for attributes for rels.
+- correct AM/PM conversion in datetime value class pattern.
+- add ordinal date parsing to datetimes value class pattern. ordinal date is normalised to YYYY-MM-DD
+- remove hack for html tag classes since that is fixed in new BS
+- better whitespace algorithm for `name` and `html.value` parsing
+- experimental flag for including `alt` in `u-photo` parsing
+- make a copy of the BeautifulSoup given by user to work on for parsing to prevent changes to original doc
+- bump version to 1.1.1
+
+## 1.1.0 - 2018-03-16
+- bump version to 1.1.0 since it is a "major" change
+- added tests for new implied name rules
+- modified earlier tests to accommodate new rules
+- use space separator instead of "T"
+- Don't add "00" seconds unless authored
+- use TZ authored in separate `value` element
+- only use first found `value` of a particular type `date`, `time`, or `timezone`.
+- move backcompat rules into JSON files
+- reorganise value class pattern parsing into new files
+- add datetime_helpers to organise datetime parsing rules
+- reorganise tests
+- remove Heroku frontend, point to mf2py-web and python.microformats.io instead in README.
+- remove Flask and gunicorn requirements
+- add debug info with description, version, url and the html parser used
+
+## 1.0.6 - 2018-03-04
+- strip leading/trailing white space for `e-*[html]`. update the corresponding tests
+- blank values explicitly authored are allowed as property values
+- include `alt` or `src` from `<img>` in parsing for `p-*` and `e-*[value]`
+- parse `title` from `<link>` for `p-*` resolves #84
+- and `poster` from `<video>` for `u-*` resolves #76
+- use `html5lib` as default parser
+- use the final redirect URL resolves #62
+- update requirements to use BS4 v4.6.0 and html5lib v1.0.1
+- drop support for Python 2.6 as html5lib dropped support
+
+## 1.0.5 - 2016-05-09
+- Implied property checks now ignore alt="", treating it the same as
+  if no alt value is defined.
+- Support for using a custom dict implementation by setting
+  mf2py.Parser.dict_class. collections.OrderedDict yields much nicer
+  output for hosted parsers.
+
+## 1.0.4 - 2016-03-21
+- Performance improvement changing simple calls to soup.find_all to
+  a manual iteration over .contents.
+
+## 1.0.3 - 2016-02-05
+- Performance improvement by limiting number of calls to soup.find_all
+  in backcompat module. Should not be any functional changes.
+
+## 1.0.2 - 2016-01-26
+- Backward compatibility parsing for rel=tag properties. These are now converted
+  to p-category based on the last path segment of the tag URI as spec'd in
+  http://microformats.org/wiki/h-entry#Parser_Compatibility
+- Optional property html_parser to specify the html parser that BeautifulSoup
+  should use (e.g., "lxml" or "html5lib")
+
+## 1.0.1 - 2015-12-11
+- `u-*` properties are now parsed from `<link>` elements per the updated spec
+  http://microformats.org/wiki/microformats2-parsing-issues#link_elements_and_u-_parsing
+
+## 1.0.0 - 2015-10-05
+- Version number bumped to 1.0.0 following community discussion.
+
+## 0.2.8 - 2015-09-21
+- Stricter checks that Parser.__init__ params are actually None before
+  ignoring them.
+
+## 0.2.7 - 2015-08-03
+- Now produces unicode strings for every key and value, no more byte
+  strings anywhere.
+- Do not add 'T' between date and time when normalizing dates
+- Unit tests for running the microformats test suite
+
+## 0.2.6 - 2015-05-06
+- New top-level "rel-urls" entry, contains rich data parsed from rel
+  links, organized by URL.
+
+## 0.2.5 - 2015-03-01
+- convenience method `mf2py.parse` that takes the same arguments as Parser
+  and returns a dict.
+- nested h-* classes now parse their "value" based on the property
+  they represent (p-*, u-*, dt-*), so for example "p-in-reply-to
+  h-cite" would have a name as its value and "u-in-reply-to h-cite"
+  will have a URL.
+
+## 0.2.4 - 2015-02-13
+- Add rel=bookmark to backward compat parsing rules based (translated
+  to u-url in mf2)
+- Parser constructor now takes explicit named arguments instead of
+  **kwargs, for saner behavior when called with unnamed arguments.
+- Bugfix: Empty href="" attributes are now properly interpreted as
+  the current document's URL.
+
+## 0.2.3 - 2015-02-07
+- Minor Py3 compatibility fix
+- Correct typo `test_requires` -> `tests_require` in setup.py
+
+## 0.2.2 - 2015-02-05
+- Started keeping a changelog!
+- Use a better method for extracting HTML for an e-* property
+- Correct BeautifulSoup4 dependency in setup.py to fix error with
+  installation from PyPI.
+- Buffed up docstrings for public methods.
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 2dafe1d..e9c1d39 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1,11 +1,11 @@
 # Contributors
 
-- Tom Morris <tom@tommorris.org> http://tommorris.org/
-- Barnaby Walters http://waterpigs.co.uk
+- Tom Morris <tom@tommorris.org> https://tommorris.org
+- Barnaby Walters https://waterpigs.co.uk
 - Kartik Prabhu <me@kartikprabhu.com> https://kartikprabhu.com
-- Kyle Mahan <kyle@kylewm.com> https://kylewm.com
-- Kevin Marks <kevinmarks@gmail.com> http://www.kevinmarks.com/
+- Kyle Mahan https://github.com/kylewm
+- Kevin Marks <kevinmarks@gmail.com> https://www.kevinmarks.com
 - James <jamesg@jamesg.blog> https://jamesg.blog
 - Angelo Gladding <angelo@ragt.ag> https://ragt.ag
-- Paweł Miech https://pawelmhm.github.io/
-- Sven Knebel https://www.svenknebel.de
\ No newline at end of file
+- Paweł Miech https://pawelmhm.github.io
+- Sven Knebel https://www.svenknebel.de
diff --git a/Makefile b/Makefile
index 326c37e..e3b90f4 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,12 @@ install:
 	poetry install
 tests:
 	poetry run pytest -s -vv --doctest-modules --doctest-glob README*
-publish:
-	poetry publish --build
 lint:
 	poetry run black .
 	poetry run isort .
+docs_dev:
+	poetry run mkdocs serve
+docs_deploy:
+	poetry run mkdocs gh-deploy
+publish:
+	poetry publish --build
diff --git a/README.md b/README.md
index 2b9587e..c2f4459 100644
--- a/README.md
+++ b/README.md
@@ -7,19 +7,20 @@
 
 ## Welcome 👋
 
-`mf2py` is a Python [microformats](https://microformats.org/wiki/microformats) parser with full support for `microformats2` and `microformats1`.
+`mf2py` is a Python [microformats](https://microformats.org/wiki/microformats) parser with full support for `microformats2`, backwards-compatible support for `microformats1` and experimental support for `metaformats`.
 
 ## Installation 💻
 
-To install `mf2py`, run the following command:
+To install `mf2py` run the following command:
 
 ```bash
-pip install mf2py
+$ pip install mf2py
+
 ```
 
 ## Quickstart 🚀
 
-Import the parser using:
+Import the library:
 
 ```pycon
 >>> import mf2py
@@ -77,9 +78,9 @@ Import the parser using:
 
 ```
 
-## Extensions
+## Experimental Options
 
-The following extensions can be invoked via keyword arguments to `parse()` and `Parser()`.
+The following options can be invoked via keyword arguments to `parse()` and `Parser()`.
 
 ### `expose_dom`
 
diff --git a/docs/changelog.md b/docs/changelog.md
deleted file mode 100644
index 5577c5a..0000000
--- a/docs/changelog.md
+++ /dev/null
@@ -1,196 +0,0 @@
-# Change Log
-All notable changes to this project will be documented in this file.
-
-## v2.0.0 - 2023-12-04
-
-The mf2py library is excited to transition into 2.0. This version increase incorporates months of work from contributors, informed by active discussions among implementers and users.
-
-This release officially deprecates support for versions of Python lower than 3.8.
-
-Below are the changes we have made in this release.
-
-## New Features
-
-* Enable img_with_alt by default by @capjamesg in https://github.com/microformats/mf2py/pull/184
-* Add timezone offset normalisation by @angelogladding in https://github.com/microformats/mf2py/pull/206
-* Add extension to expose DOM for embedded properties by @angelogladding in https://github.com/microformats/mf2py/pull/208
-* Add srcset support by @angelogladding in https://github.com/microformats/mf2py/pull/209
-* Add language support by @angelogladding in https://github.com/microformats/mf2py/pull/210
-* Add extension to support metaformats by @snarfed in https://github.com/microformats/mf2py/pull/213
-
-## Changes
-
-* Remove `img_with_alt` option entirely by @angelogladding in https://github.com/microformats/mf2py/pull/200
-* Resolve implied photo relative paths by @angelogladding in https://github.com/microformats/mf2py/pull/205
-* Make relative URLs in `e-` properties absolute by @angelogladding in https://github.com/microformats/mf2py/pull/201
-* Fix whitespace in plaintext conversion by @angelogladding in https://github.com/microformats/mf2py/pull/207
-* Replace `dict_class` with standard `dict` by @angelogladding in https://github.com/microformats/mf2py/pull/196
-
-## Tests, Library and Documentation Maintenance
-
-* Update tests to include alt texts by default by @angelogladding in https://github.com/microformats/mf2py/pull/190
-* Add Windows and macOS tests by @capjamesg in https://github.com/microformats/mf2py/pull/198
-* Use poetry for dependency management by @angelogladding in https://github.com/microformats/mf2py/pull/189
-* Deprecate Python 2 support by @angelogladding in https://github.com/microformats/mf2py/pull/179
-* Code linted with `black` and `isort` by @capjamesg 
-* Bump requests from 2.21.0 to 2.31.0 by @dependabot in https://github.com/microformats/mf2py/pull/185
-* Add linting CI actions by @capjamesg in https://github.com/microformats/mf2py/pull/193
-* Move from nose2 to pytest by @capjamesg in https://github.com/microformats/mf2py/pull/186
-* Switch from nosetests to pytest by @angelogladding in https://github.com/microformats/mf2py/pull/178
-* Add 3.11, 3.12 and drop pypy from test matrix; upgrade poetry action by @angelogladding in https://github.com/microformats/mf2py/pull/204
-* Prepare tests to test extensions by @angelogladding in https://github.com/microformats/mf2py/pull/214
-* Bring README doctests up-to-date by @angelogladding in https://github.com/microformats/mf2py/pull/215
-* Update README by @angelogladding in https://github.com/microformats/mf2py/pull/216
-* Fix tests/doctests by @angelogladding in https://github.com/microformats/mf2py/pull/217
-
-**Full Changelog**: https://github.com/microformats/mf2py/compare/v1.1.3...v2.0.0
-
-## 1.1.3 - 2022-06-28
-- reduce instances where photo is implied (#135)
-- always do relative URL resolution (#138)
-- VCP now handles tz offsets without leading zeros (#142)
-- implement id parsing (#143)
-- fix outdated syntax causing SyntaxWarning (#157)
-
-## 1.1.2 - 2018-08-08
-- add parsing for iframe.u-*[src] (#116)
-- bug fix: reduced implied urls (#117)
-- bug fix: don't collapse whitespace between tags
-- specify explicit versions for dependencies
-- revert BeautifulSoup copying added in 1.1.1 due to bugs (eg #108)
-- misc performance improvements
-
-## 1.1.1 - 2018-06-15
-
-- streamline backcompat to use JSON only.
-- fix multiple mf1 root rel-tag parsing 
-- correct url and photo for hreview.
-- add rules for nested hreview. update backcompat to use multiple matches in old properties.
-- fix `rel-tag` to `p-category` conversion so that other classes are not lost.
-- use original authored html for `e-*` parsing in backcompat
-- make classes and rels into unordered (alphabetically ordered) deduped arrays.
-- only use class names for mf2 which follow the naming rules
-- fix `parse` method to use default html parser.
-- always use the first value for attributes for rels.
-- correct AM/PM conversion in datetime value class pattern.
- - add ordinal date parsing to datetimes value class pattern. ordinal date is normalised to YYYY-MM-DD
-- remove hack for html tag classes since that is fixed in new BS
-- better whitespace algorithm for `name` and `html.value` parsing
-- experimental flag for including `alt` in `u-photo` parsing
-- make a copy of the BeautifulSoup given by user to work on for parsing to prevent changes to original doc
-- bump version to 1.1.1 
-
-## 1.1.0 - 2018-03-16
-
-- bump version to 1.1.0 since it is a "major" change 
-- added tests for new implied name rules
-- modified earlier tests to accommodate new rules
-- use space separator instead of "T"
-- Don't add "00" seconds unless authored
-- use TZ authored in separate `value` element
-- only use first found `value` of a particular type `date`, `time`, or `timezone`.
-- move backcompat rules into JSON files
-- reorganise value class pattern parsing into new files
-- add datetime_helpers to organise datetime parsing rules
-- reorganise tests
-- remove Heroku frontend, point to mf2py-web and python.microformats.io instead in README.
-- remove Flask and gunicorn requirements
-- add debug info with description, version, url and the html parser used 
-
-## 1.0.6 - 2018-03-04
-
-- strip leading/trailing white space for `e-*[html]`. update the corresponding tests
-- blank values explicitly authored are allowed as property values 
-- include `alt` or `src` from `<img>` in parsing for `p-*` and `e-*[value]`
-- parse `title` from `<link>` for `p-*` resolves #84 
-- and `poster` from `<video>` for `u-*` resolves #76 
-- use `html5lib` as default parser
-- use the final redirect URL resolves #62 
-- update requirements to use BS4 v4.6.0 and html5lib v1.0.1
-- drop support for Python 2.6 as html5lib dropped support
-
-## 1.0.5 - 2016-05-09
-
-- Implied property checks now ignore alt="", treating it the same as
-  if no alt value is defined.
-- Support for using a custom dict implementation by setting
-  mf2py.Parser.dict_class. collections.OrderedDict yields much nicer
-  output for hosted parsers.
-
-## 1.0.4 - 2016-03-21
-### Changed
-- Performance improvement changing simple calls to soup.find_all to
-  a manual iteration over .contents.
-
-## 1.0.3 - 2016-02-05
-### Changed
-- Performance improvement by limiting number of calls to soup.find_all
-  in backcompat module. Should not be any functional changes.
-
-## 1.0.2 - 2016-01-26
-### Added
-- Backward compatibility parsing for rel=tag properties. These are now converted
-  to p-category based on the last path segment of the tag URI as spec'd in
-  http://microformats.org/wiki/h-entry#Parser_Compatibility
-- Optional property html_parser to specify the html parser that BeautifulSoup
-  should use (e.g., "lxml" or "html5lib")
-
-## 1.0.1 - 2015-12-11
-### Changed
-- `u-*` properties are now parsed from `<link>` elements per the updated spec
-  http://microformats.org/wiki/microformats2-parsing-issues#link_elements_and_u-_parsing
-
-## 1.0.0 - 2015-10-05
-### Changed
-- Version number bumped to 1.0.0 following community discussion.
-
-## 0.2.8 - 2015-09-21
-### Changed
-- Stricter checks that Parser.__init__ params are actually None before
-  ignoring them.
-
-## 0.2.7 - 2015-08-03
-### Changed
-- Now produces unicode strings for every key and value, no more byte
-  strings anywhere.
-- Do not add 'T' between date and time when normalizing dates
-### Added
-- Unit tests for running the microformats test suite
-
-## 0.2.6 - 2015-05-06
-### Added
-- New top-level "rel-urls" entry, contains rich data parsed from rel
-  links, organized by URL.
-
-## 0.2.5 - 2015-03-01
-### Added
-- convenience method `mf2py.parse` that takes the same arguments as Parser
-  and returns a dict.
-### Changed
-- nested h-* classes now parse their "value" based on the property
-  they represent (p-*, u-*, dt-*), so for example "p-in-reply-to
-  h-cite" would have a name as its value and "u-in-reply-to h-cite"
-  will have a URL.
-
-## 0.2.4 - 2015-02-13
-### Added
-- Add rel=bookmark to backward compat parsing rules based (translated
-  to u-url in mf2)
-### Changed
-- Parser constructor now takes explicit named arguments instead of
-  **kwargs, for saner behavior when called with unnamed arguments.
-- Bugfix: Empty href="" attributes are now properly interpreted as
-  the current document's URL.
-
-## 0.2.3 - 2015-02-07
-### Changed
-- Minor Py3 compatibility fix
-- Correct typo `test_requires` -> `tests_require` in setup.py
-
-## 0.2.2 - 2015-02-05
-### Changed
-- Started keeping a changelog!
-- Use a better method for extracting HTML for an e-* property
-- Correct BeautifulSoup4 dependency in setup.py to fix error with
-  installation from PyPI.
-- Buffed up docstrings for public methods.
diff --git a/docs/changelog.md b/docs/changelog.md
new file mode 120000
index 0000000..04c99a5
--- /dev/null
+++ b/docs/changelog.md
@@ -0,0 +1 @@
+../CHANGELOG.md
\ No newline at end of file
diff --git a/docs/index.md b/docs/index.md
deleted file mode 100644
index 63b7b65..0000000
--- a/docs/index.md
+++ /dev/null
@@ -1,98 +0,0 @@
-# Home
-
-![mf2py banner](banner.png)
-
-## Welcome 👋
-
-`mf2py` is a full-featured microformats2 (mf2) parser implemented in Python.
-
-mf2py implements the full mf2 specification, including backward compatibility with microformats1.
-
-## Installation 💻
-
-To install `mf2py`, run the following command:
-
-```bash
-pip install mf2py
-```
-
-## Quickstart 🚀
-
-Import the parser using:
-
-```python
-import mf2py
-```
-
-### Parse a File
-
-Parse a file containing HTML:
-
-```python
-with open('file/content.html','r') as file:
-    obj = mf2py.parse(doc=file)
-```
-
-### Parse a String
-
-Parse string containing HTML content:
-
-```python
-content = '<article class="h-entry"><h1 class="p-name">Hello</h1></article>'
-obj = mf2py.parse(doc=content)
-```
-
-### Parse a HTML Document Retrieved from a URL
-
-Parse content from a URL:
-
-```python
-obj = mf2py.parse(url="http://tommorris.org/")
-```
-
-`parse` is a convenience method that actually delegates to
-`mf2py.Parser` to do the real work. More sophisticated behaviors are
-available by invoking the object directly.
-
-### Format Options
-
-Retrieve parsed microformats as a Python dictionary or JSON string:
-
-```python
-p = mf2py.Parser(...)
-p.to_dict()  # returns a python dictionary
-p.to_json()  # returns a JSON string
-```
-
-### Filter by Microformat Type
-
-Filter by microformat type:
-
-```python
-p.to_dict(filter_by_type="h-entry")
-p.to_json(filter_by_type="h-entry")
-```
-
-## Experimental Features 🧪
-
-- Pass the optional argument `img_with_alt=True` to either the `Parser` object or to the `parse` method to enable parsing of the `alt` attribute of `<img>` tags according to [issue: image alt text is lost during parsing](https://github.com/microformats/microformats2-parsing/issues/2). By default this is `False` to be backwards compatible.
-
-## FAQs ❓
-
-* I passed `mf2py.parse()` a BeautifulSoup document, and it got modified!
-
-Yes, mf2py currently does that. We're working on preventing it! Hopefully soon.
-
-## Testing Environments 🌐
-
-A hosted live version of mf2py can be found at [python.microformats.io](https://python.microformats.io).
-
-## Contributing 🛠️
-
-We welcome contributions and bug reports via Github, and on the microformats wiki.
-
-We to follow the [IndieWebCamp code of conduct](http://indiewebcamp.com/code-of-conduct). Please be respectful of other contributors, and forge a spirit of positive co-operation without discrimination or disrespect.
-
-## License 🧑‍⚖️
-
-`mf2py` is licensed under an MIT License.
\ No newline at end of file
diff --git a/docs/index.md b/docs/index.md
new file mode 120000
index 0000000..32d46ee
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1 @@
+../README.md
\ No newline at end of file
diff --git a/docs/parser.md b/docs/parser.md
index 51e78df..8386e9f 100644
--- a/docs/parser.md
+++ b/docs/parser.md
@@ -1,5 +1,3 @@
-# Parse a Document
+# Parser Object
 
-## Parser
-
-:::mf2py.Parser
\ No newline at end of file
+:::mf2py.Parser
diff --git a/mf2py/parser.py b/mf2py/parser.py
index 0c1bee3..23accba 100644
--- a/mf2py/parser.py
+++ b/mf2py/parser.py
@@ -160,9 +160,9 @@ def __init__(
             if document := self.__doc__.find("html"):
                 self.lang = document.attrs.get("lang")
             # parse!
-            self.parse()
+            self._parse()
 
-    def parse(self):
+    def _parse(self):
         """Does the work of actually parsing the document. Done automatically
         on initialization.
         """
diff --git a/mkdocs.yml b/mkdocs.yml
index 55e4c54..e45b5e8 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -12,8 +12,8 @@ extra_css:
 
 nav:
   - Home: index.md
-  - Parse a Document: parser.md
-  - Changelog: changelog.md
+  - Parser Object: parser.md
+  - Change Log: changelog.md
 
 theme:
   name: 'material'
@@ -43,4 +43,4 @@ markdown_extensions:
   - pymdownx.tabbed:
       alternate_style: true
   - toc:
-      permalink: true
\ No newline at end of file
+      permalink: true
diff --git a/pyproject.toml b/pyproject.toml
index 9a595fe..f347bfa 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mf2py"
-version = "1.1.3"
+version = "2.0.0"
 description = "Microformats parser"
 authors = ["Tom Morris <tom@tommorris.org>"]
 license = "MIT"
@@ -23,6 +23,9 @@ mock = "^5.0.1"
 pytest = "^7.2.1"
 black = "^23.3.0"
 isort = "^5.12.0"
+mkdocs = "^1.5.3"
+mkdocs-material = "^9.5.0"
+mkdocstrings = {extras = ["python"], version = "^0.24.0"}
 
 [tool.pytest.ini_options]
 doctest_optionflags = "NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL"

From 1a3142dfd9d50e64f026ca133f48430f168d9239 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <ragt.ag>
Date: Thu, 7 Dec 2023 17:40:38 -0800
Subject: [PATCH 115/123] Fix version in README doctest

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c2f4459..884935d 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ Import the library:
                                                'rels': ['webmention']}},
  'debug': {'description': 'mf2py - microformats2 parser for python',
            'source': 'https://github.com/microformats/mf2py',
-           'version': '1.1.3',
+           'version': '2.0.0',
            'markup parser': 'html5lib'}}
 
 ```

From 34841b1c01645ef2bcfb47fb0494a03b736de86d Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Thu, 7 Dec 2023 18:33:49 -0800
Subject: [PATCH 116/123] Add filter list for known conflicting root class
 names (#211)

---
 mf2py/backcompat.py                    |  4 +--
 mf2py/implied_properties.py            | 22 +++++++--------
 mf2py/mf2_classes.py                   |  8 ++++--
 mf2py/parser.py                        | 38 ++++++++++++++++++++------
 test/examples/filter_roots.html        |  9 ++++++
 test/examples/filter_roots_custom.html |  6 ++++
 test/test_parser.py                    | 13 +++++++++
 7 files changed, 76 insertions(+), 24 deletions(-)
 create mode 100644 test/examples/filter_roots.html
 create mode 100644 test/examples/filter_roots_custom.html

diff --git a/mf2py/backcompat.py b/mf2py/backcompat.py
index a29004d..49a866e 100644
--- a/mf2py/backcompat.py
+++ b/mf2py/backcompat.py
@@ -143,7 +143,7 @@ def root(classes):
     return unordered_list([c for c in classes if c in _CLASSIC_MAP])
 
 
-def apply_rules(el, html_parser):
+def apply_rules(el, html_parser, filtered_roots):
     """add modern classnames for older mf1 classnames
 
     returns a copy of el and does not modify the original
@@ -164,7 +164,7 @@ def apply_prop_rules_to_children(parent, rules):
                 rule(child)
 
             # recurse if it's not a nested mf1 or mf2 root
-            if not (mf2_classes.root(classes) or root(classes)):
+            if not (mf2_classes.root(classes, filtered_roots) or root(classes)):
                 apply_prop_rules_to_children(child, rules)
 
     # add mf2 root equivalent
diff --git a/mf2py/implied_properties.py b/mf2py/implied_properties.py
index de422ab..4c538f3 100644
--- a/mf2py/implied_properties.py
+++ b/mf2py/implied_properties.py
@@ -2,7 +2,7 @@
 from .dom_helpers import get_attr, get_children, get_img, get_textContent, try_urljoin
 
 
-def name(el, base_url=""):
+def name(el, base_url, filtered_roots):
     """Find an implied name property
 
     Args:
@@ -34,7 +34,7 @@ def non_empty(val):
         poss_child = children[0]
 
         # ignore if mf2 root
-        if mf2_classes.root(poss_child.get("class", [])):
+        if mf2_classes.root(poss_child.get("class", []), filtered_roots):
             poss_child = None
 
         # if it is not img, area, abbr then find grandchild
@@ -45,7 +45,7 @@ def non_empty(val):
                 poss_child = grandchildren[0]
                 # if it is not img, area, abbr or is mf2 root then no possible child
                 if poss_child.name not in ("img", "area", "abbr") or mf2_classes.root(
-                    poss_child.get("class", [])
+                    poss_child.get("class", []), filtered_roots
                 ):
                     poss_child = None
 
@@ -67,7 +67,7 @@ def non_empty(val):
     return get_textContent(el, replace_img=True, img_to_src=False, base_url=base_url)
 
 
-def photo(el, base_url=""):
+def photo(el, base_url, filtered_roots):
     """Find an implied photo property
 
     Args:
@@ -86,7 +86,7 @@ def get_photo_child(children):
         poss_imgs = [c for c in children if c.name == "img"]
         if len(poss_imgs) == 1:
             poss_img = poss_imgs[0]
-            if not mf2_classes.root(poss_img.get("class", [])):
+            if not mf2_classes.root(poss_img.get("class", []), filtered_roots):
                 return poss_img
 
         # if element has one object child use data if exists and object is
@@ -94,7 +94,7 @@ def get_photo_child(children):
         poss_objs = [c for c in children if c.name == "object"]
         if len(poss_objs) == 1:
             poss_obj = poss_objs[0]
-            if not mf2_classes.root(poss_obj.get("class", [])):
+            if not mf2_classes.root(poss_obj.get("class", []), filtered_roots):
                 return poss_obj
 
     def resolve_relative_url(prop_value):
@@ -122,7 +122,7 @@ def resolve_relative_url(prop_value):
     if (
         poss_child is None
         and len(children) == 1
-        and not mf2_classes.root(children[0].get("class", []))
+        and not mf2_classes.root(children[0].get("class", []), filtered_roots)
     ):
         grandchildren = list(get_children(children[0]))
         poss_child = get_photo_child(grandchildren)
@@ -138,7 +138,7 @@ def resolve_relative_url(prop_value):
             return resolve_relative_url(prop_value)
 
 
-def url(el, base_url=""):
+def url(el, base_url, filtered_roots):
     """Find an implied url property
 
     Args:
@@ -156,14 +156,14 @@ def get_url_child(children):
         poss_as = [c for c in children if c.name == "a"]
         if len(poss_as) == 1:
             poss_a = poss_as[0]
-            if not mf2_classes.root(poss_a.get("class", [])):
+            if not mf2_classes.root(poss_a.get("class", []), filtered_roots):
                 return poss_a
 
         # if element has one area child use if not root class
         poss_areas = [c for c in children if c.name == "area"]
         if len(poss_areas) == 1:
             poss_area = poss_areas[0]
-            if not mf2_classes.root(poss_area.get("class", [])):
+            if not mf2_classes.root(poss_area.get("class", []), filtered_roots):
                 return poss_area
 
     # if element is a <a> or area use its href if exists
@@ -181,7 +181,7 @@ def get_url_child(children):
     if (
         poss_child is None
         and len(children) == 1
-        and not mf2_classes.root(children[0].get("class", []))
+        and not mf2_classes.root(children[0].get("class", []), filtered_roots)
     ):
         grandchildren = list(get_children(children[0]))
         poss_child = get_url_child(grandchildren)
diff --git a/mf2py/mf2_classes.py b/mf2py/mf2_classes.py
index 6565414..c48b9ad 100644
--- a/mf2py/mf2_classes.py
+++ b/mf2py/mf2_classes.py
@@ -5,6 +5,8 @@
 _mf2_properties_re = re.compile("(p|e|u|dt)-(:?[a-z0-9]+-)?[a-z]+(:?-[a-z]+)*$")
 _mf2_e_properties_re = re.compile("e-(:?[a-z0-9]+-)?[a-z]+(:?-[a-z]+)*$")
 
+CONFLICTING_ROOTS_TAILWIND = {"auto", "fit", "full", "max", "min", "px", "screen"}
+
 
 def filter_classes(classes, regex=_mf2_classes_re):
     """detect classes that are valid names for mf2, sort in dictionary by prefix"""
@@ -20,8 +22,10 @@ def filter_classes(classes, regex=_mf2_classes_re):
     return types
 
 
-def root(classes):
-    return {c for c in classes if _mf2_roots_re.match(c)}
+def root(classes, filtered_roots):
+    return {
+        c for c in classes if _mf2_roots_re.match(c) and c[2:] not in filtered_roots
+    }
 
 
 def is_property_class(class_):
diff --git a/mf2py/parser.py b/mf2py/parser.py
index 23accba..1ff8057 100644
--- a/mf2py/parser.py
+++ b/mf2py/parser.py
@@ -19,7 +19,14 @@
 from .version import __version__
 
 
-def parse(doc=None, url=None, html_parser=None, expose_dom=False, metaformats=False):
+def parse(
+    doc=None,
+    url=None,
+    html_parser=None,
+    expose_dom=False,
+    metaformats=False,
+    filter_roots=False,
+):
     """
     Parse a microformats2 document or url and return a json dictionary.
 
@@ -44,6 +51,7 @@ def parse(doc=None, url=None, html_parser=None, expose_dom=False, metaformats=Fa
         html_parser,
         expose_dom=expose_dom,
         metaformats=metaformats,
+        filter_roots=filter_roots,
     ).to_dict()
 
 
@@ -80,6 +88,7 @@ def __init__(
         html_parser=None,
         expose_dom=False,
         metaformats=False,
+        filter_roots=False,
     ):
         self.__url__ = None
         self.__doc__ = None
@@ -94,9 +103,16 @@ def __init__(
                 "version": __version__,
             },
         }
-        self.__metaformats = metaformats
-        self.expose_dom = expose_dom
         self.lang = None
+        self.expose_dom = expose_dom
+        self.__metaformats = metaformats
+        try:
+            self.filtered_roots = set(filter_roots)
+        except TypeError:
+            if filter_roots:
+                self.filtered_roots = mf2_classes.CONFLICTING_ROOTS_TAILWIND
+            else:
+                self.filtered_roots = []
 
         # use default parser if none specified
         self.__html_parser__ = html_parser or "html5lib"
@@ -189,8 +205,12 @@ def handle_microformat(
             parsed_types_aggregation = set()
 
             if backcompat_mode:
-                el = backcompat.apply_rules(el, self.__html_parser__)
-                root_class_names = mf2_classes.root(el.get("class", []))
+                el = backcompat.apply_rules(
+                    el, self.__html_parser__, self.filtered_roots
+                )
+                root_class_names = mf2_classes.root(
+                    el.get("class", []), self.filtered_roots
+                )
 
             root_lang = el.attrs.get("lang")
 
@@ -220,13 +240,13 @@ def handle_microformat(
                     "peh"
                 ):
                     properties["name"] = [
-                        implied_properties.name(el, base_url=self.__url__)
+                        implied_properties.name(el, self.__url__, self.filtered_roots)
                     ]
 
                 if "photo" not in properties and parsed_types_aggregation.isdisjoint(
                     "uh"
                 ):
-                    x = implied_properties.photo(el, base_url=self.__url__)
+                    x = implied_properties.photo(el, self.__url__, self.filtered_roots)
                     if x is not None:
                         properties["photo"] = [x]
 
@@ -234,7 +254,7 @@ def handle_microformat(
                 if "url" not in properties and parsed_types_aggregation.isdisjoint(
                     "uh"
                 ):
-                    x = implied_properties.url(el, base_url=self.__url__)
+                    x = implied_properties.url(el, self.__url__, self.filtered_roots)
                     if x is not None:
                         properties["url"] = [x]
 
@@ -492,7 +512,7 @@ def parse_el(el, ctx):
             classes = el.get("class", [])
 
             # find potential microformats in root classnames h-*
-            potential_microformats = mf2_classes.root(classes)
+            potential_microformats = mf2_classes.root(classes, self.filtered_roots)
 
             # if potential microformats found parse them
             if potential_microformats:
diff --git a/test/examples/filter_roots.html b/test/examples/filter_roots.html
new file mode 100644
index 0000000..ce72889
--- /dev/null
+++ b/test/examples/filter_roots.html
@@ -0,0 +1,9 @@
+<h2>Tailwind root filter</h2>
+<div class=h-card>fnord</div>
+<div class=h-auto>fnord</div>
+<div class=h-fit>fnord</div>
+<div class=h-full>fnord</div>
+<div class=h-max>fnord</div>
+<div class=h-min>fnord</div>
+<div class=h-px>fnord</div>
+<div class=h-screen>fnord</div>
diff --git a/test/examples/filter_roots_custom.html b/test/examples/filter_roots_custom.html
new file mode 100644
index 0000000..4ff79de
--- /dev/null
+++ b/test/examples/filter_roots_custom.html
@@ -0,0 +1,6 @@
+<h2>Custom root filter</h2>
+<div class=h-card>fnord</div>
+<div class=h-foo>fnord</div>
+<div class=h-bar>fnord</div>
+<div class=h-bat>fnord</div>
+<div class=h-baz>fnord</div>
diff --git a/test/test_parser.py b/test/test_parser.py
index 7a5cea5..a4ebdc3 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -1126,6 +1126,19 @@ def test_all_u_cases():
         )
 
 
+def test_filtered_roots():
+    result = parse_fixture("filter_roots.html")
+    assert len(result["items"]) == 8
+
+    result = parse_fixture("filter_roots.html", filter_roots=True)
+    assert len(result["items"]) == 1
+
+    result = parse_fixture(
+        "filter_roots_custom.html", filter_roots={"foo", "bar", "bat", "baz"}
+    )
+    assert len(result["items"]) == 1
+
+
 def test_metaformats_flag_false():
     result = parse_fixture("metaformats_ogp.html")
     assert result["items"] == []

From 0b1c219f55e09a51bbf3a22866e181c6a57364c1 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <ragt.ag>
Date: Thu, 7 Dec 2023 19:04:35 -0800
Subject: [PATCH 117/123] Add `filter_roots` to changelog, readme and
 docstrings

---
 CHANGELOG.md    | 1 +
 README.md       | 5 +++++
 mf2py/parser.py | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 993fea9..ce8a8cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ Below are the changes we have made in this release.
 - Add option for exposing DOM for embedded properties (#208)
 - Add srcset support (#209)
 - Add language support (#210)
+- Add option for filtering root class names (#211)
 - Add option for metaformats support (#213)
 
 ### Changes
diff --git a/README.md b/README.md
index 884935d..e754370 100644
--- a/README.md
+++ b/README.md
@@ -91,6 +91,11 @@ Use `expose_dom=True` to expose the DOM of embedded properties.
 Use `metaformats=True` to include any [metaformats](https://microformats.org/wiki/metaformats)
 found.
 
+### `filter_roots`
+
+Use `filter_roots=True` to filter known conflicting user names (e.g. Tailwind).
+Otherwise provide a custom list to filter instead.
+
 ## Advanced Usage
 
 `parse` is a convenience function for `Parser`. More sophisticated behaviors are
diff --git a/mf2py/parser.py b/mf2py/parser.py
index 1ff8057..9529005 100644
--- a/mf2py/parser.py
+++ b/mf2py/parser.py
@@ -42,6 +42,8 @@ def parse(
       expose_dom (boolean): optional, expose the DOM of embedded properties.
       metaformats (boolean): whether to include metaformats extracted from OGP
         and Twitter card data: https://microformats.org/wiki/metaformats
+      filter_roots (boolean or list): optional, filter root class names. Use
+        True to filter known conflicting classes, otherwise filter given list.
 
     Return: a json dict represented the structured data in this document.
     """
@@ -72,6 +74,8 @@ class Parser(object):
       expose_dom (boolean): optional, expose the DOM of embedded properties.
       metaformats (boolean): whether to include metaformats extracted from OGP
         and Twitter card data: https://microformats.org/wiki/metaformats
+      filter_roots (boolean or list): optional, filter root class names. Use
+        True to filter known conflicting classes, otherwise filter given list.
 
     Attributes:
       useragent (string): the User-Agent string for the Parser

From 685fa866b3adc8c559f44c8d41c3650477cf873c Mon Sep 17 00:00:00 2001
From: Angelo Gladding <ragt.ag>
Date: Thu, 7 Dec 2023 19:22:22 -0800
Subject: [PATCH 118/123] Clean up docstrings for `parse` and `Parser`

---
 mf2py/parser.py | 47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/mf2py/parser.py b/mf2py/parser.py
index 9529005..f099c69 100644
--- a/mf2py/parser.py
+++ b/mf2py/parser.py
@@ -28,24 +28,25 @@ def parse(
     filter_roots=False,
 ):
     """
-    Parse a microformats2 document or url and return a json dictionary.
+    Parse a document or URL for microformats and return a dictionary in mf2json format.
 
     Args:
-      doc (file or string or BeautifulSoup doc): file handle, text of content
-        to parse, or BeautifulSoup document. If None, it will be fetched from
-        given url
-      url (string): url of the file to be processed. Optionally extracted from
-        base-element of given doc
-      html_parser (string): optional, select a specific HTML parser. Valid
-        options from the BeautifulSoup documentation are:
-        "html", "xml", "html5", "lxml", "html5lib", and "html.parser"
+      doc (file, string or BeautifulSoup doc): file handle, text of content
+        to parse, or BeautifulSoup document. If None it will be fetched from
+        given URL.
+      url (string): URL of the file to be processed. If None it will be
+        extracted from the `<base>` element of given doc.
+      html_parser (string): optional, select a specific HTML parser. Valid options
+        from the BeautifulSoup documentation are: "html", "xml","html5", "lxml",
+        "html5lib", and "html.parser".
       expose_dom (boolean): optional, expose the DOM of embedded properties.
-      metaformats (boolean): whether to include metaformats extracted from OGP
+      metaformats (boolean): optional, include metaformats extracted from OGP
         and Twitter card data: https://microformats.org/wiki/metaformats
       filter_roots (boolean or list): optional, filter root class names. Use
         True to filter known conflicting classes, otherwise filter given list.
 
-    Return: a json dict represented the structured data in this document.
+    Return: a mf2json dict representing the structured data in the document
+
     """
     return Parser(
         doc,
@@ -58,27 +59,27 @@ def parse(
 
 
 class Parser(object):
-    """Object to parse a document for microformats and return them in
-    appropriate formats.
+    """
+    Parser to parse a document or URL for microformats and output in various formats.
 
     Args:
-      doc (file or string or BeautifulSoup doc): file handle, text of content
-        to parse, or BeautifulSoup document. If None, it will be fetched from
-        given url
-      url (string): url of the file to be processed. Optionally extracted from
-        base-element of given doc
-      html_parser (string): optional, select a specific HTML parser. Valid
-        options from the BeautifulSoup documentation are:
-        "html", "xml", "html5", "lxml", "html5lib", and "html.parser"
-        defaults to "html5lib"
+      doc (file, string or BeautifulSoup doc): file handle, text of content
+        to parse, or BeautifulSoup document. If None it will be fetched from
+        given URL.
+      url (string): URL of the file to be processed. If None it will be
+        extracted from the `<base>` element of given doc.
+      html_parser (string): optional, select a specific HTML parser. Valid options
+        from the BeautifulSoup documentation are: "html", "xml","html5", "lxml",
+        "html5lib", and "html.parser".
       expose_dom (boolean): optional, expose the DOM of embedded properties.
-      metaformats (boolean): whether to include metaformats extracted from OGP
+      metaformats (boolean): optional, include metaformats extracted from OGP
         and Twitter card data: https://microformats.org/wiki/metaformats
       filter_roots (boolean or list): optional, filter root class names. Use
         True to filter known conflicting classes, otherwise filter given list.
 
     Attributes:
       useragent (string): the User-Agent string for the Parser
+
     """
 
     ua_desc = "mf2py - microformats2 parser for python"

From 952750a65af8f7777cc7236bfe5419bf40986440 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <ragt.ag>
Date: Thu, 7 Dec 2023 19:28:11 -0800
Subject: [PATCH 119/123] Add `source=metaformats` to any meta item found

---
 mf2py/metaformats.py | 2 +-
 test/test_parser.py  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mf2py/metaformats.py b/mf2py/metaformats.py
index 316104d..2260918 100644
--- a/mf2py/metaformats.py
+++ b/mf2py/metaformats.py
@@ -60,7 +60,7 @@ def parse(soup, url=None):
     if filter_classes(soup.get("class", []))["h"]:
         return None
 
-    parsed = {"properties": {}}
+    parsed = {"properties": {}, "source": "metaformats"}
     props = parsed["properties"]
 
     # Properties
diff --git a/test/test_parser.py b/test/test_parser.py
index a4ebdc3..767d369 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -1152,6 +1152,7 @@ def test_metaformats_title_only():
             "properties": {
                 "name": ["Hello World"],
             },
+            "source": "metaformats",
         }
     ]
 
@@ -1171,6 +1172,7 @@ def test_metaformats_ogp():
                 "published": ["2023-01-02T03:04Z"],
                 "updated": ["2023-01-02T05:06Z"],
             },
+            "source": "metaformats",
         }
     ]
 
@@ -1185,6 +1187,7 @@ def test_metaformats_twitter():
                 "summary": ["Descrypshun bar"],
                 "photo": ["http://tantek.com/baz.jpg"],
             },
+            "source": "metaformats",
         }
     ]
 
@@ -1198,6 +1201,7 @@ def test_metaformats_html_meta():
                 "name": ["Hello World"],
                 "summary": ["Descrypshun bar"],
             },
+            "source": "metaformats",
         }
     ]
 

From 8dfa59b39a9a389d3c34fae16a5679c991a38210 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <ragt.ag>
Date: Thu, 7 Dec 2023 19:52:16 -0800
Subject: [PATCH 120/123] Add readme to pyproject

---
 pyproject.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index f347bfa..fb93588 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,8 @@
 [tool.poetry]
 name = "mf2py"
-version = "2.0.0"
+version = "2.0.1"
 description = "Microformats parser"
+readme = "README.md"
 authors = ["Tom Morris <tom@tommorris.org>"]
 license = "MIT"
 classifiers = [

From 8f72a81cb37934796939270116b7b7b7de888f88 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <ragt.ag>
Date: Thu, 7 Dec 2023 19:53:58 -0800
Subject: [PATCH 121/123] Update version in changelog and readme

---
 CHANGELOG.md | 2 +-
 README.md    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce8a8cb..1d4404b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## 2.0.0 - 2023-12-07
+## 2.0.1 - 2023-12-07
 The mf2py library is excited to transition into 2.0. This version increase incorporates months of work from contributors, informed by active discussions among implementers and users.
 
 This release officially deprecates support for versions of Python lower than 3.8.
diff --git a/README.md b/README.md
index e754370..be0ccb6 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ Import the library:
                                                'rels': ['webmention']}},
  'debug': {'description': 'mf2py - microformats2 parser for python',
            'source': 'https://github.com/microformats/mf2py',
-           'version': '2.0.0',
+           'version': '2.0.1',
            'markup parser': 'html5lib'}}
 
 ```

From b6dfc2d22b855f4202387e5b2eb5299a8ff42469 Mon Sep 17 00:00:00 2001
From: Benson Muite <bkmgit@users.noreply.github.com>
Date: Wed, 30 Oct 2024 21:36:11 +0300
Subject: [PATCH 122/123] Use unittest.mock from standard library (#222)

---
 pyproject.toml      | 1 -
 test/test_parser.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index fb93588..bc5edd6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,7 +20,6 @@ beautifulsoup4 = "^4.11.1"
 
 [tool.poetry.group.dev.dependencies]
 lxml = "^4.9.2"
-mock = "^5.0.1"
 pytest = "^7.2.1"
 black = "^23.3.0"
 isort = "^5.12.0"
diff --git a/test/test_parser.py b/test/test_parser.py
index 767d369..b858d57 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -2,9 +2,9 @@
 import re
 import sys
 from unittest import TestCase
+from unittest import mock
 
 import bs4
-import mock
 from bs4 import BeautifulSoup
 
 from mf2py import Parser

From 555f53e42a47c4b471dfbfb52fa964a9dcd674f3 Mon Sep 17 00:00:00 2001
From: Angelo Gladding <self@angelogladding.com>
Date: Wed, 30 Oct 2024 11:48:58 -0700
Subject: [PATCH 123/123] Fix imports in test_parser.py

---
 test/test_parser.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/test_parser.py b/test/test_parser.py
index b858d57..bcfd2c6 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -1,8 +1,7 @@
 import os
 import re
 import sys
-from unittest import TestCase
-from unittest import mock
+from unittest import TestCase, mock
 
 import bs4
 from bs4 import BeautifulSoup