Merge lp:~cjwatson/storm/py3-special-methods into lp:storm

[Colin Watson]

Provide needed methods for python3.

When a class defined __eq__ it needs to define __hash__ to or else it will not be hashable.

Also, __div__ doesn't exist anymore in python3. Classes are supposed to implement both __floordiv__ and __truediv__ instead.

This is extracted from https://bazaar.launchpad.net/~bellini666/storm/py3/revision/490 in order to be able to land it independently.

[Colin Watson (cjwatson)]

I'll review this myself since I just extracted it from somebody else's MP.

review: Approve

=== modified file 'storm/expr.py'
--- storm/expr.py	2019-06-07 16:36:44 +0000
+++ storm/expr.py	2019-08-11 12:18:09 +0000
@@ -410,6 +410,7 @@
 
 class Comparable(object):
     __slots__ = ()
+    __hash__ = object.__hash__
 
     def __eq__(self, other):
         if other is not None and not isinstance(other, (Expr, Variable)):
@@ -481,6 +482,9 @@
             other = getattr(self, "variable_factory", Variable)(value=other)
         return Div(self, other)
 
+    __floordiv__ = __div__
+    __truediv__ = __div__
+
     def __mod__(self, other):
         if not isinstance(other, (Expr, Variable)):
             other = getattr(self, "variable_factory", Variable)(value=other)

=== modified file 'storm/info.py'
--- storm/info.py	2019-06-05 11:41:07 +0000
+++ storm/info.py	2019-08-11 12:18:09 +0000
@@ -148,6 +148,8 @@
     def __ne__(self, other):
         return self is not other
 
+    __hash__ = object.__hash__
+
 
 class ObjectInfo(dict):
 

=== modified file 'storm/references.py'
--- storm/references.py	2019-06-05 11:41:07 +0000
+++ storm/references.py	2019-08-11 12:18:09 +0000
@@ -208,6 +208,8 @@
     def __ne__(self, other):
         return Not(self == other)
 
+    __hash__ = object.__hash__
+
 
 class ReferenceSet(object):