From patchwork Sat May 19 12:52:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 10412825 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 185326032C for ; Sat, 19 May 2018 12:53:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03FFF27CEA for ; Sat, 19 May 2018 12:53:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ECFB928632; Sat, 19 May 2018 12:52:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A38DB27CEA for ; Sat, 19 May 2018 12:52:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752371AbeESMw7 (ORCPT ); Sat, 19 May 2018 08:52:59 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:37949 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752342AbeESMw4 (ORCPT ); Sat, 19 May 2018 08:52:56 -0400 Received: by mail-wm0-f44.google.com with SMTP id m129-v6so19482551wmb.3 for ; Sat, 19 May 2018 05:52:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8ENnfnMofnSvIQpEBHxMOjRKpR8nfKddLMINGL04ujs=; b=f01HUAUODaI/VT1jBiRjXmsryO+EmPoFwxFf0EMtoN/lXRb4Ml0EGElOc/rJ9ZsVZS NukvU3qPwDqrU1NAu+wTdgyu5FpObnWLPIEfK7ce/AETAcXzLlFXX/94gh2Kuz+PM+0v SExY9EqS+aIenQeopgyUbx05TL1SvNm1KUdYrEsFOEuXWjCQwNkmIMB/QmxAeuuIcDsq ckievBUXDQPy7DvV2gef5hVItI/Mz1MOnTgbdxIFYchxrPP1Le4nAUGRG+7LUvMEICu4 OyXEu86acWVm3YW1AAngZpCD3o1ijUzE6BiRQwNvkiVVF6iJ5cc6RJDm66I8YISRHQnp ICGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8ENnfnMofnSvIQpEBHxMOjRKpR8nfKddLMINGL04ujs=; b=C7nOZ+O9uarTooQ5VEiAEGEua4w93AU0haY/Cf2ebU1lxm2PaENfiQ/Z3LnRDMjFN5 HWDbvC4f0wX7oFZNuQF3DXQfLQQT85QWn1gd9gv+uYaLMsHmyWDOhpUTQ1/kDV85PZ2I cwednCgdw3gglzG63efkTjb6tNfy8zsjBIy4GComlonz8NfAqJb7ZZIQhTzucBPSf/Tw CBB8TJZ+lvTNXpE+16h0bXfDjU31PhHZpgQp/FgscbI2v+5YqNYN/TN0Kg+EXVj34+ot BqOkqcMcAeKaNWgcl/XIeAkXfZjd0Fol2MhVVU/OaVuqD7VIdn3BlW7ojEsfVyXdD+Ct 6dvg== X-Gm-Message-State: ALKqPwd3oA7E4oc40TZ8WpD7xGyCNNjgpp52deTggpLadzpnidmoWFHH 7bHV/mXaU8e5W6bFWP0icJSs+Ffo X-Google-Smtp-Source: AB8JxZpsgDbH2XA1NXNHl1DqKo9darTMrS7McdDk/swS02JsZnh/drTD+XUupit9SXurELhF+opJOA== X-Received: by 2002:aa7:d34e:: with SMTP id m14-v6mr4310793edr.108.1526734374685; Sat, 19 May 2018 05:52:54 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:4039:2700:f43f:362e:7632:e7da]) by smtp.gmail.com with ESMTPSA id y53-v6sm5008495edb.17.2018.05.19.05.52.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 May 2018 05:52:54 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Luc Van Oostenryck Subject: [PATCH v2 08/12] doc: allow .md with py3-sphinx Date: Sat, 19 May 2018 14:52:35 +0200 Message-Id: <20180519125239.89629-9-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180519125239.89629-1-luc.vanoostenryck@gmail.com> References: <20180519125239.89629-1-luc.vanoostenryck@gmail.com> Sender: linux-sparse-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sparse@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The current support for markdown source files is fine for py2-sphinx but not for py3. Fix it by checking python's version and add the reference to the mardown parser module accordingly. Signed-off-by: Luc Van Oostenryck --- Documentation/conf.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Documentation/conf.py b/Documentation/conf.py index 86f1dc47e..abd496db1 100644 --- a/Documentation/conf.py +++ b/Documentation/conf.py @@ -31,9 +31,16 @@ import datetime extensions = [ ] -source_parsers = { - '.md': 'recommonmark.parser.CommonMarkParser', -} +# support .md with python2 & python3 +if sys.version_info[0] > 2: + from recommonmark.parser import CommonMarkParser + source_parsers = { + '.md': CommonMarkParser, + } +else: + source_parsers = { + '.md': 'recommonmark.parser.CommonMarkParser', + } # Add any paths that contain templates here, relative to this directory. templates_path = ['templates']