From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8F29E139694 for ; Wed, 8 Mar 2017 00:16:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DBB11E0C63; Wed, 8 Mar 2017 00:16:48 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A93FAE0C63 for ; Wed, 8 Mar 2017 00:16:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A585C341645 for ; Wed, 8 Mar 2017 00:16:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B0035FD5 for ; Wed, 8 Mar 2017 00:16:46 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1488931455.4759a27d5fd878b59201fb48233e066eccf03be2.vapier@gentoo> Subject: [gentoo-commits] proj/gentoolkit:gentoolkit-dev commit in: src/ekeyword/ X-VCS-Repository: proj/gentoolkit X-VCS-Files: src/ekeyword/ekeyword.py src/ekeyword/ekeyword_unittest.py X-VCS-Directories: src/ekeyword/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 4759a27d5fd878b59201fb48233e066eccf03be2 X-VCS-Branch: gentoolkit-dev Date: Wed, 8 Mar 2017 00:16:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 55fd9ec0-be49-4cfa-8d1a-7b9c0d0770d0 X-Archives-Hash: 92fca8c3405b2e060d4a309248ef9147 commit: 4759a27d5fd878b59201fb48233e066eccf03be2 Author: Mike Frysinger gentoo org> AuthorDate: Wed Mar 8 00:04:15 2017 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Wed Mar 8 00:04:15 2017 +0000 URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=4759a27d ekeyword: misc source touchups No functional changes here! src/ekeyword/ekeyword.py | 8 ++++++-- src/ekeyword/ekeyword_unittest.py | 7 +++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/ekeyword/ekeyword.py b/src/ekeyword/ekeyword.py index 56e284b..6d09001 100755 --- a/src/ekeyword/ekeyword.py +++ b/src/ekeyword/ekeyword.py @@ -99,6 +99,10 @@ def sort_keywords(arches): keywords.append(g) def arch_key(keyword): + """Callback for python sorting functions + + Used to turn a Gentoo keyword into a sortable form. + """ # Sort independent of leading marker (~ or -). arch = keyword_to_arch(keyword) @@ -306,8 +310,8 @@ def process_ebuild(ebuild, ops, arch_status=None, verbose=0, quiet=0, dry_run: Do not make any changes to |ebuild|; show what would be done style: The diff style - Returns: - Whether any updates were processed + Returns: + Whether any updates were processed """ with io.open(ebuild, encoding='utf8') as f: updated, content = process_content( diff --git a/src/ekeyword/ekeyword_unittest.py b/src/ekeyword/ekeyword_unittest.py index be84cc1..3465dfb 100755 --- a/src/ekeyword/ekeyword_unittest.py +++ b/src/ekeyword/ekeyword_unittest.py @@ -7,6 +7,8 @@ """Unittests for ekeyword""" +from __future__ import print_function + import os import tempfile import unittest @@ -21,14 +23,17 @@ class TestSortKeywords(unittest.TestCase): """Tests for sort_keywords""" def _test(self, input_data, exp_data): + """Sort |input_data| and make sure it matches |exp_data|""" output_data = ekeyword.sort_keywords(input_data.split()) self.assertEqual(exp_data.split(), output_data) def testNull(self): + """Verify whitespace is collapsed""" self._test('', '') self._test(' ', '') def testGlob(self): + """Verify globs get sorted before all others""" self._test('* arm', '* arm') self._test('arm -* x86', '-* arm x86') self._test('hppa ~* amd64', '~* amd64 hppa') @@ -356,6 +361,7 @@ class TestLoadProfileData(unittest.TestCase): class TestArgToOps(unittest.TestCase): + """Tests for arg_to_op()""" def _test(self, arg, op): self.assertEqual(ekeyword.arg_to_op(arg), ekeyword.Op(*op)) @@ -377,6 +383,7 @@ class TestArgToOps(unittest.TestCase): class TestMain(unittest.TestCase): + """Tests for the main entry point""" def testSmoke(self): ekeyword.main(['arm', '--dry-run', os.path.join(TESTDIR, 'process-1.ebuild')])