Re: [PATCH] doc/prerst2man.py: swap execfile with an exec call

diff --git a/cf/da8f340f95e572687060873039dc57b8080e00 b/cf/da8f340f95e572687060873039dc57b8080e00
new file mode 100644 (file)
index 0000000..85e9447
--- /dev/null
+++ b/cf/da8f340f95e572687060873039dc57b8080e00
@@ -0,0 +1,117 @@
+Return-Path: <eg@gaute.vetsj.com>\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 109A7431FBD\r
+       for <notmuch@notmuchmail.org>; Sat,  9 Aug 2014 06:59:08 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 MsMP0snf74K9 for <notmuch@notmuchmail.org>;\r
+       Sat,  9 Aug 2014 06:59:00 -0700 (PDT)\r
+Received: from mail-qc0-f179.google.com (mail-qc0-f179.google.com\r
+       [209.85.216.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 5A7A3431FAE\r
+       for <notmuch@notmuchmail.org>; Sat,  9 Aug 2014 06:59:00 -0700 (PDT)\r
+Received: by mail-qc0-f179.google.com with SMTP id m20so283952qcx.10\r
+       for <notmuch@notmuchmail.org>; Sat, 09 Aug 2014 06:58:59 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:mime-version:in-reply-to:references:date\r
+       :message-id:subject:from:to:cc:content-type;\r
+       bh=xclzp3T28HhxciC+B8maouTH75fkED5U793Yi1BEkEw=;\r
+       b=HPAdzscebpCGWHjgwhVTTcnTdcS4sAVepz2caAk4o42Okp6UVQRp2Vo+E2BbQwjegn\r
+       00WtBQ7gfjWLxcoIRkg8M5qEW/02QlGNtNKc7CxGhLSQaiqi5Zh46bWdLWkAVGEfq9V/\r
+       QT7+BQy6dg80BWEUpBCbTCCHhrStP57avT57Zjvg6GfpwO/jNi9smUwloj3Qc4PXINaP\r
+       uMzfuDFkx9eVKyMYd/y8X0R4UT3gJ52pGDiJeAKgUv4LXrczCyE8SP2jvOxwuA4NFZlM\r
+       VYl1MqSDaQr8FGdxJVku9OqVbmR5kxXJx58fC5WOTp9N2VOZFdFLQ5lmf3sIpJUxa0lI\r
+       ryWA==\r
+X-Gm-Message-State:\r
+ ALoCoQkAAhJDQcyMzP7SlZG52oczOZX3j8P5kth4N5ylOUhIqDiQi1QIlWXi9hgY3UoQIhFpamjs\r
+MIME-Version: 1.0\r
+X-Received: by 10.140.83.168 with SMTP id j37mr29130434qgd.42.1407592738683;\r
+       Sat, 09 Aug 2014 06:58:58 -0700 (PDT)\r
+Received: by 10.140.86.148 with HTTP; Sat, 9 Aug 2014 06:58:58 -0700 (PDT)\r
+In-Reply-To: <m2ha1ldawt.fsf@guru.guru-group.fi>\r
+References: <1407591591-25203-1-git-send-email-eg@gaute.vetsj.com>\r
+       <m2ha1ldawt.fsf@guru.guru-group.fi>\r
+Date: Sat, 9 Aug 2014 15:58:58 +0200\r
+Message-ID:\r
+ <CABKe4Ms1BktC4fX973UKuW_of-8z_c2thccZY5XPVChDQB8-KQ@mail.gmail.com>\r
+Subject: Re: [PATCH] doc/prerst2man.py: swap execfile with an exec call\r
+From: Gaute Hope <eg@gaute.vetsj.com>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>\r
+Content-Type: text/plain; charset=UTF-8\r
+Cc: notmuch <notmuch@notmuchmail.org>\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, 09 Aug 2014 13:59:08 -0000\r
+\r
+Aight! Whatever works. This bit me today at least, building notmuch\r
+git on Arch Linux fails without it.\r
+\r
+Cheers, Gaute\r
+\r
+On Sat, Aug 9, 2014 at 3:56 PM, Tomi Ollila <tomi.ollila@iki.fi> wrote:\r
+> On Sat, Aug 09 2014, Gaute Hope <eg@gaute.vetsj.com> wrote:\r
+>\r
+>> at some point in python 3.* execfile was removed. per\r
+>> http://stackoverflow.com/questions/6357361/alternative-to-execfile-in-python-3-2\r
+>> the execefile has been replaced in the same manner as python 2to3 helper\r
+>> script would do.\r
+>>\r
+>> tested on python 3.4.1 and 2.7.8.\r
+>> ---\r
+>\r
+> Thanks for the patch -- I have use the idea elsewhere with ipython :D\r
+>\r
+> Trevor has a patch series which takes care e.g. of this:\r
+>\r
+> id:"8cc9dd580ad672527e12f43706f9803b2c8e99d8.1405220724.git.wking@tremily.us"\r
+>\r
+> http://article.gmane.org/gmane.mail.notmuch.general/18661\r
+>\r
+>\r
+> Tomi\r
+>\r
+>\r
+>>  doc/prerst2man.py | 3 ++-\r
+>>  1 file changed, 2 insertions(+), 1 deletion(-)\r
+>>\r
+>> diff --git a/doc/prerst2man.py b/doc/prerst2man.py\r
+>> index 437dea9..3f85c0c 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
+>> +filename = sourcedir + "/conf.py"\r
+>> +exec(compile(open(filename, "rb").read(), filename, 'exec'))\r
+>>\r
+>>\r
+>>  def header(file, startdocname, command, description, authors, section):\r
+>> --\r
+>> 2.0.3\r
+>>\r
+>> _______________________________________________\r
+>> notmuch mailing list\r
+>> notmuch@notmuchmail.org\r
+>> http://notmuchmail.org/mailman/listinfo/notmuch\r