Attachment 914953 Details for Bug 1116544 – There was a bug in textwrap_fill function of previous patch for i18n.py. Resending a patch.

[patch] There was a bug in textwrap_fill function of previous patch for i18n.py. Resending a patch.

i18n.py.patch (text/plain), 2.08 KB, created by Takayuki Ogawa on 2014-07-06 13:40:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Takayuki Ogawa

Created: 2014-07-06 13:40:40 UTC

Size: 2.08 KB

patch

obsolete

>*** /usr/lib/python2.7/site-packages/dnf/i18n.py.orig	2014-05-28 17:27:24.000000000 +0900
>--- /usr/lib/python2.7/site-packages/dnf/i18n.py	2014-07-06 22:25:05.798003112 +0900
>***************
>*** 20,25 ****
>--- 20,26 ----
>  from __future__ import print_function
>  from __future__ import unicode_literals
>  from dnf.pycomp import PY3, is_py3bytes, unicode, setlocale
>+ import unicodedata
>  import gettext
>  import locale
>  import os
>***************
>*** 128,137 ****
>                  pass
>          return unicode(str(obj), _guess_encoding())
>  
>  
>! def fill_exact_width(msg, width):
>!     return "%-*.*s" % (width, width, msg)
>  
>  
>  # setup translation
>  t = gettext.translation('dnf', fallback=True)
>--- 129,177 ----
>                  pass
>          return unicode(str(obj), _guess_encoding())
>  
>+ def _exact_width_char(uchar):
>+     if unicodedata.east_asian_width(uchar) in ('W', 'F', 'A'):
>+         return 2
>+     else:
>+         return 1
>  
>! def exact_width(msg):
>!     return sum(_exact_width_char(c) for c in msg)
>  
>+ def fill_exact_width(msg, width, discard_over_width=True, padding_left=False):
>+     s = ""
>+     s_width = 0
>+     for c in msg:
>+         c_width = _exact_width_char(c)
>+         if discard_over_width and s_width + c_width > width:
>+             break
>+         s += c
>+         s_width += c_width
>+ 
>+     while s_width < width:
>+         if padding_left:
>+             s = " " + s
>+         else:
>+             s += " " # default: padding right
>+         s_width += 1
>+     return s
>+ 
>+ def textwrap_fill(val, width, initial_indent, subsequent_indent):
>+     lines = []
>+     line = initial_indent
>+     line_width = exact_width(initial_indent)
>+     for c in val:
>+         if c == "\n":
>+             c = " "
>+         line += c
>+         c_width = _exact_width_char(c)
>+         line_width += c_width
>+         if line_width >= width:
>+             lines.append(line)
>+             line = subsequent_indent
>+             line_width = exact_width(subsequent_indent)
>+     lines.append(line)
>+     return "\n".join(lines)
>  
>  # setup translation
>  t = gettext.translation('dnf', fallback=True)

Actions: View | Diff

Attachments on bug 1116544: 914946 | 914947 | 914948 | 914953