From: Tomi Ollila Date: Wed, 11 Jul 2012 09:10:05 +0000 (+0300) Subject: [PATCH 2/2] contib/nmbug/nmbug-status: leftover whitespaces, indentation & quoting X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=dce8e3520dc664484399237adb175b4746392f33;p=notmuch-archives.git [PATCH 2/2] contib/nmbug/nmbug-status: leftover whitespaces, indentation & quoting --- diff --git a/f2/6d54dabbac773c9eb8e813bac43a51bb729647 b/f2/6d54dabbac773c9eb8e813bac43a51bb729647 new file mode 100644 index 000000000..1b4b39ea2 --- /dev/null +++ b/f2/6d54dabbac773c9eb8e813bac43a51bb729647 @@ -0,0 +1,153 @@ +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 58F62429E26 + for ; Wed, 11 Jul 2012 02:10:00 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.379 +X-Spam-Level: +X-Spam-Status: No, score=0.379 tagged_above=-999 required=5 + tests=[NO_DNS_FOR_FROM=0.379] 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 KI64890ilAIk for ; + Wed, 11 Jul 2012 02:09:58 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 34EC7431E82 + for ; Wed, 11 Jul 2012 02:09:58 -0700 (PDT) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id 072FE100394; Wed, 11 Jul 2012 12:10:10 +0300 (EEST) +From: Tomi Ollila +To: notmuch@notmuchmail.org +Subject: [PATCH 2/2] contib/nmbug/nmbug-status: leftover whitespaces, + indentation & quoting +Date: Wed, 11 Jul 2012 12:10:05 +0300 +Message-Id: <1341997805-19427-2-git-send-email-tomi.ollila@iki.fi> +X-Mailer: git-send-email 1.7.1 +In-Reply-To: <1341959351-16183-1-git-send-email-tomi.ollila@iki.fi> +References: <1341959351-16183-1-git-send-email-tomi.ollila@iki.fi> +Cc: Tomi Ollila +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: Wed, 11 Jul 2012 09:10:00 -0000 + +The initial nmbug-status was pretty consistent in it's whitespacing +but a few lines had some leftover slips. Those are now "corrected". + +Also, most of the code used ' as quoting char. As in Python one can +use ' and " interchangeably some code used " instead of '. However +the usage of those were inconsistent. Now all quotes that python +parses are ':s (only quoted content uses ":s). + +No functional changes. +--- + contrib/nmbug/nmbug-status | 43 +++++++++++++++++++++---------------------- + 1 files changed, 21 insertions(+), 22 deletions(-) + +diff --git a/contrib/nmbug/nmbug-status b/contrib/nmbug/nmbug-status +index 8c6377e..f37ee84 100755 +--- a/contrib/nmbug/nmbug-status ++++ b/contrib/nmbug/nmbug-status +@@ -18,10 +18,10 @@ import subprocess + # parse command line arguments + + parser = argparse.ArgumentParser() +-parser.add_argument("--text", help="output plain text format", +- action="store_true") ++parser.add_argument('--text', help='output plain text format', ++ action='store_true') + +-parser.add_argument("--config", help="load config from given file") ++parser.add_argument('--config', help='load config from given file') + + + args = parser.parse_args() +@@ -31,18 +31,18 @@ args = parser.parse_args() + if args.config != None: + fp = open(args.config) + else: +- nmbhome = os.getenv('NMBGIT', os.path.expanduser("~/.nmbug")) ++ nmbhome = os.getenv('NMBGIT', os.path.expanduser('~/.nmbug')) + + # read only the first line from the pipe +- sha1 = subprocess.Popen(['git', '--git-dir', nmbhome, +- 'show-ref', '-s', 'config'], +- stdout=subprocess.PIPE).stdout.readline() ++ sha1 = subprocess.Popen(['git', '--git-dir', nmbhome, ++ 'show-ref', '-s', 'config'], ++ stdout=subprocess.PIPE).stdout.readline() + + sha1 = sha1.rstrip() + +- fp = subprocess.Popen(['git', '--git-dir', nmbhome, +- 'cat-file', 'blob', sha1+':status-config.json'], +- stdout=subprocess.PIPE).stdout ++ fp = subprocess.Popen(['git', '--git-dir', nmbhome, ++ 'cat-file', 'blob', sha1+':status-config.json'], ++ stdout=subprocess.PIPE).stdout + + config = json.load(fp) + +@@ -60,11 +60,10 @@ def clear_last(): + + def print_view(title, query, comment): + +- query_string = " and ".join(query) ++ query_string = ' and '.join(query) + q_new = notmuch.Query(db, query_string) + q_new.set_sort(notmuch.Query.SORT.OLDEST_FIRST) + +- + last['thread_id'] = '' + + if output_format == 'html': +@@ -94,7 +93,7 @@ def print_view(title, query, comment): + val = rfc822.parseaddr(val)[0] + + if last[header] == val: +- out[header] = "" ++ out[header] = '' + else: + out[header] = val.encode('utf-8') + last[header] = val +@@ -108,16 +107,16 @@ def print_view(title, query, comment): + br = '
' + else: + br = '' +- ++ + out['subject'] = '%s' \ +- % (urllib.quote(mid), out['subject']) +- +- print " %s %s" % (br, out['date']) +- print "%s %s" % (br, out['id']) +- print "" +- print " %s" % out['from'] +- print "%s" % out['subject'] +- print "\n" ++ % (urllib.quote(mid), out['subject']) ++ ++ print ' %s %s' % (br, out['date']) ++ print '%s %s' % (br, out['id']) ++ print '' ++ print ' %s' % out['from'] ++ print '%s' % out['subject'] ++ print '\n' + else: + print '%(date)-10.10s %(from)-20.20s %(subject)-40.40s\n%(id)72s\n' % out + +-- +1.7.1 +