Merge branch 'master' into include-bin-and-tox

.readthedocs.yaml

@@ -0,0 +1,11 @@
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+version: 2
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+sphinx:
+  configuration: docs/conf.py
+python:
+  install:
+   - requirements: docs/requirements.txt

bin/wcwidth-browser.py

@@ -54,8 +54,8 @@ def readline(term, width):
         inp = term.inkey()
         if inp.code == term.KEY_ENTER:
             break
-        if inp.code == term.KEY_ESCAPE or inp == chr(3):
-            text = None
+        if inp.code == term.KEY_ESCAPE:
+            text = ''
             break
         if not inp.is_sequence and len(text) < width:
             text += inp
@@ -478,7 +478,7 @@ def _process_keystroke_commands(self, inp):
                     # library performs best-match (with warnings)
                     self.unicode_version = _wcmatch_version(inp)
                     self.initialize_page_data()
-                    self.on_resize(None, None)
+                self.on_resize(None, None)
 
     def _process_keystroke_movement(self, inp, idx, offset):
         """Process keystrokes that adjust index and offset."""

docs/intro.rst

@@ -107,7 +107,7 @@ Install wcwidth in editable mode::
 
 Execute unit tests using tox_::
 
-   tox -e py36,py37,py38,py39,py310,py311,py312
+   tox -e py27,py35,py36,py37,py38,py39,py310,py311,py312
 
 Updating Unicode Version
 ------------------------
@@ -217,7 +217,7 @@ Other Languages
 History
 =======
 
-Unreleased *2023-?-?*
+0.2.7 *2023-09-28*
   * **Updated** tables to include Unicode Specification 15.1.0.
 
 0.2.6 *2023-01-14*

setup.py

@@ -44,7 +44,7 @@ def main():
     setuptools.setup(
         name='wcwidth',
         # NOTE: manually manage __version__ in wcwidth/__init__.py !
-        version='0.2.6',
+        version='0.2.7',
         description=(
             "Measures the displayed width of unicode strings in a terminal"),
         long_description=codecs.open(

wcwidth/__init__.py

@@ -25,4 +25,4 @@
 # We also used pkg_resources to load unicode version tables from version.json,
 # generated by bin/update-tables.py, but some environments are unable to
 # import pkg_resources for one reason or another, yikes!
-__version__ = '0.2.6'
+__version__ = '0.2.7'

wcwidth/wcwidth.py

@@ -218,7 +218,7 @@ def wcwidth(wc, unicode_version='auto'):
     if _bisearch(ucs, ZERO_WIDTH[_unicode_version]):
         return 0
 
-    # "Wide AastAsian" (and emojis)
+    # "Wide EastAsian" (and emojis)
     return 1 + _bisearch(ucs, WIDE_EASTASIAN[_unicode_version])