lkml.org 
[lkml]   [2020]   [Oct]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 13/39] docs: kernel_abi.py: fix UTF-8 support
    Date
    The parser breaks with UTF-8 characters with Sphinx 1.4.

    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    ---
    Documentation/sphinx/kernel_abi.py | 19 +++++++------------
    1 file changed, 7 insertions(+), 12 deletions(-)

    diff --git a/Documentation/sphinx/kernel_abi.py b/Documentation/sphinx/kernel_abi.py
    index f8e7a02066c2..fe69c213716d 100644
    --- a/Documentation/sphinx/kernel_abi.py
    +++ b/Documentation/sphinx/kernel_abi.py
    @@ -1,5 +1,7 @@
    # -*- coding: utf-8; mode: python -*-
    +# coding=utf-8
    # SPDX-License-Identifier: GPL-2.0
    +#
    u"""
    kernel-abi
    ~~~~~~~~~~
    @@ -30,6 +32,7 @@ u"""

    """

    +import codecs
    import sys
    import os
    from os import path
    @@ -45,14 +48,6 @@ from docutils.utils.error_reporting import ErrorString

    __version__ = '1.0'

    -# We can't assume that six is installed
    -PY3 = sys.version_info[0] == 3
    -PY2 = sys.version_info[0] == 2
    -if PY3:
    - # pylint: disable=C0103, W0622
    - unicode = str
    - basestring = str
    -
    def setup(app):

    app.add_directive("kernel-abi", KernelCmd)
    @@ -117,12 +112,12 @@ class KernelCmd(Directive):
    cmd
    , stdout = subprocess.PIPE
    , stderr = subprocess.PIPE
    - , universal_newlines = True
    , **kwargs
    )
    out, err = proc.communicate()
    - if err:
    - self.warn(err)
    +
    + out, err = codecs.decode(out, 'utf-8'), codecs.decode(err, 'utf-8')
    +
    if proc.returncode != 0:
    raise self.severe(
    u"command '%s' failed with return code %d"
    @@ -131,7 +126,7 @@ class KernelCmd(Directive):
    except OSError as exc:
    raise self.severe(u"problems with '%s' directive: %s."
    % (self.name, ErrorString(exc)))
    - return unicode(out)
    + return out

    def nestedParse(self, lines, fname):
    content = ViewList()
    --
    2.26.2
    \
     
     \ /
      Last update: 2020-10-30 08:44    [W:4.027 / U:0.404 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site