[tor-commits] [stem/master] Double checking fields in equality check

[atagar@xxxxxxxxxxxxxx]

commit 33b20dcbd4b1f0ddc84085766dfbcfffc5e5e18a
Author: Damian Johnson <atagar@xxxxxxxxxxxxxx>
Date:   Sun May 6 12:05:51 2018 -0700

    Double checking fields in equality check
    
    Our Directory class hashed its attributes, then the subclasses hashed some of
    them again. Not harmful, but also not necessary.
---
 stem/directory.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/stem/directory.py b/stem/directory.py
index 2982f4d0..7b78696a 100644
--- a/stem/directory.py
+++ b/stem/directory.py
@@ -113,7 +113,7 @@ class Directory(object):
     """
     Provides cached Tor directory information. This information is hardcoded
     into Tor and occasionally changes, so the information this provides might
-    not necessarily match your version of tor.
+    not necessarily match the latest version of tor.
 
     .. versionadded:: 1.5.0
 
@@ -156,7 +156,7 @@ class Directory(object):
     raise NotImplementedError('Unsupported Operation: this should be implemented by the Directory subclass')
 
   def __hash__(self):
-    return _hash_attr(self, 'address', 'or_port', 'dir_port', 'fingerprint')
+    return _hash_attr(self, 'address', 'or_port', 'dir_port', 'fingerprint', 'nickname')
 
   def __eq__(self, other):
     return hash(self) == hash(other) if isinstance(other, Directory) else False
@@ -299,7 +299,7 @@ class Authority(Directory):
     return section_lines
 
   def __hash__(self):
-    return _hash_attr(self, 'nickname', 'v3ident', 'is_bandwidth_authority', parent = Directory)
+    return _hash_attr(self, 'v3ident', 'is_bandwidth_authority', parent = Directory)
 
   def __eq__(self, other):
     return hash(self) == hash(other) if isinstance(other, Authority) else False
@@ -574,7 +574,7 @@ class Fallback(Directory):
     conf.save(path)
 
   def __hash__(self):
-    return _hash_attr(self, 'address', 'or_port', 'dir_port', 'fingerprint', 'nickname', 'has_extrainfo', 'orport_v6', 'header', parent = Directory)
+    return _hash_attr(self, 'has_extrainfo', 'orport_v6', 'header', parent = Directory)
 
   def __eq__(self, other):
     return hash(self) == hash(other) if isinstance(other, Fallback) else False



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits