wcwidth 0.2.13__py2.py3-none-any.whl → 0.2.14__py2.py3-none-any.whl

wcwidth/unicode_versions.py

@@ -1,7 +1,7 @@
 """
 Exports function list_versions() for unicode version level support.
 
-This code generated by wcwidth/bin/update-tables.py on 2023-09-14 15:45:33 UTC.
+This code generated by wcwidth/bin/update-tables.py on 2025-09-15 16:57:50 UTC.
 """
 
 
@@ -35,4 +35,6 @@ def list_versions():
         "14.0.0",
         "15.0.0",
         "15.1.0",
+        "16.0.0",
+        "17.0.0",
     )

wcwidth/wcwidth.py

@@ -60,12 +60,11 @@ http://www.unicode.org/unicode/reports/tr11/
 
 Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
 """
-from __future__ import division
 
 # std imports
 import os
-import sys
 import warnings
+from functools import lru_cache
 
 # local
 from .table_vs16 import VS16_NARROW_TO_WIDE
@@ -73,17 +72,6 @@ from .table_wide import WIDE_EASTASIAN
 from .table_zero import ZERO_WIDTH
 from .unicode_versions import list_versions
 
-try:
-    # std imports
-    from functools import lru_cache
-except ImportError:
-    # lru_cache was added in Python 3.2
-    # 3rd party
-    from backports.functools_lru_cache import lru_cache
-
-# global cache
-_PY3 = sys.version_info[0] >= 3
-
 
 def _bisearch(ucs, table):
     """
@@ -186,11 +174,11 @@ def wcswidth(pwcs, n=None, unicode_version='auto'):
     last_measured_char = None
     while idx < end:
         char = pwcs[idx]
-        if char == u'\u200D':
+        if char == '\u200D':
             # Zero Width Joiner, do not measure this or next character
             idx += 2
             continue
-        if char == u'\uFE0F' and last_measured_char:
+        if char == '\uFE0F' and last_measured_char:
             # on variation selector 16 (VS16) following another character,
             # conditionally add '1' to the measured width if that character is
             # known to be converted from narrow to wide by the VS16 character.
@@ -250,8 +238,7 @@ def _wcmatch_version(given_version):
         ``UNICODE_VERSION``. If the environment variable is not set, then the
         latest is used.
     :rtype: str
-    :returns: unicode string, or non-unicode ``str`` type for python 2
-        when given ``version`` is also type ``str``.
+    :returns: unicode string.
     """
     # Design note: the choice to return the same type that is given certainly
     # complicates it for python 2 str-type, but allows us to define an api that
@@ -261,30 +248,24 @@ def _wcmatch_version(given_version):
     # That, along with the string-to-numeric and comparisons of earliest,
     # latest, matching, or nearest, greatly complicates this function.
     # Performance is somewhat curbed by memoization.
-    _return_str = not _PY3 and isinstance(given_version, str)
-
-    if _return_str:
-        # avoid list-comprehension to work around a coverage issue:
-        # https://github.com/nedbat/coveragepy/issues/753
-        unicode_versions = list(map(lambda ucs: ucs.encode(), list_versions()))
-    else:
-        unicode_versions = list_versions()
+
+    unicode_versions = list_versions()
     latest_version = unicode_versions[-1]
 
-    if given_version in (u'auto', 'auto'):
+    if given_version == 'auto':
         given_version = os.environ.get(
             'UNICODE_VERSION',
-            'latest' if not _return_str else latest_version.encode())
+            'latest')
 
-    if given_version in (u'latest', 'latest'):
+    if given_version == 'latest':
         # default match, when given as 'latest', use the most latest unicode
         # version specification level supported.
-        return latest_version if not _return_str else latest_version.encode()
+        return latest_version
 
     if given_version in unicode_versions:
         # exact match, downstream has specified an explicit matching version
         # matching any value of list_versions().
-        return given_version if not _return_str else given_version.encode()
+        return given_version
 
     # The user's version is not supported by ours. We return the newest unicode
     # version level that we support below their given value.
@@ -298,7 +279,7 @@ def _wcmatch_version(given_version):
                       "supported unicode version {latest_version!r} has been "
                       "inferred.".format(given_version=given_version,
                                          latest_version=latest_version))
-        return latest_version if not _return_str else latest_version.encode()
+        return latest_version
 
     # given version is less than any available version, return earliest
     # version.
@@ -314,7 +295,7 @@ def _wcmatch_version(given_version):
                       "version level, {earliest_version!r}".format(
                           given_version=given_version,
                           earliest_version=earliest_version))
-        return earliest_version if not _return_str else earliest_version.encode()
+        return earliest_version
 
     # create list of versions which are less than our equal to given version,
     # and return the tail value, which is the highest level we may support,
@@ -328,7 +309,7 @@ def _wcmatch_version(given_version):
             cmp_next_version = _wcversion_value(unicode_versions[idx + 1])
         except IndexError:
             # at end of list, return latest version
-            return latest_version if not _return_str else latest_version.encode()
+            return latest_version
 
         # Maybe our given version has less parts, as in tuple(8, 0), than the
         # next compare version tuple(8, 0, 0). Test for an exact match by
@@ -338,7 +319,7 @@ def _wcmatch_version(given_version):
 
         # Or, if any next value is greater than our given support level
         # version, return the current value in index.  Even though it must
-        # be less than the given value, its our closest possible match. That
+        # be less than the given value, it's our closest possible match. That
         # is, 4.1 is returned for given 4.9.9, where 4.1 and 5.0 are available.
         if cmp_next_version > cmp_given:
             return unicode_version

{wcwidth-0.2.13.dist-info → wcwidth-0.2.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: wcwidth
-Version: 0.2.13
+Version: 0.2.14
 Summary: Measures the displayed width of unicode strings in a terminal
 Home-page: https://github.com/jquast/wcwidth
 Author: Jeff Quast
@@ -13,8 +13,6 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: POSIX
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
@@ -22,12 +20,24 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Localization
 Classifier: Topic :: Software Development :: Internationalization
 Classifier: Topic :: Terminals
+Requires-Python: >=3.6
 License-File: LICENSE
-Requires-Dist: backports.functools-lru-cache >=1.2.1 ; python_version < "3.2"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-python
+Dynamic: summary
 
 |pypi_downloads| |codecov| |license|
 
@@ -126,7 +136,7 @@ Briefly, return values of function ``wcwidth()`` are:
 Function ``wcswidth()`` simply returns the sum of all values for each character
 along a string, or ``-1`` when it occurs anywhere along a string.
 
-Full API Documentation at https://wcwidth.readthedocs.org
+Full API Documentation at https://wcwidth.readthedocs.io
 
 ==========
 Developing
@@ -136,9 +146,9 @@ Install wcwidth in editable mode::
 
    pip install -e .
 
-Execute unit tests using tox_::
+Execute unit tests using tox_ for all supported Python versions::
 
-   tox -e py27,py35,py36,py37,py38,py39,py310,py311,py312
+   tox -e py36,py37,py38,py39,py310,py311,py312,py313,py314
 
 Updating Unicode Version
 ------------------------
@@ -248,6 +258,13 @@ Other Languages
 History
 =======
 
+0.2.14 *2025-09-22*
+  * **Drop Support** for Python 2.7 and 3.5. `PR #117`_.
+  * **Update** tables to include Unicode Specifications 16.0.0 and 17.0.0.
+    `PR #146`_.
+  * **Bugfix** U+00AD SOFT HYPHEN should measure as 1, versions 0.2.9 through
+    0.2.13 measured as 0. `PR #149`_.
+
 0.2.13 *2024-01-06*
   * **Bugfix** zero-width support for Hangul Jamo (Korean)
 
@@ -290,7 +307,7 @@ History
     Environment variable ``UNICODE_VERSION``, such as ``13.0``, or ``6.3.0``.
     See the `jquast/ucs-detect`_ CLI utility for automatic detection.
   * **Enhancement**:
-    API Documentation is published to readthedocs.org.
+    API Documentation is published to readthedocs.io.
   * **Updated** tables for *all* Unicode Specifications with files
     published in a programmatically consumable format, versions 4.1.0
     through 13.0
@@ -368,6 +385,9 @@ https://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c::
 .. _`PR #97`: https://github.com/jquast/wcwidth/pull/97
 .. _`PR #98`: https://github.com/jquast/wcwidth/pull/98
 .. _`PR #100`: https://github.com/jquast/wcwidth/pull/100
+.. _`PR #117`: https://github.com/jquast/wcwidth/pull/117
+.. _`PR #146`: https://github.com/jquast/wcwidth/pull/146
+.. _`PR #149`: https://github.com/jquast/wcwidth/pull/149
 .. _`Issue #101`: https://github.com/jquast/wcwidth/issues/101
 .. _`jquast/blessed`: https://github.com/jquast/blessed
 .. _`selectel/pyte`: https://github.com/selectel/pyte

wcwidth-0.2.14.dist-info/RECORD

@@ -0,0 +1,13 @@
+wcwidth/__init__.py,sha256=5RiBcbmILHnDStKPOr1jA_31LMgbwTZmv7UoSf1c1-A,1076
+wcwidth/table_vs15.py,sha256=Xl7hsr04XJ4vvxe37LvaL0ex93rWUvzYIpX1vJiHyYQ,5170
+wcwidth/table_vs16.py,sha256=STRpUr9FNE3B2aOKtIy-a3wix4eMUSyOg65ZCIHY4qM,6857
+wcwidth/table_wide.py,sha256=DL-zI2JGLcJkEMPcaMvqBYLQDbhheOL3pGYpzvHTQPU,117873
+wcwidth/table_zero.py,sha256=YcdDVx4WuXVdlJGSOvOZ99Msn8KeRVLIDDz4Om9DXOI,409071
+wcwidth/unicode_versions.py,sha256=XprVckZk9FOFrmQaSxEnDqa8G-q8h36j7zRnFUj6V4I,887
+wcwidth/wcwidth.py,sha256=Sx85FzyPmJzXPSOSZvq3IDqS6cZrp_f6n1jHdS4Ox7s,13551
+wcwidth-0.2.14.dist-info/licenses/LICENSE,sha256=cLmKlaIUTrcK-AF_qMbZXOJH5AhnQ26LxknhN_4T0ho,1322
+wcwidth-0.2.14.dist-info/METADATA,sha256=zOIuk0LOo4aPc1wHTJfSNJASCiSzRkq_EMHRsLsWK1M,15629
+wcwidth-0.2.14.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+wcwidth-0.2.14.dist-info/top_level.txt,sha256=LLjS8SFiXXuLEcD2BNdFdGhpKWe5opHtvn7KNj9AIRI,8
+wcwidth-0.2.14.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+wcwidth-0.2.14.dist-info/RECORD,,

{wcwidth-0.2.13.dist-info → wcwidth-0.2.14.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

wcwidth-0.2.13.dist-info/RECORD

@@ -1,12 +0,0 @@
-wcwidth/__init__.py,sha256=ecZx3UVoktZuAvatG6NetByVFgENkKl9htmk0ZasTmA,1076
-wcwidth/table_vs16.py,sha256=hPbuoFxmxrGfuBaeoheMTAGmgB2a4EudhxYsYokLf6o,6857
-wcwidth/table_wide.py,sha256=vUHjEOuRw1WGyUcIw2L9GymZsYvC2I3dc858mlYyTYM,100896
-wcwidth/table_zero.py,sha256=4ZeihLZDH8obgrwA6ct-vu2lxc4t_DsfyiB9p9Ovxbo,359450
-wcwidth/unicode_versions.py,sha256=7nShgeRYrvZFkGpREdr-PkUeXnuM-WxeOmGYj6QNaaE,851
-wcwidth/wcwidth.py,sha256=TLzyH1ahdEDDPOIMcqVO4U0gyKwSyZdzAsSgEPuVFGY,14512
-wcwidth-0.2.13.dist-info/LICENSE,sha256=cLmKlaIUTrcK-AF_qMbZXOJH5AhnQ26LxknhN_4T0ho,1322
-wcwidth-0.2.13.dist-info/METADATA,sha256=wBs2ALubn0kTdhEFDXc1gZBU_zf4rlfNgv1YS02jzLQ,14992
-wcwidth-0.2.13.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
-wcwidth-0.2.13.dist-info/top_level.txt,sha256=LLjS8SFiXXuLEcD2BNdFdGhpKWe5opHtvn7KNj9AIRI,8
-wcwidth-0.2.13.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-wcwidth-0.2.13.dist-info/RECORD,,