From: W. Trevor King Date: Sat, 5 Apr 2014 17:31:04 +0000 (+1700) Subject: [PATCH 0/7] doc: Python 3 compat, rst2man.py support, etc. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=002c1f0c344b61467a98e45d107e3b881f400854;p=notmuch-archives.git [PATCH 0/7] doc: Python 3 compat, rst2man.py support, etc. --- diff --git a/d0/453e32436575163fec7e82bd7f33a396d53e3c b/d0/453e32436575163fec7e82bd7f33a396d53e3c new file mode 100644 index 000000000..768b4434b --- /dev/null +++ b/d0/453e32436575163fec7e82bd7f33a396d53e3c @@ -0,0 +1,120 @@ +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 13CA1431FC4 + for ; Sat, 5 Apr 2014 10:31: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=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001] + 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 D39vX+Op5G58 for ; + Sat, 5 Apr 2014 10:31:25 -0700 (PDT) +Received: from qmta12.westchester.pa.mail.comcast.net + (qmta12.westchester.pa.mail.comcast.net [76.96.59.227]) + by olra.theworths.org (Postfix) with ESMTP id 692BC431FAE + for ; Sat, 5 Apr 2014 10:31:25 -0700 (PDT) +Received: from omta14.westchester.pa.mail.comcast.net ([76.96.62.60]) + by qmta12.westchester.pa.mail.comcast.net with comcast + id mHH11n0031HzFnQ5CHXRzp; Sat, 05 Apr 2014 17:31:25 +0000 +Received: from odin.tremily.us ([24.18.63.50]) + by omta14.westchester.pa.mail.comcast.net with comcast + id mHXQ1n001152l3L3aHXQb9; Sat, 05 Apr 2014 17:31:25 +0000 +Received: from mjolnir.tremily.us (unknown [192.168.0.140]) + by odin.tremily.us (Postfix) with ESMTPS id ABFB31103C10; + Sat, 5 Apr 2014 10:31:23 -0700 (PDT) +Received: (nullmailer pid 16909 invoked by uid 1000); + Sat, 05 Apr 2014 17:31:15 -0000 +From: "W. Trevor King" +To: notmuch@notmuchmail.org +Subject: [PATCH 0/7] doc: Python 3 compat, rst2man.py support, etc. +Date: Sat, 5 Apr 2014 10:31:04 -0700 +Message-Id: +X-Mailer: git-send-email 1.9.1.353.gc66d89d +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; + s=q20140121; t=1396719085; + bh=fzWzuqEvt5COw5zp1mzzDMon8JXjv74H24EF52YfaqM=; + h=Received:Received:Received:Received:From:To:Subject:Date: + Message-Id:MIME-Version:Content-Type; + b=efwrl0dBZeX65Px0weYUwcHSHIdOarm/1u2ulVj5JPepLcWcgYAlqSXupk73qe1sR + yZwyrpi8J7rFNsUw/4an8Ql19mDw+6kkBbA9WLeyzFX70f44Zp2xwj8Qxn5sT6Ti5h + PbuFPhxDDHKWYV919wAPSbAQ+jnexNybdw856BU+kyD8YbIXSlAMuMW5x1Ys4KocE9 + R1zjMO28bXstn2mGx6qYO/14R3IHEwIPcuyJlIDRzFparN9L/LUmgHdNGORbJuzJ5U + EoyOu447DARvk5XtPyE+z9NRKDSVhNQU2y46r5zyVzzeLX2NTXfbDf3G8Dh18R4Ytp + 8yb3Pmd7dOOtw== +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: Sat, 05 Apr 2014 17:31:32 -0000 + +I just bumped into this today while testing v2 of my +content-description series: + + $ ./configure + … + $ make + … + 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 + … + +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 ≥2.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 + + configure | 12 +++++++----- + doc/INSTALL | 34 ++++++++++++++++++++-------------- + doc/Makefile.local | 6 +++--- + doc/mkdocdeps.py | 19 ++++++++++--------- + doc/prerst2man.py | 25 ++++++++++++++----------- + 5 files changed, 54 insertions(+), 42 deletions(-) + +-- +1.9.1.353.gc66d89d +