From 07996d56548a76257e25ae627805376f448a88e6 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Mon, 14 Apr 2014 21:00:15 +0300 Subject: [PATCH] Re: [PATCH 0/7] doc: Python 3 compat, rst2man.py support, etc. --- 0a/738433dc49c72a88ea0a305a25fb066e78f58a | 144 ++++++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 0a/738433dc49c72a88ea0a305a25fb066e78f58a diff --git a/0a/738433dc49c72a88ea0a305a25fb066e78f58a b/0a/738433dc49c72a88ea0a305a25fb066e78f58a new file mode 100644 index 000000000..0a453bb0f --- /dev/null +++ b/0a/738433dc49c72a88ea0a305a25fb066e78f58a @@ -0,0 +1,144 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 2CC20431FBD + for ; Mon, 14 Apr 2014 11:00:32 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 1KgxvM3taj5T for ; + Mon, 14 Apr 2014 11:00:24 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id B0E4C431FBC + for ; Mon, 14 Apr 2014 11:00:23 -0700 (PDT) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id E14BE10008F; + Mon, 14 Apr 2014 21:00:15 +0300 (EEST) +From: Tomi Ollila +To: "W. Trevor King" , notmuch@notmuchmail.org +Subject: Re: [PATCH 0/7] doc: Python 3 compat, rst2man.py support, etc. +In-Reply-To: +References: +User-Agent: Notmuch/0.17+200~g5c6d42d (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: quoted-printable +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 14 Apr 2014 18:00:32 -0000 + +On Sat, Apr 05 2014, "W. Trevor King" wrote: + +> I just bumped into this today while testing v2 of my +> content-description series: +> +> $ ./configure +> =E2=80=A6 +> $ make +> =E2=80=A6 +> python ./doc/mkdocdeps.py ./doc doc/_build doc/docdeps.mk +> Traceback (most recent call last): +> File "./doc/mkdocdeps.py", line 6, in +> execfile(srcdir + '/conf.py') +> NameError: name 'execfile' is not defined +> =E2=80=A6 +> +> The first patch in this series fixes that issue, and the rest of the +> series fixes some other issues I bumped into while working on that. +> Sorry I missed these in the initial series. +> +> Note that while mkdocdeps.py and prerst2man.py are now Python 3 +> compatible (with this series), the build will fail for Python's 3.0 +> through 3.2 because of the explicit unicode literals in conf.py [1]. +> It's likely that conf.py could use [2] +> +> from __future__ import unicode_literals +> +> drop the u'' prefixes, and be compatible with all Python's =E2=89=A52.6 +> (including all 3s). I haven't checked the logic though, and I'm not +> running 3.2 locally anymore, so it's not a big priority for me. +> +> Cheers, +> Trevor +> +> [1]: https://docs.python.org/3/whatsnew/3.3.html#pep-414-explicit-unicode= +-literals +> [2]: from __future__ import unicode_literals +> +> W. Trevor King (7): +> doc/mkdocdeps.py: Convert execfile to import +> doc/mkdocdeps.py: Use "with" statement for the output file +> doc/prerst2man.py: Use Python-3-compatible octal notation +> doc/prerst2man.py: Fix 'os.system' -> 'system' typo +> doc: Allow rst2man.py as an alternative to rst2man +> doc/prerst2man.py: Convert execfile to import +> doc/INSTALL: Remove rst2man reference and other updates + +In this series IMO the patches 1-4: + +id:8d518408f2da8bc96ae3123f05791142da26b9bc.1396718720.git.wking@tremily.us +id:543aee63407956e60f85dc11a2d25855e98c10c3.1396718720.git.wking@tremily.us +id:5e4509ab08699afe2681110fb35075e1d0bbdc7e.1396718720.git.wking@tremily.us +id:c5ec510ac25c867ad600c475a0070a003440a4b8.1396718720.git.wking@tremily.us + +could go in as those are. 5: + +id:adce76bb9a0ca728d856da4ecaf6b282e22e7440.1396718720.git.wking@tremily.us + +if, for consistency reason (we don't use absolute paths with other commands +either), rst2man/rst2man.py is used as is (and commit message adjusted +accordingly). + +patch 6: + +id:7c43c614cb09665400544fc0928ac14bb67ceeb5.1396718720.git.wking@tremily.us + +would be good as is, but it doesn't apply without 5 + +In 7: + +id:edf9a674bc1f41917caead8d38b5f09295a9d1bd.1396718720.git.wking@tremily.us + +In addition to David's comments, s/genric/generic/ ;D. I don't have opinion +whether INSTALL should be changed to README.rst. Maybe this is good idea; +that also distingush between ./INSTALL & doc/INSTALL. In this case=20 +`git grep INSTALL` shows that the line 83 in ./INSTALL needs to be changed, +too. + +Tomi + +PS: this id:..git. is PITA format to work with = +;p + +> +> configure | 12 +++++++----- +> doc/INSTALL | 34 ++++++++++++++++++++-------------- +> doc/Makefile.local | 6 +++--- +> doc/mkdocdeps.py | 19 ++++++++++--------- +> doc/prerst2man.py | 25 ++++++++++++++----------- +> 5 files changed, 54 insertions(+), 42 deletions(-) +> +> --=20 +> 1.9.1.353.gc66d89d -- 2.26.2