# HG changeset patch
# Parent  0e43b416d911ce2732fca2f705a25ce7e14a8742

diff --git a/wokkel/ping.py b/wokkel/ping.py
--- a/wokkel/ping.py
+++ b/wokkel/ping.py
@@ -10,7 +10,9 @@
 U{XEP-0199<http://xmpp.org/extensions/xep-0199.html>}.
 """
 
-from zope.interface import implements
+from __future__ import division, absolute_import
+
+from zope.interface import implementer
 
 from twisted.words.protocols.jabber.error import StanzaError
 from twisted.words.protocols.jabber.xmlstream import IQ, toResponse
@@ -56,7 +58,7 @@
         request.addElement((NS_PING, 'ping'))
 
         if sender is not None:
-            request['from'] = unicode(sender)
+            request['from'] = sender.full()
 
         d = request.send(entity.full())
         d.addCallbacks(cb, eb)
@@ -64,6 +66,7 @@
 
 
 
+@implementer(iwokkel.IDisco)
 class PingHandler(XMPPHandler):
     """
     Ping responder.
@@ -71,8 +74,6 @@
     This handler waits for XMPP Ping requests and sends a response.
     """
 
-    implements(iwokkel.IDisco)
-
     def connectionInitialized(self):
         """
         Called when the XML stream has been initialized.
diff --git a/wokkel/test/test_ping.py b/wokkel/test/test_ping.py
--- a/wokkel/test/test_ping.py
+++ b/wokkel/test/test_ping.py
@@ -5,6 +5,8 @@
 Tests for L{wokkel.ping}.
 """
 
+from __future__ import division, absolute_import
+
 from zope.interface import verify
 
 from twisted.internet import defer