From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 6C4E66DE0183 for ; Thu, 7 Dec 2017 03:48:25 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" X-Spam-Flag: NO X-Spam-Score: -0.69 X-Spam-Level: X-Spam-Status: No, score=-0.69 tagged_above=-999 required=5 tests=[AWL=0.040, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z2_l3lMFuE3I for ; Thu, 7 Dec 2017 03:48:24 -0800 (PST) Received: from mout.web.de (mout.web.de [212.227.15.3]) by arlo.cworth.org (Postfix) with ESMTPS id 4EACC6DE009B for ; Thu, 7 Dec 2017 03:48:24 -0800 (PST) Received: from localhost ([78.53.227.28]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MhlP1-1ejGv42nND-00MtVy; Thu, 07 Dec 2017 12:43:22 +0100 From: l-m-h@web.de To: notmuch@notmuchmail.org Cc: Lucas Hoffmann Subject: [PATCH 5/6] python: Rename get_config_list to get_configs Date: Thu, 7 Dec 2017 12:40:50 +0100 Message-Id: X-Mailer: git-send-email 2.15.1 In-Reply-To: References: In-Reply-To: References: <8737am9w18.fsf@tethera.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2.15.1" X-Provags-ID: V03:K0:lNOIrzCAQJ246l6vmEs09+gvwrflz6Xr/wzsM18eY6NmHhYoCnn GLSgAfBovdZBY79tSfrh/nnNKMDKRibSXgnTNr6hfuq/mkgNkmJTRGYbTNulDa5ijtKMtPH aJvpYP8PtOEfm0gt0JSP57AIfPmIdFzeUbdVMKVC75j7/YE2vNOysv0btj2iNx6al90oq5T bBCKvWcujk7NG6ZAPn6YA== X-UI-Out-Filterresults: notjunk:1;V01:K0:Pdr6npje5IQ=:/CCj5M1mmkrUYwxHmuvFFc 2IUr9JQLhJxgSrKQnWNhugja0whI51grIn0f3iSM0kNtU016wCZK1m8NsTv/hWBtzf70vtY+I XOM5DFq/HCnGKHKDzEChApowCe0n2HHxcxz1OuTNEWrBJGEHGQhHvHwviqrlgmpsXrY3B2Oo5 L5T5UPJkH8yjUziXV+ynIhx0IxWrFJuJF7AUWB/tM9K5LJ7MmkfCZMtKAAYbzubFRnRyO2+WQ f1JMMzFgYNg81kNJPzREdFQRXuOndVFgk7aWUN4uW/K0mk5Ey/jLIlp1ROzvZtDa2+E9ueX1/ qoC4tcX/WIRoneV6GNUtBoghhWW5EZtNBMwSjgNpT4gWRvBczBnrhdk9kB+mRmkLBD4XEHI81 xuIH/UsWsqPBhOAv6zqkASEDlE3mLWgJmlLL9ZZKRe/bXUBxniRoznU9/PkwGTciga5wSm03r iGLVWmJtYEVHaYFg7SKn+hQhNpCou+FNMDpEOJumLJyuXe+VkFekvvGbfXcrgsA8Z31zldoSc VQHXkHa1xRoc/jai5jVOLXKFhosnYYqmB+7MHKY9AUmD9nQolyQL6hhE4kkLqVmTDAMq5AJd8 1alTrSS+em+FrT90MmPxX5xluOa2u0UdrDUYsh06+HqG/lC2beWf2x1zlCcUX4oPiVun4pdLi iLZiv7OvUeOI8rIr4p70vkS6NQ/AxJIPAneoiCExsliwJScQRNZ+hIY0N+WSrOCxbUR806wQc C54B3lU1VsiRBtoR19V1HrAdUbP/IczyaegE958JTKywTibvjiNxPg6k6fHUCWZ8BrMk/U5zO aAMR5tD5i/P4RTkCrE5gY6jWxL9SyKt6GF203fWNVe4C4DCa2s= X-Mailman-Approved-At: Thu, 07 Dec 2017 11:31:51 -0800 X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.23 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: Thu, 07 Dec 2017 11:48:25 -0000 From: Lucas Hoffmann This is a multi-part message in MIME format. --------------2.15.1 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: 8bit The old name has a bit of a feeling of hungarian notation. Also many generators in the core are named with the suffix "s" to indicate iterables: dict.items, dict.keys for example. --- bindings/python/notmuch/database.py | 18 ++---------------- test/T390-python.sh | 12 ++++++------ 2 files changed, 8 insertions(+), 22 deletions(-) --------------2.15.1 Content-Type: text/x-patch; name="0005-python-Rename-get_config_list-to-get_configs.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0005-python-Rename-get_config_list-to-get_configs.patch" diff --git a/bindings/python/notmuch/database.py b/bindings/python/notmuch/database.py index 32566620..fe09b330 100644 --- a/bindings/python/notmuch/database.py +++ b/bindings/python/notmuch/database.py @@ -689,7 +689,7 @@ class Database(object): _config_list_destroy.argtypes = [NotmuchConfigListP] _config_list_destroy.restype = None - def get_config_list(self, prefix=''): + def get_configs(self, prefix=''): """Return a generator of key, value pairs where the start of key matches the given prefix @@ -699,7 +699,7 @@ class Database(object): This could be used to get all named queries into a dict for example:: - queries = {k[6:]: v for k, v in db.get_config_list('query.')} + queries = {k[6:]: v for k, v in db.get_configs('query.')} :param prefix: a string by which the keys should be selected :type prefix: str @@ -721,20 +721,6 @@ class Database(object): yield key, value self._config_list_move_to_next(config_list_p) - def get_configs(self, prefix=''): - """Return a dict of key, value pairs where the start of key matches the - given prefix - - :param prefix: a string by which the keys should be selected - :type prefix: str - :returns: all key-value pairs where `prefix` matches the beginning - of the key - :rtype: a dict of str: str - :raises: :exc:`NotmuchError` in case of failure. - - """ - return dict(self.get_config_list(prefix)) - """notmuch_database_set_config""" _set_config = nmlib.notmuch_database_set_config _set_config.argtypes = [NotmuchDatabaseP, c_char_p, c_char_p] diff --git a/test/T390-python.sh b/test/T390-python.sh index 725a00c9..c6f395e4 100755 --- a/test/T390-python.sh +++ b/test/T390-python.sh @@ -97,22 +97,22 @@ testkey2 = testvalue2 EOF test_expect_equal_file EXPECTED OUTPUT -test_begin_subtest "get_config_list with no match returns empty generator" +test_begin_subtest "get_configs with no match returns empty generator" test_python <<'EOF' import notmuch db = notmuch.Database() -v = db.get_config_list('nonexistent') +v = db.get_configs('nonexistent') print(list(v) == []) EOF test_expect_equal "$(cat OUTPUT)" "True" -test_begin_subtest "get_config_list with no arguments returns all pairs" +test_begin_subtest "get_configs with no arguments returns all pairs" test_python <<'EOF' import notmuch db = notmuch.Database(mode=notmuch.Database.MODE.READ_WRITE) db.set_config("zzzafter", "afterval") db.set_config("aaabefore", "beforeval") -v = db.get_config_list() +v = db.get_configs() for index, keyval in enumerate(v): key, val = keyval print('{}: {} => {}'.format(index, key, val)) @@ -125,13 +125,13 @@ cat <<'EOF' >EXPECTED EOF test_expect_equal_file EXPECTED OUTPUT -test_begin_subtest "get_config_list prefix is used to match keys" +test_begin_subtest "get_configs prefix is used to match keys" test_python <<'EOF' import notmuch db = notmuch.Database(mode=notmuch.Database.MODE.READ_WRITE) db.set_config('testkey1', 'testvalue1') db.set_config('testkey2', 'testvalue2') -v = db.get_config_list('testkey') +v = db.get_configs('testkey') for index, keyval in enumerate(v): key, val = keyval print('{}: {} => {}'.format(index, key, val)) --------------2.15.1--