Merge pull request #370 from jdowner/develop-jid

Removed duplicate property
This commit is contained in:
Mike Taylor 2015-07-05 15:44:58 -04:00
commit ffc7eac4dc

View File

@ -528,10 +528,6 @@ class JID(object):
def username(self): def username(self):
return self._jid[0] or '' return self._jid[0] or ''
@property
def bare(self):
return _format_jid(self._jid[0], self._jid[1])
@property @property
def server(self): def server(self):
return self._jid[1] or '' return self._jid[1] or ''
@ -556,7 +552,6 @@ class JID(object):
def bare(self): def bare(self):
return _format_jid(self._jid[0], self._jid[1]) return _format_jid(self._jid[0], self._jid[1])
@resource.setter @resource.setter
def resource(self, value): def resource(self, value):
self._jid = JID(self, resource=value)._jid self._jid = JID(self, resource=value)._jid