[PATCH 0/7] doc: Python 3 compat, rst2man.py support, etc.

diff --git a/d0/453e32436575163fec7e82bd7f33a396d53e3c b/d0/453e32436575163fec7e82bd7f33a396d53e3c
new file mode 100644 (file)
index 0000000..768b443
--- /dev/null
+++ b/d0/453e32436575163fec7e82bd7f33a396d53e3c
@@ -0,0 +1,120 @@
+Return-Path: <wking@tremily.us>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 13CA1431FC4\r
+       for <notmuch@notmuchmail.org>; Sat,  5 Apr 2014 10:31:32 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id D39vX+Op5G58 for <notmuch@notmuchmail.org>;\r
+       Sat,  5 Apr 2014 10:31:25 -0700 (PDT)\r
+Received: from qmta12.westchester.pa.mail.comcast.net\r
+       (qmta12.westchester.pa.mail.comcast.net [76.96.59.227])\r
+       by olra.theworths.org (Postfix) with ESMTP id 692BC431FAE\r
+       for <notmuch@notmuchmail.org>; Sat,  5 Apr 2014 10:31:25 -0700 (PDT)\r
+Received: from omta14.westchester.pa.mail.comcast.net ([76.96.62.60])\r
+       by qmta12.westchester.pa.mail.comcast.net with comcast\r
+       id mHH11n0031HzFnQ5CHXRzp; Sat, 05 Apr 2014 17:31:25 +0000\r
+Received: from odin.tremily.us ([24.18.63.50])\r
+       by omta14.westchester.pa.mail.comcast.net with comcast\r
+       id mHXQ1n001152l3L3aHXQb9; Sat, 05 Apr 2014 17:31:25 +0000\r
+Received: from mjolnir.tremily.us (unknown [192.168.0.140])\r
+       by odin.tremily.us (Postfix) with ESMTPS id ABFB31103C10;\r
+       Sat,  5 Apr 2014 10:31:23 -0700 (PDT)\r
+Received: (nullmailer pid 16909 invoked by uid 1000);\r
+       Sat, 05 Apr 2014 17:31:15 -0000\r
+From: "W. Trevor King" <wking@tremily.us>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 0/7] doc: Python 3 compat, rst2man.py support, etc.\r
+Date: Sat,  5 Apr 2014 10:31:04 -0700\r
+Message-Id: <cover.1396718720.git.wking@tremily.us>\r
+X-Mailer: git-send-email 1.9.1.353.gc66d89d\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=UTF-8\r
+Content-Transfer-Encoding: 8bit\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
+       s=q20140121; t=1396719085;\r
+       bh=fzWzuqEvt5COw5zp1mzzDMon8JXjv74H24EF52YfaqM=;\r
+       h=Received:Received:Received:Received:From:To:Subject:Date:\r
+       Message-Id:MIME-Version:Content-Type;\r
+       b=efwrl0dBZeX65Px0weYUwcHSHIdOarm/1u2ulVj5JPepLcWcgYAlqSXupk73qe1sR\r
+       yZwyrpi8J7rFNsUw/4an8Ql19mDw+6kkBbA9WLeyzFX70f44Zp2xwj8Qxn5sT6Ti5h\r
+       PbuFPhxDDHKWYV919wAPSbAQ+jnexNybdw856BU+kyD8YbIXSlAMuMW5x1Ys4KocE9\r
+       R1zjMO28bXstn2mGx6qYO/14R3IHEwIPcuyJlIDRzFparN9L/LUmgHdNGORbJuzJ5U\r
+       EoyOu447DARvk5XtPyE+z9NRKDSVhNQU2y46r5zyVzzeLX2NTXfbDf3G8Dh18R4Ytp\r
+       8yb3Pmd7dOOtw==\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 05 Apr 2014 17:31:32 -0000\r
+\r
+I just bumped into this today while testing v2 of my\r
+content-description series:\r
+\r
+  $ ./configure\r
+  …\r
+  $ make\r
+  …\r
+  python ./doc/mkdocdeps.py ./doc doc/_build doc/docdeps.mk\r
+  Traceback (most recent call last):\r
+    File "./doc/mkdocdeps.py", line 6, in <module>\r
+      execfile(srcdir + '/conf.py')\r
+  NameError: name 'execfile' is not defined\r
+  …\r
+\r
+The first patch in this series fixes that issue, and the rest of the\r
+series fixes some other issues I bumped into while working on that.\r
+Sorry I missed these in the initial series.\r
+\r
+Note that while mkdocdeps.py and prerst2man.py are now Python 3\r
+compatible (with this series), the build will fail for Python's 3.0\r
+through 3.2 because of the explicit unicode literals in conf.py [1].\r
+It's likely that conf.py could use [2]\r
+\r
+  from __future__ import unicode_literals\r
+\r
+drop the u'' prefixes, and be compatible with all Python's ≥2.6\r
+(including all 3s).  I haven't checked the logic though, and I'm not\r
+running 3.2 locally anymore, so it's not a big priority for me.\r
+\r
+Cheers,\r
+Trevor\r
+\r
+[1]: https://docs.python.org/3/whatsnew/3.3.html#pep-414-explicit-unicode-literals\r
+[2]: from __future__ import unicode_literals\r
+\r
+W. Trevor King (7):\r
+  doc/mkdocdeps.py: Convert execfile to import\r
+  doc/mkdocdeps.py: Use "with" statement for the output file\r
+  doc/prerst2man.py: Use Python-3-compatible octal notation\r
+  doc/prerst2man.py: Fix 'os.system' -> 'system' typo\r
+  doc: Allow rst2man.py as an alternative to rst2man\r
+  doc/prerst2man.py: Convert execfile to import\r
+  doc/INSTALL: Remove rst2man reference and other updates\r
+\r
+ configure          | 12 +++++++-----\r
+ doc/INSTALL        | 34 ++++++++++++++++++++--------------\r
+ doc/Makefile.local |  6 +++---\r
+ doc/mkdocdeps.py   | 19 ++++++++++---------\r
+ doc/prerst2man.py  | 25 ++++++++++++++-----------\r
+ 5 files changed, 54 insertions(+), 42 deletions(-)\r
+\r
+-- \r
+1.9.1.353.gc66d89d\r
+\r