Cleaning up the unimplemented location support

diff --git a/src/location.py b/src/location.py
index 54f6d86..4151b9c 100644 (file)
--- a/src/location.py
+++ b/src/location.py
@@ -1,5 +1,12 @@
+import logging
+

 import telepathy
 
 import telepathy
 

+import gtk_toolbox
+
+
+_moduleLogger = logging.getLogger('location')
+

 
 #class LocationMixin(telepathy.server.ConnectionInterfaceLocation):
 class LocationMixin(object):
 
 #class LocationMixin(telepathy.server.ConnectionInterfaceLocation):
 class LocationMixin(object):

@@ -13,20 +20,23 @@ class LocationMixin(object):
                """
                @abstract
                """
                """
                @abstract
                """

-               raise NotImplementedError()
+               raise NotImplementedError("Abstract property called")

 
 

+       @gtk_toolbox.log_exception(_moduleLogger)

        def GetLocations(self, contacts):
                """
                @returns {Contact: {Location Type: Location}}
                """
        def GetLocations(self, contacts):
                """
                @returns {Contact: {Location Type: Location}}
                """

-               raise NotImplementedError()
+               raise telepathy.NotImplemented("Yet")

 
 

+       @gtk_toolbox.log_exception(_moduleLogger)

        def RequestLocation(self, contact):
                """
                @returns {Location Type: Location}
                """
        def RequestLocation(self, contact):
                """
                @returns {Location Type: Location}
                """

-               raise NotImplementedError()
+               raise telepathy.NotImplemented("Yet")

 
 

+       @gtk_toolbox.log_exception(_moduleLogger)

        def SetLocation(self, location):
                """
                Since presence is based off of phone numbers, not allowing the client to change it
        def SetLocation(self, location):
                """
                Since presence is based off of phone numbers, not allowing the client to change it