Skip to content

Commit 5dbf62e

Browse files
authored
Merge branch 'master' into include-bin-and-tox
2 parents ba47868 + 00abcc3 commit 5dbf62e

File tree

6 files changed

+19
-8
lines changed

6 files changed

+19
-8
lines changed

Diff for: .readthedocs.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
2+
version: 2
3+
build:
4+
os: ubuntu-22.04
5+
tools:
6+
python: "3.11"
7+
sphinx:
8+
configuration: docs/conf.py
9+
python:
10+
install:
11+
- requirements: docs/requirements.txt

Diff for: bin/wcwidth-browser.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ def readline(term, width):
5454
inp = term.inkey()
5555
if inp.code == term.KEY_ENTER:
5656
break
57-
if inp.code == term.KEY_ESCAPE or inp == chr(3):
58-
text = None
57+
if inp.code == term.KEY_ESCAPE:
58+
text = ''
5959
break
6060
if not inp.is_sequence and len(text) < width:
6161
text += inp
@@ -478,7 +478,7 @@ def _process_keystroke_commands(self, inp):
478478
# library performs best-match (with warnings)
479479
self.unicode_version = _wcmatch_version(inp)
480480
self.initialize_page_data()
481-
self.on_resize(None, None)
481+
self.on_resize(None, None)
482482

483483
def _process_keystroke_movement(self, inp, idx, offset):
484484
"""Process keystrokes that adjust index and offset."""

Diff for: docs/intro.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Install wcwidth in editable mode::
107107

108108
Execute unit tests using tox_::
109109

110-
tox -e py36,py37,py38,py39,py310,py311,py312
110+
tox -e py27,py35,py36,py37,py38,py39,py310,py311,py312
111111

112112
Updating Unicode Version
113113
------------------------
@@ -217,7 +217,7 @@ Other Languages
217217
History
218218
=======
219219

220-
Unreleased *2023-?-?*
220+
0.2.7 *2023-09-28*
221221
* **Updated** tables to include Unicode Specification 15.1.0.
222222

223223
0.2.6 *2023-01-14*

Diff for: setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def main():
4444
setuptools.setup(
4545
name='wcwidth',
4646
# NOTE: manually manage __version__ in wcwidth/__init__.py !
47-
version='0.2.6',
47+
version='0.2.7',
4848
description=(
4949
"Measures the displayed width of unicode strings in a terminal"),
5050
long_description=codecs.open(

Diff for: wcwidth/__init__.py

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

Diff for: wcwidth/wcwidth.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ def wcwidth(wc, unicode_version='auto'):
218218
if _bisearch(ucs, ZERO_WIDTH[_unicode_version]):
219219
return 0
220220

221-
# "Wide AastAsian" (and emojis)
221+
# "Wide EastAsian" (and emojis)
222222
return 1 + _bisearch(ucs, WIDE_EASTASIAN[_unicode_version])
223223

224224

0 commit comments

Comments
 (0)