X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fgvoice%2Faddressbook.py;h=2f6c7e28c82d34653d4f383460dca797a2cb47b0;hp=8efb26f679da5eac00a6428a5367817949832028;hb=074b7adedaeba92d5993f8015be26c684f8bbfd8;hpb=b71048b78ae57f1d4f32189f106838188d4a777b diff --git a/src/gvoice/addressbook.py b/src/gvoice/addressbook.py index 8efb26f..2f6c7e2 100644 --- a/src/gvoice/addressbook.py +++ b/src/gvoice/addressbook.py @@ -4,10 +4,10 @@ import logging import util.coroutines as coroutines -import util.misc as util_misc +import util.misc as misc_utils -_moduleLogger = logging.getLogger("gvoice.addressbook") +_moduleLogger = logging.getLogger(__name__) class Addressbook(object): @@ -60,7 +60,7 @@ class Addressbook(object): def is_blocked(self, strippedNumber): try: - return self._numbers[strippedNumber][1]["response"] == self._RESPONSE_BLOCKED + return self._numbers[strippedNumber][2]["response"] == self._RESPONSE_BLOCKED except KeyError: return False @@ -72,7 +72,7 @@ class Addressbook(object): contactName = contactDetails["name"] contactNumbers = ( ( - util_misc.normalize_number(numberDetails["phoneNumber"]), + misc_utils.normalize_number(numberDetails["phoneNumber"]), numberDetails.get("phoneType", "Mobile"), ) for numberDetails in contactDetails["numbers"]