Skip to content

bpo-24665: double-width CJK chars support for textwrap #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fgallaire wants to merge 8 commits into from
Closed

bpo-24665: double-width CJK chars support for textwrap #89

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6ea78e3
bpo-24665: double-width CJK chars support for textwrap
fgallaire Feb 14, 2017
aa94f26
Fix TextWrapper positionnal arguments
fgallaire Feb 14, 2017
0264d9d
Fix one import per line
fgallaire Feb 14, 2017
d630821
Rename self.len() in self._width()
fgallaire Feb 14, 2017
bfdfb22
Rename CJK functions with _
fgallaire Feb 14, 2017
8337ce5
Improve cjk_slices() complexity from O(n^2) to O(n) (Thanks to INADA …
fgallaire Feb 14, 2017
cb9812b
Add Doc for new CJK option and functions
fgallaire Feb 15, 2017
54de7aa
Fix Python build problems
fgallaire Feb 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Lib/idlelib/idle_test/test_calltips.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def test_signature_wrap(self):
(width=70, initial_indent='', subsequent_indent='', expand_tabs=True,
replace_whitespace=True, fix_sentence_endings=False, break_long_words=True,
drop_whitespace=True, break_on_hyphens=True, tabsize=8, *, max_lines=None,
placeholder=' [...]')''')
placeholder=' [...]', cjk=False)''')

def test_docline_truncation(self):
def f(): pass
Expand Down
2 changes: 1 addition & 1 deletion Lib/textwrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
# Written by Greg Ward <[email protected]>

import re
import unicodedata

__all__ = ['TextWrapper', 'wrap', 'fill', 'dedent', 'indent', 'shorten',
'cjk_wide', 'cjk_len', 'cjk_slices']
Expand Down Expand Up @@ -428,6 +427,7 @@ def cjk_wide(char):
"""Return True if char is Fullwidth or Wide, False otherwise.
Fullwidth and Wide CJK chars are double-width.
"""
import unicodedata
Copy link
Member

@terryjreedy terryjreedy Apr 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think importing unicodedata, when wanted, for each char, is wrong. If not imported at the top, it could be imported as a global in TextWrapper.init when cjk is true. (I am assuming that the convenience functions all instantiate TextWrapper.

return unicodedata.east_asian_width(char) in ('F', 'W')

This comment was marked as resolved.

Sign in to view

Copy link
Author

@fgallaire fgallaire Mar 12, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, @duboviy or @Haypo, could you explain to me why/how a tuple could be slower than a frozenset.



Expand Down