summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorMike Taylor <bear42@gmail.com>2015-07-05 15:44:58 -0400
committerMike Taylor <bear42@gmail.com>2015-07-05 15:44:58 -0400
commitffc7eac4dc3a9cf935fe06ebb00b38273d3f38f6 (patch)
tree7cdd893a3fcc1e6499d6a95b4bd4fe56c974d3d8 /sleekxmpp
parent555fd6d9265e19e7ba7a1fe9ba73cb3e4ea575a3 (diff)
parent7a908ac07b1344dcbb5ee26e0ad4777decb88889 (diff)
downloadslixmpp-ffc7eac4dc3a9cf935fe06ebb00b38273d3f38f6.tar.gz
slixmpp-ffc7eac4dc3a9cf935fe06ebb00b38273d3f38f6.tar.bz2
slixmpp-ffc7eac4dc3a9cf935fe06ebb00b38273d3f38f6.tar.xz
slixmpp-ffc7eac4dc3a9cf935fe06ebb00b38273d3f38f6.zip
Merge pull request #370 from jdowner/develop-jid
Removed duplicate property
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/jid.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/sleekxmpp/jid.py b/sleekxmpp/jid.py
index ac5ba30d..613b272e 100644
--- a/sleekxmpp/jid.py
+++ b/sleekxmpp/jid.py
@@ -529,10 +529,6 @@ class JID(object):
return self._jid[0] or ''
@property
- def bare(self):
- return _format_jid(self._jid[0], self._jid[1])
-
- @property
def server(self):
return self._jid[1] or ''
@@ -556,7 +552,6 @@ class JID(object):
def bare(self):
return _format_jid(self._jid[0], self._jid[1])
-
@resource.setter
def resource(self, value):
self._jid = JID(self, resource=value)._jid