Re: [PATCH] build: eliminate use of python execfile command

diff --git a/1e/ba31a3380969b90a357fa29d677f0433c7a895 b/1e/ba31a3380969b90a357fa29d677f0433c7a895
new file mode 100644 (file)
index 0000000..b285913
--- /dev/null
+++ b/1e/ba31a3380969b90a357fa29d677f0433c7a895
@@ -0,0 +1,104 @@
+Return-Path: <tomi.ollila@iki.fi>\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 B5379431FBC\r
+       for <notmuch@notmuchmail.org>; Sat,  3 Jan 2015 06:06:22 -0800 (PST)\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 tests=[none]\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 4IwcGbUr7c5k for <notmuch@notmuchmail.org>;\r
+       Sat,  3 Jan 2015 06:06:19 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 642EA431FB6\r
+       for <notmuch@notmuchmail.org>; Sat,  3 Jan 2015 06:06:19 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 38BD9100051;\r
+       Sat,  3 Jan 2015 16:05:52 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] build: eliminate use of python execfile command\r
+In-Reply-To: <1420291282-2553-1-git-send-email-david@tethera.net>\r
+References: <1420291282-2553-1-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.19+14~ge04617b (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Sat, 03 Jan 2015 16:05:52 +0200\r
+Message-ID: <m2r3vcari7.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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, 03 Jan 2015 14:06:22 -0000\r
+\r
+On Sat, Jan 03 2015, David Bremner <david@tethera.net> wrote:\r
+\r
+> As discussed in\r
+> id:8cc9dd580ad672527e12f43706f9803b2c8e99d8.1405220724.git.wking@tremily.us,\r
+> execfile is unavailable in python3.\r
+>\r
+> The approach of this commit avoids modifying the python module path,\r
+> which is arguably preferable since it avoids potentially accidentally importing a module from the wrong place.\r
+\r
+Looks good, tests pass -- you could amend the commit message by adding one lost newline.\r
+\r
+Tomi\r
+\r
+\r
+\r
+> ---\r
+>  devel/release-checks.sh | 2 +-\r
+>  doc/prerst2man.py       | 3 ++-\r
+>  2 files changed, 3 insertions(+), 2 deletions(-)\r
+>\r
+> diff --git a/devel/release-checks.sh b/devel/release-checks.sh\r
+> index 797d62a..ae02f55 100755\r
+> --- a/devel/release-checks.sh\r
+> +++ b/devel/release-checks.sh\r
+> @@ -130,7 +130,7 @@ else\r
+>  fi\r
+>  \r
+>  echo -n "Checking that python bindings version is $VERSION... "\r
+> -py_version=`python -c "execfile('$PV_FILE'); print __VERSION__"`\r
+> +py_version=`python -c "with open('$PV_FILE') as vf: exec(vf.read()); print __VERSION__"`\r
+>  if [ "$py_version" = "$VERSION" ]\r
+>  then\r
+>      echo Yes.\r
+> diff --git a/doc/prerst2man.py b/doc/prerst2man.py\r
+> index 437dea9..968722a 100644\r
+> --- a/doc/prerst2man.py\r
+> +++ b/doc/prerst2man.py\r
+> @@ -10,7 +10,8 @@ outdir = argv[2]\r
+>  if not isdir(outdir):\r
+>      makedirs(outdir, 0o755)\r
+>  \r
+> -execfile(sourcedir + "/conf.py")\r
+> +with open(sourcedir + "/conf.py") as cf:\r
+> +    exec(cf.read())\r
+>  \r
+>  \r
+>  def header(file, startdocname, command, description, authors, section):\r
+> -- \r
+> 2.1.3\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r