From e1a3c7a729265876e3094b054c5755a215c7c5bf Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Sun, 6 Apr 2014 10:31:08 +1700 Subject: [PATCH] [PATCH 4/7] doc/prerst2man.py: Fix 'os.system' -> 'system' typo --- 22/5df0d7bd3505fc2fde5fed31aed1700554d20b | 102 ++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 22/5df0d7bd3505fc2fde5fed31aed1700554d20b diff --git a/22/5df0d7bd3505fc2fde5fed31aed1700554d20b b/22/5df0d7bd3505fc2fde5fed31aed1700554d20b new file mode 100644 index 000000000..f4a2cd3b3 --- /dev/null +++ b/22/5df0d7bd3505fc2fde5fed31aed1700554d20b @@ -0,0 +1,102 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 3BD7C431FCB + for ; Sat, 5 Apr 2014 10:31:37 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001] + 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 dRHIIyim4Y7t for ; + Sat, 5 Apr 2014 10:31:33 -0700 (PDT) +Received: from qmta03.westchester.pa.mail.comcast.net + (qmta03.westchester.pa.mail.comcast.net [76.96.62.32]) + by olra.theworths.org (Postfix) with ESMTP id 7B9CD431FBF + for ; Sat, 5 Apr 2014 10:31:27 -0700 (PDT) +Received: from omta14.westchester.pa.mail.comcast.net ([76.96.62.60]) + by qmta03.westchester.pa.mail.comcast.net with comcast + id mEee1n0061HzFnQ53HXTRv; Sat, 05 Apr 2014 17:31:27 +0000 +Received: from odin.tremily.us ([24.18.63.50]) + by omta14.westchester.pa.mail.comcast.net with comcast + id mHXS1n004152l3L3aHXSbc; Sat, 05 Apr 2014 17:31:27 +0000 +Received: from mjolnir.tremily.us (unknown [192.168.0.140]) + by odin.tremily.us (Postfix) with ESMTPS id D615A1103C19; + Sat, 5 Apr 2014 10:31:25 -0700 (PDT) +Received: (nullmailer pid 16919 invoked by uid 1000); + Sat, 05 Apr 2014 17:31:15 -0000 +From: "W. Trevor King" +To: notmuch@notmuchmail.org +Subject: [PATCH 4/7] doc/prerst2man.py: Fix 'os.system' -> 'system' typo +Date: Sat, 5 Apr 2014 10:31:08 -0700 +Message-Id: + +X-Mailer: git-send-email 1.9.1.353.gc66d89d +In-Reply-To: +References: +In-Reply-To: +References: +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; + s=q20140121; t=1396719087; + bh=tCk4aI83KZLCueoxb41AMojN2EUy+40F1Pe5h1i6Ylk=; + h=Received:Received:Received:Received:From:To:Subject:Date: + Message-Id; + b=dO/b3vbo9aPoZyw/3MosD6cV3iTclQdlxEnOUc4tyIrnuz0JXSG+4BtGVmnhkBieQ + 36+0cTP+XNOrHVflZ0bAb0+Y0OwfjNCsmS6rpDkcb8oE/M3nJPofsrPnasJPalKH6i + OI25bFChvqCPjeobJjozGmQpc+tvP4tFo8CO83sPSmfsHKt586faxp8EAADP5mvyDx + 2q7bsUua9uuaZybXGG7T1Zkx87SvCx0c4HavB5XuxVUUROJ4oOF8Meu+FI89DaSDZh + GxGrsYyHAiUIGqpBy8hN51yEFr+AqgfJ0m7K1UwbTNAcqnKxjLdAcGhpzVwC04lUfI + okUV69siFlqww== +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 05 Apr 2014 17:31:37 -0000 + +Avoid: + + $ make HAVE_SPHINX=0 HAVE_RST2MAN=1 build-man + python ./doc/prerst2man.py ./doc doc/_build/man + Traceback (most recent call last): + File "./doc/prerst2man.py", line 65, in + os.system('set -x; rst2man {0} {1}/{2}.{3}' + NameError: name 'os' is not defined + make: *** [doc/_build/man/man1/notmuch.1] Error 1 + +by using system directly. We don't need the 'os.' namespacing, +because the function was imported with: + + from os import makedirs, system +--- + doc/prerst2man.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/doc/prerst2man.py b/doc/prerst2man.py +index 108f4a3..437dea9 100644 +--- a/doc/prerst2man.py ++++ b/doc/prerst2man.py +@@ -59,5 +59,5 @@ for page in man_pages: + outfile.write("".join(lines)) + outfile.close() + +- os.system('set -x; rst2man {0} {1}/{2}.{3}' +- .format(filename, outdir, page[0],page[4])) ++ system('set -x; rst2man {0} {1}/{2}.{3}' ++ .format(filename, outdir, page[0], page[4])) +-- +1.9.1.353.gc66d89d + -- 2.26.2