bug 2106: proxyAndIdentityFacet methods

1 files changed, 14 insertions, 6 deletions

diff --git a/py/python/Ice.py b/py/python/Ice.py
index a0b55ee41dc..ae0dba80962 100644
--- a/py/python/Ice.py
+++ b/py/python/Ice.py
@@ -1036,25 +1036,33 @@ del ConnectionLostException__str__
 # Proxy comparison functions.
 #
 def proxyIdentityEqual(lhs, rhs):
+    return proxyIdentityCompare(lhs, rhs) == 0
+
+def proxyIdentityCompare(lhs, rhs):
     if (lhs and not isinstance(lhs, ObjectPrx)) or (rhs and not isinstance(rhs, ObjectPrx)):
         raise ValueError('argument is not a proxy')
     if not lhs and not rhs:
         return True
     elif not lhs and rhs:
-        return False
+        return -1
     elif lhs and not rhs:
-        return False
+        return 1
     else:
-        return lhs.ice_getIdentity() == rhs.ice_getIdentity()
+        return cmp(lhs.ice_getIdentity(), rhs.ice_getIdentity())
 
 def proxyIdentityAndFacetEqual(lhs, rhs):
+    return proxyIdentityAndFacetCompare(lhs, rhs) == 0
+
+def proxyIdentityAndFacetCompare(lhs, rhs):
     if (lhs and not isinstance(lhs, ObjectPrx)) or (rhs and not isinstance(rhs, ObjectPrx)):
         raise ValueError('argument is not a proxy')
     if not lhs and not rhs:
         return True
     elif not lhs and rhs:
-        return False
+        return -1
     elif lhs and not rhs:
-        return False
+        return 1
+    elif lhs.ice_getIdentity() != rhs.ice_getIdentity():
+        return cmp(lhs.ice_getIdentity(), rhs.ice_getIdentity())
     else:
-        return lhs.ice_getIdentity() == rhs.ice_getIdentity() and lhs.ice_getFacet() == rhs.ice_getFacet()
+        return cmp(lhs.ice_getFacet(), rhs.ice_getFacet())