From 7c3b3827b4c1b717d7d1ea2d4e88cdbe228730de Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Mon, 20 Aug 2018 00:23:21 +0100
Subject: jid: Make property aliases proper aliases.

---
 slixmpp/jid.py | 61 ++++++++--------------------------------------------------
 1 file changed, 8 insertions(+), 53 deletions(-)

(limited to 'slixmpp/jid.py')

diff --git a/slixmpp/jid.py b/slixmpp/jid.py
index 9cb815db..dd6c1047 100644
--- a/slixmpp/jid.py
+++ b/slixmpp/jid.py
@@ -346,30 +346,10 @@ class JID:
     def node(self):
         return self._node
 
-    @property
-    def user(self):
-        return self._node
-
-    @property
-    def local(self):
-        return self._node
-
-    @property
-    def username(self):
-        return self._node
-
     @property
     def domain(self):
         return self._domain
 
-    @property
-    def server(self):
-        return self._domain
-
-    @property
-    def host(self):
-        return self._domain
-
     @property
     def resource(self):
         return self._resource
@@ -382,45 +362,16 @@ class JID:
     def full(self):
         return self._full
 
-    @property
-    def jid(self):
-        return self._full
-
     @node.setter
     def node(self, value):
         self._node = _validate_node(value)
         self._update_bare_full()
 
-    @user.setter
-    def user(self, value):
-        self._node = _validate_node(value)
-        self._update_bare_full()
-
-    @local.setter
-    def local(self, value):
-        self._node = _validate_node(value)
-        self._update_bare_full()
-
-    @username.setter
-    def username(self, value):
-        self._node = _validate_node(value)
-        self._update_bare_full()
-
     @domain.setter
     def domain(self, value):
         self._domain = _validate_domain(value)
         self._update_bare_full()
 
-    @server.setter
-    def server(self, value):
-        self._domain = _validate_domain(value)
-        self._update_bare_full()
-
-    @host.setter
-    def host(self, value):
-        self._domain = _validate_domain(value)
-        self._update_bare_full()
-
     @bare.setter
     def bare(self, value):
         node, domain, resource = _parse_jid(value)
@@ -439,10 +390,14 @@ class JID:
         self._node, self._domain, self._resource = _parse_jid(value)
         self._update_bare_full()
 
-    @jid.setter
-    def jid(self, value):
-        self._node, self._domain, self._resource = _parse_jid(value)
-        self._update_bare_full()
+    user = node
+    local = node
+    username = node
+
+    server = domain
+    host = domain
+
+    jid = full
 
     def __str__(self):
         """Use the full JID as the string value."""
-- 
cgit v1.2.3