--- a/mercurial/encoding.py Sun Sep 03 15:47:17 2017 +0900
+++ b/mercurial/encoding.py Sun Sep 03 14:56:31 2017 +0900
@@ -5,7 +5,7 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
-from __future__ import absolute_import
+from __future__ import absolute_import, print_function
import io
import locale
@@ -248,60 +248,62 @@
'ellipsis' is always placed at trimmed side.
>>> from .node import bin
+ >>> def bprint(s):
+ ... print(pycompat.sysstr(s))
>>> ellipsis = b'+++'
>>> from . import encoding
>>> encoding.encoding = b'utf-8'
>>> t = b'1234567890'
- >>> print trim(t, 12, ellipsis=ellipsis)
+ >>> bprint(trim(t, 12, ellipsis=ellipsis))
1234567890
- >>> print trim(t, 10, ellipsis=ellipsis)
+ >>> bprint(trim(t, 10, ellipsis=ellipsis))
1234567890
- >>> print trim(t, 8, ellipsis=ellipsis)
+ >>> bprint(trim(t, 8, ellipsis=ellipsis))
12345+++
- >>> print trim(t, 8, ellipsis=ellipsis, leftside=True)
+ >>> bprint(trim(t, 8, ellipsis=ellipsis, leftside=True))
+++67890
- >>> print trim(t, 8)
+ >>> bprint(trim(t, 8))
12345678
- >>> print trim(t, 8, leftside=True)
+ >>> bprint(trim(t, 8, leftside=True))
34567890
- >>> print trim(t, 3, ellipsis=ellipsis)
+ >>> bprint(trim(t, 3, ellipsis=ellipsis))
+++
- >>> print trim(t, 1, ellipsis=ellipsis)
+ >>> bprint(trim(t, 1, ellipsis=ellipsis))
+
>>> u = u'\u3042\u3044\u3046\u3048\u304a' # 2 x 5 = 10 columns
>>> t = u.encode(pycompat.sysstr(encoding.encoding))
- >>> print trim(t, 12, ellipsis=ellipsis)
+ >>> bprint(trim(t, 12, ellipsis=ellipsis))
\xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a
- >>> print trim(t, 10, ellipsis=ellipsis)
+ >>> bprint(trim(t, 10, ellipsis=ellipsis))
\xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a
- >>> print trim(t, 8, ellipsis=ellipsis)
+ >>> bprint(trim(t, 8, ellipsis=ellipsis))
\xe3\x81\x82\xe3\x81\x84+++
- >>> print trim(t, 8, ellipsis=ellipsis, leftside=True)
+ >>> bprint(trim(t, 8, ellipsis=ellipsis, leftside=True))
+++\xe3\x81\x88\xe3\x81\x8a
- >>> print trim(t, 5)
+ >>> bprint(trim(t, 5))
\xe3\x81\x82\xe3\x81\x84
- >>> print trim(t, 5, leftside=True)
+ >>> bprint(trim(t, 5, leftside=True))
\xe3\x81\x88\xe3\x81\x8a
- >>> print trim(t, 4, ellipsis=ellipsis)
+ >>> bprint(trim(t, 4, ellipsis=ellipsis))
+++
- >>> print trim(t, 4, ellipsis=ellipsis, leftside=True)
+ >>> bprint(trim(t, 4, ellipsis=ellipsis, leftside=True))
+++
>>> t = bin(b'112233445566778899aa') # invalid byte sequence
- >>> print trim(t, 12, ellipsis=ellipsis)
+ >>> bprint(trim(t, 12, ellipsis=ellipsis))
\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa
- >>> print trim(t, 10, ellipsis=ellipsis)
+ >>> bprint(trim(t, 10, ellipsis=ellipsis))
\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa
- >>> print trim(t, 8, ellipsis=ellipsis)
+ >>> bprint(trim(t, 8, ellipsis=ellipsis))
\x11\x22\x33\x44\x55+++
- >>> print trim(t, 8, ellipsis=ellipsis, leftside=True)
+ >>> bprint(trim(t, 8, ellipsis=ellipsis, leftside=True))
+++\x66\x77\x88\x99\xaa
- >>> print trim(t, 8)
+ >>> bprint(trim(t, 8))
\x11\x22\x33\x44\x55\x66\x77\x88
- >>> print trim(t, 8, leftside=True)
+ >>> bprint(trim(t, 8, leftside=True))
\x33\x44\x55\x66\x77\x88\x99\xaa
- >>> print trim(t, 3, ellipsis=ellipsis)
+ >>> bprint(trim(t, 3, ellipsis=ellipsis))
+++
- >>> print trim(t, 1, ellipsis=ellipsis)
+ >>> bprint(trim(t, 1, ellipsis=ellipsis))
+
"""
try: