From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <tomi.ollila@iki.fi>
Received: from localhost (localhost [127.0.0.1])
	by olra.theworths.org (Postfix) with ESMTP id B5379431FBC
	for <notmuch@notmuchmail.org>; Sat,  3 Jan 2015 06:06:22 -0800 (PST)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Spam-Flag: NO
X-Spam-Score: 0
X-Spam-Level: 
X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
	autolearn=disabled
Received: from olra.theworths.org ([127.0.0.1])
	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 4IwcGbUr7c5k for <notmuch@notmuchmail.org>;
	Sat,  3 Jan 2015 06:06:19 -0800 (PST)
Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
	by olra.theworths.org (Postfix) with ESMTP id 642EA431FB6
	for <notmuch@notmuchmail.org>; Sat,  3 Jan 2015 06:06:19 -0800 (PST)
Received: from guru.guru-group.fi (localhost [IPv6:::1])
	by guru.guru-group.fi (Postfix) with ESMTP id 38BD9100051;
	Sat,  3 Jan 2015 16:05:52 +0200 (EET)
From: Tomi Ollila <tomi.ollila@iki.fi>
To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org
Subject: Re: [PATCH] build: eliminate use of python execfile command
In-Reply-To: <1420291282-2553-1-git-send-email-david@tethera.net>
References: <1420291282-2553-1-git-send-email-david@tethera.net>
User-Agent: Notmuch/0.19+14~ge04617b (http://notmuchmail.org) Emacs/24.3.1
	(x86_64-unknown-linux-gnu)
X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
	$[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
	!)g;OY^,BjTbr)Np:%c_o'jj,Z
Date: Sat, 03 Jan 2015 16:05:52 +0200
Message-ID: <m2r3vcari7.fsf@guru.guru-group.fi>
MIME-Version: 1.0
Content-Type: text/plain
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jan 2015 14:06:22 -0000

On Sat, Jan 03 2015, David Bremner <david@tethera.net> wrote:

> As discussed in
> id:8cc9dd580ad672527e12f43706f9803b2c8e99d8.1405220724.git.wking@tremily.us,
> execfile is unavailable in python3.
>
> The approach of this commit avoids modifying the python module path,
> which is arguably preferable since it avoids potentially accidentally importing a module from the wrong place.

Looks good, tests pass -- you could amend the commit message by adding one lost newline.

Tomi



> ---
>  devel/release-checks.sh | 2 +-
>  doc/prerst2man.py       | 3 ++-
>  2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/devel/release-checks.sh b/devel/release-checks.sh
> index 797d62a..ae02f55 100755
> --- a/devel/release-checks.sh
> +++ b/devel/release-checks.sh
> @@ -130,7 +130,7 @@ else
>  fi
>  
>  echo -n "Checking that python bindings version is $VERSION... "
> -py_version=`python -c "execfile('$PV_FILE'); print __VERSION__"`
> +py_version=`python -c "with open('$PV_FILE') as vf: exec(vf.read()); print __VERSION__"`
>  if [ "$py_version" = "$VERSION" ]
>  then
>  	echo Yes.
> diff --git a/doc/prerst2man.py b/doc/prerst2man.py
> index 437dea9..968722a 100644
> --- a/doc/prerst2man.py
> +++ b/doc/prerst2man.py
> @@ -10,7 +10,8 @@ outdir = argv[2]
>  if not isdir(outdir):
>      makedirs(outdir, 0o755)
>  
> -execfile(sourcedir + "/conf.py")
> +with open(sourcedir + "/conf.py") as cf:
> +    exec(cf.read())
>  
>  
>  def header(file, startdocname, command, description, authors, section):
> -- 
> 2.1.3
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch