[PATCH v3 2/5] doc/prerst2man.py: Convert execfile to import

diff --git a/d5/afc6209def9c7e7d72fb5959343076a2edc0d9 b/d5/afc6209def9c7e7d72fb5959343076a2edc0d9
new file mode 100644 (file)
index 0000000..dc37142
--- /dev/null
+++ b/d5/afc6209def9c7e7d72fb5959343076a2edc0d9
@@ -0,0 +1,128 @@
+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 16A2D431FD2\r
+       for <notmuch@notmuchmail.org>; Sat, 12 Jul 2014 20:11:45 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\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 WLPFrhcQSuAz for <notmuch@notmuchmail.org>;\r
+       Sat, 12 Jul 2014 20:11:38 -0700 (PDT)\r
+Received: from qmta04.emeryville.ca.mail.comcast.net\r
+       (qmta04.emeryville.ca.mail.comcast.net [76.96.30.40])\r
+       by olra.theworths.org (Postfix) with ESMTP id B8F00431FC0\r
+       for <notmuch@notmuchmail.org>; Sat, 12 Jul 2014 20:11:29 -0700 (PDT)\r
+Received: from omta16.emeryville.ca.mail.comcast.net ([76.96.30.72])\r
+       by qmta04.emeryville.ca.mail.comcast.net with comcast\r
+       id Rf9p1o0011ZMdJ4A4fBVAq; Sun, 13 Jul 2014 03:11:29 +0000\r
+Received: from odin.tremily.us ([24.18.63.50])\r
+       by omta16.emeryville.ca.mail.comcast.net with comcast\r
+       id RfBT1o003152l3L8cfBTGn; Sun, 13 Jul 2014 03:11:28 +0000\r
+Received: from mjolnir.tremily.us (unknown [192.168.0.150])\r
+       by odin.tremily.us (Postfix) with ESMTPS id CD3FB1286F03;\r
+       Sat, 12 Jul 2014 20:11:26 -0700 (PDT)\r
+Received: (nullmailer pid 31450 invoked by uid 1000);\r
+       Sun, 13 Jul 2014 03:10:44 -0000\r
+From: "W. Trevor King" <wking@tremily.us>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 2/5] doc/prerst2man.py: Convert execfile to import\r
+Date: Sat, 12 Jul 2014 20:10:34 -0700\r
+Message-Id:\r
+ <8cc9dd580ad672527e12f43706f9803b2c8e99d8.1405220724.git.wking@tremily.us>\r
+X-Mailer: git-send-email 1.9.1.353.gc66d89d\r
+In-Reply-To: <cover.1405220724.git.wking@tremily.us>\r
+References: <cover.1405220724.git.wking@tremily.us>\r
+In-Reply-To: <cover.1405220724.git.wking@tremily.us>\r
+References: <cover.1405220724.git.wking@tremily.us>\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
+       s=q20140121; t=1405221089;\r
+       bh=surGy6r4gr9e//xrzFrd6sbiw4m4FMtByh0+q6ZgS2o=;\r
+       h=Received:Received:Received:Received:From:To:Subject:Date:\r
+       Message-Id;\r
+       b=WzUD0km5VsFm2RTPQuCOU98uzGwiK9/Irq+AFWnWvVnuir6v6Cr/O6naCnbVhHQbw\r
+       U8A4oKKQCUG2sHqAkkqv+Q4eHlGz0IpRXGZktF/wx3jXBFD6UezJyvVcIJGLTtWzUX\r
+       eT2r+F4SqA6eTaSrntcK/d3g343+KJpBpP3CDtUPuMdmTAXrob9QnEigwSlNzaLiJ1\r
+       wW9e5Qzo4hwt+KD7egmEyqXlNnOjCAa5h1FzySUqpMQBYsBSAWfVeegroYxfQeu2p7\r
+       m8vo7y/W3nEr2PYdqc2Al1zxgIraDEFiM4wLVkH9nS7gv+LtLRvytomRNSW5y7LLWs\r
+       NtNxdJWfSg71A==\r
+Cc: Tomi Ollila <tomi.ollila@iki.fi>\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: Sun, 13 Jul 2014 03:11:45 -0000\r
+\r
+excefile is gone in Python 3 [1].  Instead of exec-ing the\r
+configuration, it's easier to insert the source directory in Python's\r
+path [2], and just import the configuration.  With this change,\r
+prerst2man.py is compatible with both Python 2 and 3.\r
+\r
+[1]: https://docs.python.org/3.0/whatsnew/3.0.html#builtins\r
+[2]: https://docs.python.org/3/library/sys.html#sys.path\r
+---\r
+ doc/prerst2man.py | 18 ++++++++++--------\r
+ 1 file changed, 10 insertions(+), 8 deletions(-)\r
+\r
+diff --git a/doc/prerst2man.py b/doc/prerst2man.py\r
+index 81ce817..7d78e9b 100644\r
+--- a/doc/prerst2man.py\r
++++ b/doc/prerst2man.py\r
+@@ -1,18 +1,20 @@\r
+-from sys import argv\r
++import sys\r
+ from datetime import date\r
+ from os.path import dirname, isdir\r
+ from os import makedirs, system\r
+ import re\r
+ \r
+-rst2man = argv[1]\r
+-sourcedir = argv[2]\r
+-outdir = argv[3]\r
++rst2man = sys.argv[1]\r
++sourcedir = sys.argv[2]\r
++outdir = sys.argv[3]\r
++\r
++sys.path.insert(0, sourcedir)\r
++import conf\r
++\r
+ \r
+ if not isdir(outdir):\r
+     makedirs(outdir, 0o755)\r
+ \r
+-execfile(sourcedir + "/conf.py")\r
+-\r
+ \r
+ def header(file, startdocname, command, description, authors, section):\r
+     file.write("""\r
+@@ -29,10 +31,10 @@ def header(file, startdocname, command, description, authors, section):\r
+ '-' * len(description),\r
+ description,\r
+ '-' * len(description),\r
+-date.today().isoformat(), release, section, project))\r
++date.today().isoformat(), conf.release, section, conf.project))\r
+ \r
+ blankre = re.compile("^\s*$")\r
+-for page in man_pages:\r
++for page in conf.man_pages:\r
+     outdirname = outdir + '/' + dirname(page[0])\r
+     if not isdir(outdirname):\r
+         makedirs(outdirname, 0o755)\r
+-- \r
+1.9.1.353.gc66d89d\r
+\r