pyhtml2text 0.3.0__tar.gz → 0.4.0__tar.gz

{pyhtml2text-0.3.0 → pyhtml2text-0.4.0}/.gitignore

@@ -3,3 +3,4 @@ dist/
 .venv/
 __pycache__/
 *.so
+.DS_Store

pyhtml2text-0.4.0/CHANGELOG.md

@@ -0,0 +1,69 @@
+# Changelog
+
+## 0.4.0 (2026-10-22)
+
+- `html2text()` is rendered by this package's own code. The library it used
+  before came from a fork that can no longer be fetched, so the source
+  distribution and fresh builds of 0.3.1 fail. The new renderer is a
+  clean-room implementation: it was written from 0.3.1's output, the HTML
+  standard and RFC 3986, without reference to the old library's source.
+- Output is the same as 0.3.1's, byte for byte, with every option set: on
+  the benchmark corpus, on 38 of 39 other real pages (the last differs at
+  width 40 only), and on 1,500 random documents without tables. With tables,
+  99.2% of 2,000 random documents match under each option set. The known
+  differences are all in unusual markup:
+  - A cell with nothing in it, beside a cell spanning rows: 0.3.1 draws the
+    span against the wrong cell, so borders and line breaks land a column
+    off. They now follow the spanning cell.
+  - A table with nothing to show whose cells span into further empty rows,
+    an empty `<pre>` or heading directly inside `<pre>`, and a table with
+    nothing to show in a paragraph: 0.3.1 writes an extra blank line.
+  - Headings, quotes and list items squeezed to fewer than three columns
+    break `**` and other markers in different places.
+  - Some emoji sequences (joined with U+200D) and Arabic lam-alef pairs, cut
+    at the end of a line in a narrow table cell.
+- `html2text()` is 1.2–2× faster on real pages (7.0 ms against 10.8 ms for
+  a 780 KB Wikipedia article) and 2× faster on short snippets.
+- `html2markdown()` output is unchanged.
+- PyO3 0.30. Building from source needs maturin 1.9.4 or later.
+
+## 0.3.1 (2026-10-19)
+
+- The vendored html5ever now carries
+  [servo/html5ever#800](https://github.com/servo/html5ever/pull/800) by Josef
+  Guenther in place of our narrower patch. Every "in scope" check and the
+  other searches of the stack of open elements are now O(1), so unmatched
+  end tags and end tags inside SVG or MathML no longer make deeply nested
+  HTML quadratic: 32,000 nested `<span>` followed by as many unmatched
+  `</em>` went from 3.4 s to 0.02 s. Output is unchanged.
+- About 0.4 µs more per call, and 0–2% on real pages.
+
+## 0.3.0 (2026-10-15)
+
+- New `html2markdown(html, *, base_url=None)`: HTML to CommonMark with
+  GitHub's tables and strikethrough. Links and images keep their URLs (made
+  absolute with `base_url`), tables become pipe tables, code blocks are
+  fenced with their language, and characters are escaped only where Markdown
+  would misread them. 3–13× faster than markdownify, html2text and
+  html-to-markdown on real pages.
+- `html2text()` output is unchanged.
+
+## 0.2.0 (2026-10-15)
+
+- 1.5–1.7× faster than 0.1.0 on real web pages, and 2× faster on short
+  snippets. Output is unchanged.
+  - Wheels for Linux x86_64/aarch64, macOS and Windows x64 are built with
+    profile-guided optimisation.
+  - Uses mimalloc as the allocator (except on glibc armv7, ppc64le and s390x).
+  - Style rules are shared rather than rebuilt and copied for every call.
+- Deeply nested HTML no longer takes quadratic time to parse: 40,000 nested
+  `<ul>` lists went from 6s to 0.14s (patched html5ever, see `vendor/`).
+- `html` can be UTF-8 `bytes` as well as `str`.
+- An internal error now raises `ValueError` rather than `PanicException`
+  (which `except Exception` doesn't catch).
+- Supports free-threaded Python without re-enabling the GIL.
+- Requires Python 3.10 or later (3.9 is end-of-life).
+
+## 0.1.0 (2026-10-15)
+
+- First release: `html2text()` with `base_url` support.

{pyhtml2text-0.3.0 → pyhtml2text-0.4.0}/Cargo.lock

@@ -2,12 +2,6 @@
 # It is not intended for manual editing.
 version = 4
 
-[[package]]
-name = "autocfg"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
-
 [[package]]
 name = "bitflags"
 version = "2.13.2"
@@ -16,9 +10,9 @@ checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06"
 
 [[package]]
 name = "cc"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6651c9ed80effdc7db0ff72512157f901af5e3549e341e24b1dd4887d836d838"
+checksum = "877bf67ac8e52449eb2f9e98a344ea163beb70dd1f9eebe3cc5357dcfeaee4df"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -38,9 +32,9 @@ checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223"
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aedcfb3409746eddb02b9e19ebda1c3394f759a152e48ee875a0844d1b955484"
+checksum = "1c66915cc5391097de7a2b0b972e8505aa33c0df401fd3a6811dbdb32881ba48"
 
 [[package]]
 name = "heck"
@@ -48,17 +42,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "html2text"
-version = "0.17.1"
-source = "git+https://github.com/jaredlynskey/rust-html2text?rev=b42930f8e6688ea121daf392e27a7d9812e6192d#b42930f8e6688ea121daf392e27a7d9812e6192d"
-dependencies = [
- "html5ever",
- "tendril",
- "thiserror",
- "unicode-width",
-]
-
 [[package]]
 name = "html5ever"
 version = "0.39.0"
@@ -67,20 +50,11 @@ dependencies = [
  "markup5ever",
 ]
 
-[[package]]
-name = "indoc"
-version = "2.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a37b2691796cffeb8a8cd305ac66e65841559f147f4e63231d0eafa4db5384d1"
-dependencies = [
- "rustversion",
-]
-
 [[package]]
 name = "libc"
-version = "0.2.190"
+version = "0.2.191"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce5d3ddc6d3fa000eb1536d85e147bfe31aacaba692ed6a876f95cb7c855be78"
+checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a"
 
 [[package]]
 name = "libmimalloc-sys"
@@ -123,15 +97,6 @@ version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
 
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "mimalloc"
 version = "0.1.52"
@@ -238,9 +203,9 @@ dependencies = [
 
 [[package]]
 name = "pulldown-cmark"
-version = "0.13.4"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9f068eba8e7071c5f9511831b44f32c740d5adf574e990f946ddb53db2f314e"
+checksum = "278e9268c93b9e498a2da46c34d90ba93a3255eb99009646398f34bc73ab36eb"
 dependencies = [
  "bitflags",
  "memchr",
@@ -249,46 +214,43 @@ dependencies = [
 
 [[package]]
 name = "pyhtml2text"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
- "html2text",
  "html5ever",
  "mimalloc",
  "pulldown-cmark",
  "pyo3",
+ "unicode-width",
 ]
 
 [[package]]
 name = "pyo3"
-version = "0.26.0"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383"
+checksum = "229ca13b8a15bb0d1487b81ab975bfcd97513416499a8312011b6036e42e0de4"
 dependencies = [
- "indoc",
  "libc",
- "memoffset",
  "once_cell",
  "portable-atomic",
  "pyo3-build-config",
  "pyo3-ffi",
  "pyo3-macros",
- "unindent",
 ]
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.26.0"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f"
+checksum = "70130e2b6dd1ee589a8788026a429561ca5c40fa7a2fa7914c2282eddae24700"
 dependencies = [
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.26.0"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105"
+checksum = "5e7ff73c555c286d212d4ce7e5fbda845a973c4f61bd5f160f5f2c3c2a04d1c4"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -296,27 +258,26 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.26.0"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded"
+checksum = "c46d2e5862c7bb8207e3b639f713dda3c499933444784154c11d013c5a691b60"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
  "quote",
- "syn 2.0.119",
+ "syn",
 ]
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.26.0"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf"
+checksum = "38b89f066f2ae72a2aef52d1537ca2fcd104440ebfadee06e97aa90738a25b9b"
 dependencies = [
  "heck",
  "proc-macro2",
- "pyo3-build-config",
  "quote",
- "syn 2.0.119",
+ "syn",
 ]
 
 [[package]]
@@ -337,12 +298,6 @@ dependencies = [
  "bitflags",
 ]
 
-[[package]]
-name = "rustversion"
-version = "1.0.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -375,7 +330,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.9",
+ "syn",
 ]
 
 [[package]]
@@ -420,17 +375,6 @@ dependencies = [
  "quote",
 ]
 
-[[package]]
-name = "syn"
-version = "2.0.119"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
 [[package]]
 name = "syn"
 version = "3.0.9"
@@ -457,26 +401,6 @@ dependencies = [
  "new_debug_unreachable",
 ]
 
-[[package]]
-name = "thiserror"
-version = "2.0.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09e52cb86a36cede5cb101bf8908837b3e4c6e5e59fe7fd85c23fb56200d189e"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "2.0.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 3.0.9",
-]
-
 [[package]]
 name = "unicase"
 version = "2.10.0"
@@ -495,12 +419,6 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
-[[package]]
-name = "unindent"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
-
 [[package]]
 name = "web_atoms"
 version = "0.2.6"

{pyhtml2text-0.3.0 → pyhtml2text-0.4.0}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pyhtml2text"
-version = "0.3.0"
+version = "0.4.0"
 edition = "2021"
 license = "MIT"
 publish = false
@@ -11,16 +11,16 @@ name = "_pyhtml2text"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.26", features = ["extension-module", "abi3-py310"] }
-# Fork of jugglerchris/rust-html2text with Config::base_url, some performance
-# changes and the DOM exports the Markdown output uses (branch pyhtml2text-perf).
-html2text = { git = "https://github.com/jaredlynskey/rust-html2text", rev = "b42930f8e6688ea121daf392e27a7d9812e6192d" }
-# The parser html2text uses; patched below. Used directly to read element attributes.
+pyo3 = { version = "0.30", features = ["abi3-py310"] }
+# The HTML parser; patched below.
 html5ever = "0.39"
+# Display width of characters, for wrapping.
+unicode-width = "=0.2.2"
 # Reads the Markdown back to check that emphasis parses as intended.
 pulldown-cmark = { version = "0.13", default-features = false }
 
-# Much faster than the system allocators for html2text's many small allocations.
+# Much faster than the system allocators for the many small allocations of
+# parsing and rendering.
 # Not on glibc armv7/ppc64le/s390x: their manylinux2014 cross compilers are too
 # old to build it (keep in sync with the cfg in src/lib.rs).
 [target.'cfg(not(all(target_env = "gnu", any(target_arch = "arm", target_arch = "powerpc64", target_arch = "s390x"))))'.dependencies]

{pyhtml2text-0.3.0 → pyhtml2text-0.4.0}/LICENSE

@@ -1,7 +1,6 @@
 MIT License
 
 Copyright (c) 2026 Jared Lynskey
-Copyright (c) 2016 Chris Emerson (rust-html2text, which this package embeds)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{pyhtml2text-0.3.0 → pyhtml2text-0.4.0}/PKG-INFO

@@ -1,23 +1,21 @@
 Metadata-Version: 2.4
 Name: pyhtml2text
-Version: 0.3.0
+Version: 0.4.0
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Text Processing :: Markup :: HTML
 License-File: LICENSE
-Summary: Fast HTML to plain text, with relative link resolution (Python bindings to rust-html2text)
+Summary: Fast HTML to plain text and Markdown, with relative link resolution
 Keywords: html,text,markdown,html2text
 Author-email: Jared Lynskey <jared@lynskey.co.nz>
 License-Expression: MIT
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 Project-URL: Source, https://github.com/jaredlynskey/pyhtml2text
-Project-URL: Upstream, https://github.com/jugglerchris/rust-html2text
 
 # pyhtml2text
 
-Fast HTML to plain text and to Markdown for Python, built on
-[rust-html2text](https://github.com/jugglerchris/rust-html2text).
+Fast HTML to plain text and to Markdown for Python, written in Rust.
 
 Relative links can be resolved against the page's URL, so the output's links
 work on their own.
@@ -114,7 +112,7 @@ To plain text:
 |---|---|---|
 | [html2text](https://pypi.org/project/html2text/) (pure Python) | 71.5 ms | 14.9 ms |
 | [html2text-rs](https://pypi.org/project/html2text-rs/) | 15.2 ms | 2.5 ms |
-| **pyhtml2text** | **10.9 ms** | **1.6 ms** |
+| **pyhtml2text** | **7.0 ms** | **1.3 ms** |
 
 - The GIL is released while converting, so threads scale across cores. On
   free-threaded Python (3.14t) the module runs without re-enabling the GIL.
@@ -122,16 +120,20 @@ To plain text:
   profile-guided optimisation, which makes them about 25% faster. Other
   platforms get the same code without it.
 - Deeply nested HTML is parsed in linear time, so hostile input can't stall a
-  worker: 40,000 nested lists take 0.14 s, against 6 s with stock html5ever.
+  worker: 40,000 nested lists take 0.14 s, against 6 s with stock html5ever,
+  and 100,000 levels of nesting followed by unmatched end tags take under
+  0.1 s.
 
 ## Credits
 
-The plain-text rendering is done by rust-html2text by Chris Emerson (MIT).
-This package uses [a fork](https://github.com/jaredlynskey/rust-html2text/tree/pyhtml2text-perf)
-that adds `base_url` and some performance changes, and a patched copy of
-[html5ever](https://github.com/servo/html5ever) (MIT/Apache-2.0, see
-`vendor/`). Markdown output is checked with
-[pulldown-cmark](https://github.com/raphlinus/pulldown-cmark) (MIT). It
-isn't affiliated with or endorsed by any of these projects, so please report
-issues here rather than upstream.
+HTML is parsed by a copy of [html5ever](https://github.com/servo/html5ever)
+(MIT/Apache-2.0) with
+[servo/html5ever#800](https://github.com/servo/html5ever/pull/800) by Josef
+Guenther applied, which makes parsing deeply nested HTML linear (see
+`vendor/`). Text is measured with
+[unicode-width](https://github.com/unicode-rs/unicode-width) (MIT/Apache-2.0)
+and Markdown output is checked with
+[pulldown-cmark](https://github.com/raphlinus/pulldown-cmark) (MIT). This
+package isn't affiliated with or endorsed by any of these projects, so please
+report issues here rather than upstream.
 

{pyhtml2text-0.3.0 → pyhtml2text-0.4.0}/README.md

@@ -1,7 +1,6 @@
 # pyhtml2text
 
-Fast HTML to plain text and to Markdown for Python, built on
-[rust-html2text](https://github.com/jugglerchris/rust-html2text).
+Fast HTML to plain text and to Markdown for Python, written in Rust.
 
 Relative links can be resolved against the page's URL, so the output's links
 work on their own.
@@ -98,7 +97,7 @@ To plain text:
 |---|---|---|
 | [html2text](https://pypi.org/project/html2text/) (pure Python) | 71.5 ms | 14.9 ms |
 | [html2text-rs](https://pypi.org/project/html2text-rs/) | 15.2 ms | 2.5 ms |
-| **pyhtml2text** | **10.9 ms** | **1.6 ms** |
+| **pyhtml2text** | **7.0 ms** | **1.3 ms** |
 
 - The GIL is released while converting, so threads scale across cores. On
   free-threaded Python (3.14t) the module runs without re-enabling the GIL.
@@ -106,15 +105,19 @@ To plain text:
   profile-guided optimisation, which makes them about 25% faster. Other
   platforms get the same code without it.
 - Deeply nested HTML is parsed in linear time, so hostile input can't stall a
-  worker: 40,000 nested lists take 0.14 s, against 6 s with stock html5ever.
+  worker: 40,000 nested lists take 0.14 s, against 6 s with stock html5ever,
+  and 100,000 levels of nesting followed by unmatched end tags take under
+  0.1 s.
 
 ## Credits
 
-The plain-text rendering is done by rust-html2text by Chris Emerson (MIT).
-This package uses [a fork](https://github.com/jaredlynskey/rust-html2text/tree/pyhtml2text-perf)
-that adds `base_url` and some performance changes, and a patched copy of
-[html5ever](https://github.com/servo/html5ever) (MIT/Apache-2.0, see
-`vendor/`). Markdown output is checked with
-[pulldown-cmark](https://github.com/raphlinus/pulldown-cmark) (MIT). It
-isn't affiliated with or endorsed by any of these projects, so please report
-issues here rather than upstream.
+HTML is parsed by a copy of [html5ever](https://github.com/servo/html5ever)
+(MIT/Apache-2.0) with
+[servo/html5ever#800](https://github.com/servo/html5ever/pull/800) by Josef
+Guenther applied, which makes parsing deeply nested HTML linear (see
+`vendor/`). Text is measured with
+[unicode-width](https://github.com/unicode-rs/unicode-width) (MIT/Apache-2.0)
+and Markdown output is checked with
+[pulldown-cmark](https://github.com/raphlinus/pulldown-cmark) (MIT). This
+package isn't affiliated with or endorsed by any of these projects, so please
+report issues here rather than upstream.

{pyhtml2text-0.3.0 → pyhtml2text-0.4.0}/pyproject.toml

@@ -1,11 +1,11 @@
 [build-system]
-requires = ["maturin>=1.7,<2"]
+requires = ["maturin>=1.9.4,<2"]
 build-backend = "maturin"
 
 [project]
 name = "pyhtml2text"
-version = "0.3.0"
-description = "Fast HTML to plain text, with relative link resolution (Python bindings to rust-html2text)"
+version = "0.4.0"
+description = "Fast HTML to plain text and Markdown, with relative link resolution"
 readme = "README.md"
 license = "MIT"
 license-files = ["LICENSE"]
@@ -20,7 +20,6 @@ classifiers = [
 
 [project.urls]
 Source = "https://github.com/jaredlynskey/pyhtml2text"
-Upstream = "https://github.com/jugglerchris/rust-html2text"
 
 [tool.maturin]
 python-source = "python"