wcwidth 0.9.2__tar.gz → 0.9.3__tar.gz

{wcwidth-0.9.2 → wcwidth-0.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wcwidth
-Version: 0.9.2
+Version: 0.9.3
 Summary: Measures the displayed width of unicode strings in a terminal
 Author-email: Jeff Quast <contact@jeffquast.com>
 Project-URL: Homepage, https://github.com/jquast/wcwidth

{wcwidth-0.9.2 → wcwidth-0.9.3}/docs/history.rst

@@ -2,6 +2,12 @@
 History
 =======
 
+0.9.3 *unreleased*
+  * **Bugfix** libwcwidth no longer has undefined behavior on NULL or empty input in the UTF-8 and
+    alignment functions, `PR #293`_, `PR #294`_.
+  * **Changed** `HyperlinkParams.parse()`_ now rejects trailing text, `PR #296`_.
+  * **Bugfix** `wrap()`_ should keep a link's own OSC 8 params across a line break, `PR #299`_.
+
 0.9.2 *2026-10-04*
   * **Bugfix** `wrap()`_ should omit an empty line as output, like `textwrap.wrap()`_ `PR #291`_.
   * **Bugfix** `clip()`_ when using non-default argument, ``tabsize=0``, `PR #288`_.
@@ -11,7 +17,7 @@ History
 
 0.9.1 *2026-09-23*
   * **Bugfix** `width()`_ in Python and libwcwidth mis-measured CSI sequences over 64 bytes, a 0.9.0
-    release regression! `PR #271`_.
+    release regression! `PR #272`_.
   * **Performance** improvement of ~15% for many Python API functions when using default arguments
     like ``ambiguous_width`` and ``term_program``. `PR #273`_
 
@@ -312,12 +318,16 @@ https://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c::
 .. _`PR #253`: https://github.com/jquast/wcwidth/pull/253
 .. _`PR #259`: https://github.com/jquast/wcwidth/pull/259
 .. _`PR #262`: https://github.com/jquast/wcwidth/pull/262
-.. _`PR #271`: https://github.com/jquast/wcwidth/pull/271
+.. _`PR #272`: https://github.com/jquast/wcwidth/pull/272
 .. _`PR #273`: https://github.com/jquast/wcwidth/pull/273
 .. _`PR #281`: https://github.com/jquast/wcwidth/pull/281
 .. _`PR #284`: https://github.com/jquast/wcwidth/pull/284
 .. _`PR #288`: https://github.com/jquast/wcwidth/pull/288
 .. _`PR #291`: https://github.com/jquast/wcwidth/pull/291
+.. _`PR #293`: https://github.com/jquast/wcwidth/pull/293
+.. _`PR #294`: https://github.com/jquast/wcwidth/pull/294
+.. _`PR #296`: https://github.com/jquast/wcwidth/pull/296
+.. _`PR #299`: https://github.com/jquast/wcwidth/pull/299
 .. _`Issue #101`: https://github.com/jquast/wcwidth/issues/101
 .. _`Issue #155`: https://github.com/jquast/wcwidth/issues/155
 .. _`Issue #211`: https://github.com/jquast/wcwidth/issues/211
@@ -343,6 +353,7 @@ https://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c::
 .. _`iter_sequences()`: https://wcwidth.readthedocs.io/en/latest/api.html#wcwidth.iter_sequences
 .. _`list_versions()`: https://wcwidth.readthedocs.io/en/latest/api.html#wcwidth.list_versions
 .. _`list_term_programs()`: https://wcwidth.readthedocs.io/en/latest/api.html#wcwidth.list_term_programs
+.. _`HyperlinkParams.parse()`: https://wcwidth.readthedocs.io/en/latest/api.html#wcwidth.HyperlinkParams
 .. _`parity padding`: https://jazcap53.github.io/pythons-eccentric-strcenter.html
 .. _`kitty text sizing protocol`: https://sw.kovidgoyal.net/kitty/text-sizing-protocol/
 .. _Corrections: https://wcwidth.readthedocs.io/en/latest/intro.html#corrections

{wcwidth-0.9.2 → wcwidth-0.9.3}/docs/libwcwidth.rst

@@ -147,6 +147,14 @@ Every string function reads exactly the length you pass:
 Pass ``strlen(text)`` when the text is a C string.  A NUL counts as an ordinary zero-width character
 in any position.  Transform functions copy it through and report the full length in ``*out_len``.
 
+Pointer contract
+~~~~~~~~~~~~~~~~
+
+Input pointers and the ``count`` / ``out_len`` out-length pointers must not be NULL.
+
+``stack`` accepts NULL to select the heap path.  ``wcwidth_utf8_decode_single()`` accepts
+NULL as ``cp_out``, reporting the length of the next character.
+
 Alternate encodings
 ~~~~~~~~~~~~~~~~~~~
 

{wcwidth-0.9.2 → wcwidth-0.9.3}/libwcwidth/Makefile

@@ -13,8 +13,8 @@ CFLAGS  ?= -std=c11 -Wall -Wextra -O2 -g
 INCLUDE  = -Iinclude
 BUILD    = build
 
-ASAN_CFLAGS  = -std=c11 -Wall -Wextra -O1 -g -fsanitize=address,undefined -fno-omit-frame-pointer
-UBSAN_CFLAGS = -std=c11 -Wall -Wextra -O2 -g -fsanitize=undefined -fno-omit-frame-pointer
+ASAN_CFLAGS  = -std=c11 -Wall -Wextra -O1 -g -fsanitize=address,undefined -fno-sanitize-recover=all -fno-omit-frame-pointer
+UBSAN_CFLAGS = -std=c11 -Wall -Wextra -O2 -g -fsanitize=undefined -fno-sanitize-recover=all -fno-omit-frame-pointer
 
 LIB_SRCS  = $(wildcard src/*.c) $(wildcard src/tables/*.c)
 LIB_OBJS  = $(patsubst %.c,$(BUILD)/%.o,$(LIB_SRCS))

{wcwidth-0.9.2 → wcwidth-0.9.3}/libwcwidth/include/wcwidth/utf8.h

@@ -17,6 +17,9 @@ extern "C" {
  * U+FFFD and the return value is the number of bytes to skip (1 for a bad
  * leading byte, the remaining length for a truncated sequence, or 0 when
  * *len* is 0).
+ *
+ * *s* must not be NULL.  *cp_out* may be NULL to consume the sequence and
+ * query the length of the next character.
  */
 size_t wcwidth_utf8_decode_single(const char *s, size_t len, uint32_t *cp_out);
 
@@ -28,6 +31,11 @@ size_t wcwidth_utf8_decode_single(const char *s, size_t len, uint32_t *cp_out);
  * is undefined behavior.  Sets *count* and returns NULL on allocation
  * failure.
  *
+ * *utf8* and *count* must not be NULL; *count* is required because the
+ * returned array carries no terminator.  A *stack* of NULL forces the heap
+ * path.  When *n* is 0 and *stack* is NULL, the result is a freeable array
+ * with *count* set to 0.
+ *
  * The result type allows a plain free() release, matching wcwidth_encode_u32()
  * below.  Treat the contents as read-only.
  *
@@ -39,7 +47,8 @@ uint32_t *wcwidth_decode_u32(const char *utf8, size_t n, uint32_t *stack, size_t
 
 /*
  * Decode *utf8* into a malloc'd codepoint array (one free()).  Returns the
- * array and sets *count*, or NULL on allocation failure.
+ * array and sets *count*, or NULL on allocation failure.  An *n* of 0 returns
+ * a freeable array with *count* set to 0.
  *
  * Follows the length and NUL semantics of wcwidth_decode_u32().
  */
@@ -51,12 +60,15 @@ uint32_t *wcwidth_decode_u32_heap(const char *utf8, size_t n, size_t *count);
  * in *stack* (no allocation), otherwise a heap buffer is allocated.  The
  * caller must free() the result only when it is not *stack*; freeing *stack*
  * is undefined behavior.  Sets *out_len* and returns NULL on allocation
- * failure.
+ * failure.  An *n* of 0 returns a freeable buffer with *out_len* set to 0.
+ *
+ * *codepoints* and *out_len* must not be NULL; *out_len* is required because
+ * the returned bytes carry no terminator.  A *stack* of NULL forces the heap
+ * path.
  *
  * Encoding writes exactly *n* codepoints: a U+0000 becomes a NUL byte, so the
- * output can contain embedded NUL bytes.  The result is not NUL-terminated.
- * Invalid codepoints (lone surrogates and values above U+10FFFF) are encoded
- * as U+FFFD.
+ * output can contain embedded NUL bytes.  Invalid codepoints (lone surrogates
+ * and values above U+10FFFF) are encoded as U+FFFD.
  */
 char *wcwidth_encode_u32(const uint32_t *codepoints, size_t n, char *stack, size_t stack_cap,
                          size_t *out_len);

{wcwidth-0.9.2 → wcwidth-0.9.3}/libwcwidth/include/wcwidth/wcwidth_config.h

@@ -18,8 +18,8 @@ extern "C" {
 
 #define WCWIDTH_VERSION_MAJOR 0
 #define WCWIDTH_VERSION_MINOR 9
-#define WCWIDTH_VERSION_PATCH 2
-#define WCWIDTH_VERSION "0.9.2"
+#define WCWIDTH_VERSION_PATCH 3
+#define WCWIDTH_VERSION "0.9.3"
 
 /* Unicode version the library tables were generated from. */
 #define WCWIDTH_UNICODE_VERSION "18.0.0"

{wcwidth-0.9.2 → wcwidth-0.9.3}/libwcwidth/src/align.c

@@ -87,6 +87,10 @@ fill_repeat(char *dst, const char *fillchar, size_t fillchar_len, size_t count)
 {
     size_t i;
 
+    if (fillchar_len == 0) {
+        return dst;
+    }
+
     for (i = 0; i < count; i++) {
         memcpy(dst, fillchar, fillchar_len);
         dst += fillchar_len;
@@ -133,7 +137,9 @@ ljust_impl(const char *text, size_t text_len, size_t dest_width, const char *fil
         return NULL;
     }
 
-    memcpy(result, text, text_len);
+    if (text_len > 0) {
+        memcpy(result, text, text_len);
+    }
     fill_repeat(result + text_len, fillchar, fillchar_len, padding);
     result[total] = '\0';
 
@@ -184,7 +190,9 @@ rjust_impl(const char *text, size_t text_len, size_t dest_width, const char *fil
 
     fill_repeat(result, fillchar, fillchar_len, padding);
     /* add_fill_bytes() above already proved this product cannot wrap. */
-    memcpy(result + padding * fillchar_len, text, text_len);
+    if (text_len > 0) {
+        memcpy(result + padding * fillchar_len, text, text_len);
+    }
     result[total] = '\0';
 
     if (out_len != NULL) {
@@ -246,7 +254,9 @@ center_impl(const char *text, size_t text_len, size_t dest_width, const char *fi
 
     {
         char *dst = fill_repeat(result, fillchar, fillchar_len, left_pad);
-        memcpy(dst, text, text_len);
+        if (text_len > 0) {
+            memcpy(dst, text, text_len);
+        }
         fill_repeat(dst + text_len, fillchar, fillchar_len, right_pad);
     }
     result[total] = '\0';

{wcwidth-0.9.2 → wcwidth-0.9.3}/libwcwidth/src/utf8.c

@@ -16,6 +16,10 @@ wcwidth_utf8_decode_single(const char *s, size_t len, uint32_t *cp_out)
     size_t expected;
     size_t i;
 
+    if (cp_out == NULL) {
+        cp_out = &cp;
+    }
+
     if (len == 0) {
         *cp_out = 0xFFFD;
         return 0;
@@ -97,7 +101,7 @@ wcwidth_decode_u32(const char *utf8, size_t n, uint32_t *stack, size_t stack_cap
 {
     uint32_t *heap = NULL;
     uint32_t *out = stack;
-    size_t cap = stack_cap;
+    size_t cap = (stack != NULL) ? stack_cap : 0;
     size_t used = 0;
     size_t pos = 0;
 
@@ -142,17 +146,18 @@ wcwidth_decode_u32(const char *utf8, size_t n, uint32_t *stack, size_t stack_cap
         pos += consumed;
     }
 
+    if (n == 0 && stack == NULL) {
+        *count = 0;
+        return (uint32_t *) calloc(1, sizeof(uint32_t)); /* freeable empty result */
+    }
+
     *count = used;
-    return (heap != NULL) ? heap : stack;
+    return out;
 }
 
 uint32_t *
 wcwidth_decode_u32_heap(const char *utf8, size_t n, size_t *count)
 {
-    if (n == 0) {
-        *count = 0;
-        return (uint32_t *) malloc(sizeof(uint32_t)); /* freeable empty result */
-    }
     return wcwidth_decode_u32(utf8, n, NULL, 0, count);
 }
 
@@ -195,7 +200,7 @@ wcwidth_encode_u32(const uint32_t *codepoints, size_t n, char *stack, size_t sta
 {
     char *heap = NULL;
     char *out = stack;
-    size_t cap = stack_cap;
+    size_t cap = (stack != NULL) ? stack_cap : 0;
     size_t used = 0;
     size_t i;
 
@@ -216,7 +221,10 @@ wcwidth_encode_u32(const uint32_t *codepoints, size_t n, char *stack, size_t sta
                     *out_len = 0;
                     return NULL;
                 }
-                memcpy(nd, stack, used);
+                if (used > 0) {
+                    /* stack may be NULL when stack_cap is 0 */
+                    memcpy(nd, stack, used);
+                }
             }
             else {
                 nd = (char *) realloc(heap, new_cap);
@@ -234,6 +242,11 @@ wcwidth_encode_u32(const uint32_t *codepoints, size_t n, char *stack, size_t sta
         used += enc_len;
     }
 
+    if (n == 0 && stack == NULL) {
+        *out_len = 0;
+        return (char *) calloc(1, 1); /* freeable empty result */
+    }
+
     *out_len = used;
-    return (heap != NULL) ? heap : stack;
+    return out;
 }

{wcwidth-0.9.2 → wcwidth-0.9.3}/libwcwidth/tests/test_align.c

@@ -262,6 +262,41 @@ TEST(null_opts_defaults)
     free(u);
 }
 
+TEST(align_null_and_empty_input)
+{
+    wcwidth_align_opts_t opts = WCWIDTH_ALIGN_OPTS_DEFAULT;
+    size_t len = 1;
+    int error = WCWIDTH_ERROR_NONE;
+    char *s;
+
+    s = wcwidth_ljust_u8(NULL, 0, WCWIDTH_PARSE, &opts, &len, &error);
+    ASSERT_NOT_NULL(s);
+    ASSERT_EQ(0, len);
+    ASSERT_STREQ("", s);
+    free(s);
+
+    s = wcwidth_rjust_u8(NULL, 0, WCWIDTH_PARSE, &opts, &len, &error);
+    ASSERT_NOT_NULL(s);
+    ASSERT_EQ(0, len);
+    ASSERT_STREQ("", s);
+    free(s);
+
+    s = wcwidth_center_u8(NULL, 0, WCWIDTH_PARSE, &opts, &len, &error);
+    ASSERT_NOT_NULL(s);
+    ASSERT_EQ(0, len);
+    ASSERT_STREQ("", s);
+    free(s);
+
+    opts.dest_width = 5;
+    opts.fillchar = NULL;
+    opts.fillchar_len = 0;
+    s = wcwidth_ljust_u8("x", 1, WCWIDTH_PARSE, &opts, &len, &error);
+    ASSERT_NOT_NULL(s);
+    ASSERT_EQ(1, len);
+    ASSERT_STREQ("x", s);
+    free(s);
+}
+
 int
 main(void)
 {
@@ -276,5 +311,6 @@ main(void)
     RUN_TEST(center_huge_dest_width);
     RUN_TEST(align_control_codes_strict);
     RUN_TEST(null_opts_defaults);
+    RUN_TEST(align_null_and_empty_input);
     return test_summary();
 }

{wcwidth-0.9.2 → wcwidth-0.9.3}/libwcwidth/tests/test_utf8.c

@@ -74,6 +74,89 @@ TEST(decode_u32_heap_empty)
 
     ASSERT_NOT_NULL(out);
     ASSERT_EQ((int64_t) 0, (int64_t) count);
+    ASSERT_EQ((int64_t) 0, (int64_t) out[0]);
+    free(out);
+}
+
+TEST(decode_single_null_out)
+{
+    ASSERT_EQ((int64_t) 3, (int64_t) wcwidth_utf8_decode_single("\xe4\xb8\xad", 3, NULL));
+    ASSERT_EQ((int64_t) 1, (int64_t) wcwidth_utf8_decode_single("abc", 3, NULL));
+}
+
+TEST(decode_u32_null_stack)
+{
+    uint32_t *out;
+    size_t count = 0;
+
+    out = wcwidth_decode_u32("a", 1, NULL, 8, &count);
+    ASSERT_NOT_NULL(out);
+    ASSERT_EQ((int64_t) 1, (int64_t) count);
+    ASSERT_EQ((int64_t) 'a', (int64_t) out[0]);
+    free(out);
+}
+
+TEST(encode_u32_empty_heap)
+{
+    const uint32_t cps[] = {0};
+    char *out;
+    size_t len = 1;
+
+    out = wcwidth_encode_u32(cps, 0, NULL, 0, &len);
+    ASSERT_NOT_NULL(out);
+    ASSERT_EQ((int64_t) 0, (int64_t) len);
+    ASSERT_EQ((int64_t) 0, (int64_t) out[0]);
+    free(out);
+}
+
+TEST(encode_u32_null_stack)
+{
+    const uint32_t cps[] = {'a', 'b'};
+    char *out;
+    size_t len = 0;
+
+    out = wcwidth_encode_u32(cps, 2, NULL, 8, &len);
+    ASSERT_NOT_NULL(out);
+    ASSERT_EQ((int64_t) 2, (int64_t) len);
+    ASSERT_EQ(0, memcmp(out, "ab", 2));
+    free(out);
+}
+
+TEST(decode_u32_empty_stack)
+{
+    uint32_t stack[4];
+    uint32_t *out;
+    size_t count = 1;
+
+    out = wcwidth_decode_u32("", 0, stack, 4, &count);
+    ASSERT_TRUE(out == stack);
+    ASSERT_EQ((int64_t) 0, (int64_t) count);
+}
+
+TEST(encode_u32_empty_stack)
+{
+    const uint32_t cps[] = {0};
+    char stack[8];
+    char *out;
+    size_t len = 1;
+
+    out = wcwidth_encode_u32(cps, 0, stack, 8, &len);
+    ASSERT_TRUE(out == stack);
+    ASSERT_EQ((int64_t) 0, (int64_t) len);
+}
+
+TEST(decode_u32_stack_overflow)
+{
+    uint32_t stack[2];
+    uint32_t *out;
+    size_t count = 0;
+
+    out = wcwidth_decode_u32("abcdef", 6, stack, 2, &count);
+    ASSERT_NOT_NULL(out);
+    ASSERT_TRUE(out != stack);
+    ASSERT_EQ((int64_t) 6, (int64_t) count);
+    ASSERT_EQ((int64_t) 'a', (int64_t) out[0]);
+    ASSERT_EQ((int64_t) 'f', (int64_t) out[5]);
     free(out);
 }
 
@@ -83,5 +166,12 @@ main(void)
     RUN_TEST(encode_roundtrip);
     RUN_TEST(decode_malformed);
     RUN_TEST(decode_u32_heap_empty);
+    RUN_TEST(decode_single_null_out);
+    RUN_TEST(decode_u32_null_stack);
+    RUN_TEST(encode_u32_empty_heap);
+    RUN_TEST(encode_u32_null_stack);
+    RUN_TEST(decode_u32_empty_stack);
+    RUN_TEST(encode_u32_empty_stack);
+    RUN_TEST(decode_u32_stack_overflow);
     return test_summary();
 }

{wcwidth-0.9.2 → wcwidth-0.9.3}/pyproject.toml

@@ -7,7 +7,7 @@ requires = [ "setuptools>=61" ]
 
 [project]
 name = "wcwidth"
-version = "0.9.2"  # stamped into __init__.py and wcwidth_config.h by bin/update-tables.py
+version = "0.9.3"  # stamped into __init__.py and wcwidth_config.h by bin/update-tables.py
 description = "Measures the displayed width of unicode strings in a terminal"
 readme = "README.rst"
 keywords = [

{wcwidth-0.9.2 → wcwidth-0.9.3}/requirements-wheels.txt

@@ -2,23 +2,21 @@
 # This file is autogenerated by pip-compile with Python 3.14
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-emit-index-url --no-index --output-file=requirements-wheels.txt --strip-extras requirements-wheels.in
+#    pip-compile --allow-unsafe --no-emit-index-url --output-file=requirements-wheels.txt --strip-extras requirements-wheels.in
 #
---trusted-host localhost
-
 bashlex==0.18
     # via cibuildwheel
-bracex==3.0.1
+bracex==3.1
     # via cibuildwheel
 build==1.6.1
     # via cibuildwheel
-certifi==2026.7.22
+certifi==2026.10.19
     # via cibuildwheel
-cibuildwheel==4.2.1
+cibuildwheel==4.3.1
     # via -r requirements-wheels.in
 dependency-groups==1.3.2
     # via cibuildwheel
-filelock==4.0.9
+filelock==4.2.4
     # via cibuildwheel
 humanize==4.16.0
     # via cibuildwheel
@@ -27,7 +25,7 @@ packaging==26.3
     #   build
     #   cibuildwheel
     #   dependency-groups
-platformdirs==4.12.2
+platformdirs==4.13.5
     # via cibuildwheel
 pyproject-hooks==1.3.3
     # via build

{wcwidth-0.9.2 → wcwidth-0.9.3}/tests/test_hyperlink.py

@@ -26,6 +26,12 @@ def test_hyperlinkparams_parse_valid(seq, url, params, term):
     'not an escape',
     '\x1b[31m',
     '',
+    '\x1b]8;;https://example.com\x07text',
+    '\x1b]8;;https://example.com\x07\n',
+    '\x1b]8;;https://example.com\x07\x1b[31m',
+    '\x1b]8;;https://example.com\x1b\\text',
+    '\x1b]8;;https://example.com\x1b\\\n',
+    '\x1b]8;;https://example.com\x1b\\\x1b[31m',
 ])
 def test_hyperlinkparams_parse_invalid(seq):
     """Parse an invalid/non-OSC-8 sequence returns None."""

{wcwidth-0.9.2 → wcwidth-0.9.3}/tests/test_textwrap.py

@@ -486,6 +486,17 @@ OSC_END_BEL = '\x1b]8;;\x07'
             '\x1b]8;id=00000002;http://example.com\x07gh\x1b]8;;\x07',
         ],
     ),
+    (   # a link opened after a preceding link
+        '\x1b]8;id=first;https://a\x07aa bb\x1b]8;;\x07 '
+        '\x1b]8;id=second;https://b\x07cc dd ee\x1b]8;;\x07',
+        5,
+        [
+            '\x1b]8;id=first;https://a\x07aa bb\x1b]8;;\x07',
+            ('\x1b]8;id=first;https://a\x07\x1b]8;;\x07' +
+             '\x1b]8;id=second;https://b\x07cc dd\x1b]8;;\x07'),
+            '\x1b]8;id=second;https://b\x07ee\x1b]8;;\x07',
+        ],
+    ),
     (   # long word inside hyperlink forces character-level breaking
         f'{OSC_START_ST}abcdefgh{OSC_END_ST}',
         3,

{wcwidth-0.9.2 → wcwidth-0.9.3}/wcwidth/__init__.py

@@ -98,4 +98,4 @@ __all__ = ('wcwidth', 'wcswidth', 'wcstwidth', 'width', 'iter_sequences', 'iter_
            'Hyperlink', 'HyperlinkParams', 'TextSizing', 'TextSizingParams')
 
 # Version is stamped by code generation (bin/update-tables.py) from pyproject.toml.
-__version__ = '0.9.2'
+__version__ = '0.9.3'

{wcwidth-0.9.2 → wcwidth-0.9.3}/wcwidth/hyperlink.py

@@ -44,7 +44,7 @@ class HyperlinkParams(typing.NamedTuple):
             >>> HyperlinkParams.parse('\x1b]8;;http://example.com\x07')
             HyperlinkParams(url='http://example.com', params='', terminator='\x07')
         """
-        m = HYPERLINK_OPEN_RE.match(seq)
+        m = HYPERLINK_OPEN_RE.fullmatch(seq)
         if m is None:
             return None
         return cls(url=m.group(2), params=m.group(1), terminator=m.group(3))

{wcwidth-0.9.2 → wcwidth-0.9.3}/wcwidth/textwrap.py

@@ -224,8 +224,6 @@ class SequenceTextWrapper(textwrap.TextWrapper):
         is_first_line = True
 
         hyperlink_state: Optional[HyperlinkParams] = None
-        # Track the id we're using for the current hyperlink continuation
-        current_hyperlink_id: Optional[str] = None
 
         # Arrange in reverse order so items can be efficiently popped
         chunks = list(reversed(chunks))
@@ -312,17 +310,16 @@ class SequenceTextWrapper(textwrap.TextWrapper):
 
                     # If we end inside a hyperlink, append close sequence
                     if new_state is not None:
-                        # Ensure we have an id for continuation
-                        if current_hyperlink_id is None:
-                            if 'id=' in new_state.params:
-                                current_hyperlink_id = new_state.params
-                            elif new_state.params:
-                                # Prepend id to existing params. Per OSC 8 spec, params can have
-                                # multiple key=value pairs separated by ':'.
-                                current_hyperlink_id = (
-                                    f'id={self._next_hyperlink_id()}:{new_state.params}')
-                            else:
-                                current_hyperlink_id = f'id={self._next_hyperlink_id()}'
+                        # Use the active link's params; wrapper state can leak a prior link's id.
+                        if 'id=' in new_state.params:
+                            continuation_params = new_state.params
+                        elif new_state.params:
+                            # Prepend id to existing params. Per OSC 8 spec, params can have
+                            # multiple key=value pairs separated by ':'.
+                            continuation_params = (
+                                f'id={self._next_hyperlink_id()}:{new_state.params}')
+                        else:
+                            continuation_params = f'id={self._next_hyperlink_id()}'
                         line_content += HyperlinkParams(
                             terminator=new_state.terminator, url='').make_close()
 
@@ -337,17 +334,16 @@ class SequenceTextWrapper(textwrap.TextWrapper):
                             ).make_open()
                             new_open = HyperlinkParams(
                                 url=new_state.url,
-                                params=current_hyperlink_id,
+                                params=continuation_params,
                                 terminator=new_state.terminator,
                             ).make_open()
                             line_content = line_content.replace(old_open, new_open, 1)
 
-                        # Update state for next line, using computed id
+                        # Update state for next line, using computed params
                         hyperlink_state = HyperlinkParams(
-                            new_state.url, current_hyperlink_id, new_state.terminator)
+                            new_state.url, continuation_params, new_state.terminator)
                     else:
                         hyperlink_state = None
-                        current_hyperlink_id = None  # Reset id when hyperlink closes
 
                     # Strip trailing whitespace when drop_whitespace is enabled
                     # (matches CPython #140627 fix behavior)

{wcwidth-0.9.2 → wcwidth-0.9.3}/wcwidth.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wcwidth
-Version: 0.9.2
+Version: 0.9.3
 Summary: Measures the displayed width of unicode strings in a terminal
 Author-email: Jeff Quast <contact@jeffquast.com>
 Project-URL: Homepage, https://github.com/jquast/wcwidth