Imitiating buttfly in being explicitly typed

[theonering] / src / aliasing.py

diff --git a/src/aliasing.py b/src/aliasing.py
index d1b9500..8476e9c 100644 (file)
--- a/src/aliasing.py
+++ b/src/aliasing.py
@@ -1,5 +1,6 @@
 import logging
 
+import dbus
 import telepathy
 
 import tp
@@ -7,10 +8,10 @@ import util.misc as misc_utils
 import handle
 
 
-_moduleLogger = logging.getLogger('aliasing')
+_moduleLogger = logging.getLogger(__name__)
 
 
-def _make_pretty_with_areacodde(phonenumber):
+def _make_pretty_with_areacode(phonenumber):
        prettynumber = "(%s)" % (phonenumber[0:3], )
        if 3 < len(phonenumber):
                prettynumber += " %s" % (phonenumber[3:6], )
@@ -31,10 +32,10 @@ def _make_pretty_international(phonenumber):
        if phonenumber.startswith("0"):
                prettynumber = "+%s " % (phonenumber[0:3], )
                if 3 < len(phonenumber):
-                       prettynumber += _make_pretty_with_areacodde(phonenumber[3:])
-       if phonenumber.startswith("1"):
+                       prettynumber += _make_pretty_with_areacode(phonenumber[3:])
+       elif phonenumber.startswith("1"):
                prettynumber = "1 "
-               prettynumber += _make_pretty_with_areacodde(phonenumber[1:])
+               prettynumber += _make_pretty_with_areacode(phonenumber[1:])
        return prettynumber
 
 
@@ -81,7 +82,7 @@ def make_pretty(phonenumber):
        elif 8 < len(phonenumber) and phonenumber[0] in ("0", "1"):
                prettynumber = _make_pretty_international(phonenumber)
        elif 7 < len(phonenumber):
-               prettynumber = _make_pretty_with_areacodde(phonenumber)
+               prettynumber = _make_pretty_with_areacode(phonenumber)
        elif 3 < len(phonenumber):
                prettynumber = _make_pretty_local(phonenumber)
        else:
@@ -127,9 +128,12 @@ class AliasingMixin(tp.ConnectionInterfaceAliasing):
        def GetAliases(self, contactHandleIds):
                _moduleLogger.debug("Called GetAliases")
 
-               idToAlias = dict(
-                       (handleId, self._get_alias(handleId))
-                       for handleId in contactHandleIds
+               idToAlias = dbus.Dictionary(
+                       (
+                               (handleId, self._get_alias(handleId))
+                               for handleId in contactHandleIds
+                       ),
+                       signature="us",
                )
                return idToAlias