1 Return-Path: <wking@tremily.us>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 68E3B431FC4
\r
6 for <notmuch@notmuchmail.org>; Sat, 5 Apr 2014 10:31:33 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"
\r
12 X-Spam-Status: No, score=0 tagged_above=-999 required=5
\r
13 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001]
\r
15 Received: from olra.theworths.org ([127.0.0.1])
\r
16 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
17 with ESMTP id Tw31mttj7b9f for <notmuch@notmuchmail.org>;
\r
18 Sat, 5 Apr 2014 10:31:26 -0700 (PDT)
\r
19 Received: from QMTA11.westchester.pa.mail.comcast.net
\r
20 (qmta11.westchester.pa.mail.comcast.net [76.96.59.211])
\r
21 by olra.theworths.org (Postfix) with ESMTP id DC7D4431FAF
\r
22 for <notmuch@notmuchmail.org>; Sat, 5 Apr 2014 10:31:25 -0700 (PDT)
\r
23 Received: from omta02.westchester.pa.mail.comcast.net ([76.96.62.19])
\r
24 by QMTA11.westchester.pa.mail.comcast.net with comcast
\r
25 id mGB21n0040QuhwU5BHXRaE; Sat, 05 Apr 2014 17:31:25 +0000
\r
26 Received: from odin.tremily.us ([24.18.63.50])
\r
27 by omta02.westchester.pa.mail.comcast.net with comcast
\r
28 id mHXQ1n00T152l3L3NHXRNP; Sat, 05 Apr 2014 17:31:25 +0000
\r
29 Received: from mjolnir.tremily.us (unknown [192.168.0.140])
\r
30 by odin.tremily.us (Postfix) with ESMTPS id 3206D1103C12;
\r
31 Sat, 5 Apr 2014 10:31:24 -0700 (PDT)
\r
32 Received: (nullmailer pid 16913 invoked by uid 1000);
\r
33 Sat, 05 Apr 2014 17:31:15 -0000
\r
34 From: "W. Trevor King" <wking@tremily.us>
\r
35 To: notmuch@notmuchmail.org
\r
36 Subject: [PATCH 1/7] doc/mkdocdeps.py: Convert execfile to import
\r
37 Date: Sat, 5 Apr 2014 10:31:05 -0700
\r
39 <8d518408f2da8bc96ae3123f05791142da26b9bc.1396718720.git.wking@tremily.us>
\r
40 X-Mailer: git-send-email 1.9.1.353.gc66d89d
\r
41 In-Reply-To: <cover.1396718720.git.wking@tremily.us>
\r
42 References: <cover.1396718720.git.wking@tremily.us>
\r
43 In-Reply-To: <cover.1396718720.git.wking@tremily.us>
\r
44 References: <cover.1396718720.git.wking@tremily.us>
\r
45 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;
\r
46 s=q20140121; t=1396719085;
\r
47 bh=hna/xxGjPPXp+BaF7YqRVNPn6WIgCOnieHoUQV75lgA=;
\r
48 h=Received:Received:Received:Received:From:To:Subject:Date:
\r
50 b=uMmaG4tEPbR/zUUbjEfK/V7EPRQZDW40CveJCqAYFaqe/W3g7QdErCbI6DfnFRsxg
\r
51 pdxkaGioohZcmoqd+0MscXqH+3MovRvmGhbJylhfUHWjKdZbVcnXt6zajYSfXo1Vs6
\r
52 uzdu1J2C/gcaXywlp/rZJqHAv4Qg78zwxrr5/+eH0loryDhQ3/m0afhbJvEJSL6/EC
\r
53 zte8fbfShAMBa411IqROYQkxc6eNh9Kza+5hEyTt2KI4RU8NruAlmKGOotbfFoSuRE
\r
54 /vWxC4nGHH/vNE1fKCy/LJkLXClTF2dAQbJqEc3Myo6BO6gZQGaWBrwSDFVPRc/r+F
\r
56 X-BeenThere: notmuch@notmuchmail.org
\r
57 X-Mailman-Version: 2.1.13
\r
59 List-Id: "Use and development of the notmuch mail system."
\r
60 <notmuch.notmuchmail.org>
\r
61 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
62 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
63 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
64 List-Post: <mailto:notmuch@notmuchmail.org>
\r
65 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
66 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
67 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
68 X-List-Received-Date: Sat, 05 Apr 2014 17:31:33 -0000
\r
70 excefile is gone in Python 3 [1]. Instead of exec-ing the
\r
71 configuration, it's easier to insert the source directory in Python's
\r
72 path [2], and just import the configuration. With this change,
\r
73 mkdocdeps.py is compatible with both Python 2 and 3.
\r
75 [1]: https://docs.python.org/3.0/whatsnew/3.0.html#builtins
\r
76 [2]: https://docs.python.org/3/library/sys.html#sys.path
\r
78 doc/mkdocdeps.py | 13 +++++++------
\r
79 1 file changed, 7 insertions(+), 6 deletions(-)
\r
81 diff --git a/doc/mkdocdeps.py b/doc/mkdocdeps.py
\r
82 index 71bd135..de1cbb8 100644
\r
83 --- a/doc/mkdocdeps.py
\r
84 +++ b/doc/mkdocdeps.py
\r
86 -from sys import argv
\r
92 -execfile(srcdir + '/conf.py')
\r
93 +srcdir = sys.argv[1]
\r
94 +builddir = sys.argv[2]
\r
95 +outfile = sys.argv[3]
\r
97 +sys.path.insert(0, srcdir)
\r
102 out=open(outfile,'w')
\r
103 -for page in man_pages:
\r
104 +for page in conf.man_pages:
\r
105 rst_files = rst_files + ["{0:s}/{1:s}.rst".format(srcdir,page[0])]
\r
106 roff_files = roff_files + ["{0:s}/man/{1:s}.{2:d}".format(builddir,page[0],page[4])]
\r