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

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

Date: Sat, 5 Apr 2014 10:31:04 -0700

To: notmuch@notmuchmail.org

Cc:

From: W. Trevor King


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 <module>
      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


Thread: