Pulling in latest skeleton code

[theonering] / src / avatars.py

diff --git a/src/avatars.py b/src/avatars.py
index aef73f5..edefa0f 100644 (file)
--- a/src/avatars.py
+++ b/src/avatars.py
@@ -9,7 +9,7 @@ import tp
 import util.misc as misc_utils
 
 
-_moduleLogger = logging.getLogger('avatars')
+_moduleLogger = logging.getLogger(__name__)
 
 
 class AvatarsMixin(tp.server.ConnectionInterfaceAvatars):
@@ -20,6 +20,7 @@ class AvatarsMixin(tp.server.ConnectionInterfaceAvatars):
        __OTHER_AVATAR = "tor_question"
 
        __LOOKUP_PATHS = (
+               "/opt/theonering/share",
                "/usr/share/theonering",
                os.path.join(os.path.dirname(__file__), "../support/icons"),
        )
@@ -119,7 +120,7 @@ class AvatarsMixin(tp.server.ConnectionInterfaceAvatars):
        def _get_avatar(self, imageName):
                try:
                        return self._avatarCache[imageName]
-               except AttributeError:
+               except KeyError:
                        image = self._load_avatar(imageName)
                        self._avatarCache[imageName] = image
                        return image