Fix reset of location/tune pubsub

2 files changed, 10 insertions, 14 deletions

diff --git a/nbxmpp/modules/location.py b/nbxmpp/modules/location.py
index debcf2d..9720bdc 100644
--- a/nbxmpp/modules/location.py
+++ b/nbxmpp/modules/location.py
@@ -64,13 +64,11 @@ class Location(BaseModule):
 
     def set_location(self, data):
         item = Node('geoloc', {'xmlns': Namespace.LOCATION})
-        if data is None:
-            return
-
-        data = data._asdict()
-        for tag, value in data:
-            if value is not None:
-                item.addChild(tag, payload=value)
+        if data is not None:
+            data = data._asdict()
+            for tag, value in data:
+                if value is not None:
+                    item.addChild(tag, payload=value)
 
         jid = self._client.get_bound_jid().getBare()
         self._client.get_module('PubSub').publish(
diff --git a/nbxmpp/modules/tune.py b/nbxmpp/modules/tune.py
index 92acc38..8648bde 100644
--- a/nbxmpp/modules/tune.py
+++ b/nbxmpp/modules/tune.py
@@ -64,13 +64,11 @@ class Tune(BaseModule):
 
     def set_tune(self, data):
         item = Node('tune', {'xmlns': Namespace.TUNE})
-        if data is None:
-            return
-
-        data = data._asdict()
-        for tag, value in data.items():
-            if value is not None:
-                item.addChild(tag, payload=value)
+        if data is not None:
+            data = data._asdict()
+            for tag, value in data.items():
+                if value is not None:
+                    item.addChild(tag, payload=value)
 
         jid = self._client.get_bound_jid().getBare()
         self._client.get_module('PubSub').publish(