summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjason kirtland <jek@discorporate.us>2013-07-03 09:49:09 +0200
committerjason kirtland <jek@discorporate.us>2013-07-03 09:49:09 +0200
commit60fc2947f0b208299c8dd7125431ba70d3b57e04 (patch)
treea383c4d92185be2758fbbc2bc0390306456bb315
parent99fc9b5f5f7bd283e8f931ec8d5ea3654c6c67e6 (diff)
downloadblinker-60fc2947f0b208299c8dd7125431ba70d3b57e04.tar.gz
Support Python >= 2.7 transition from im_func to __func__ (fixes #6)
-rw-r--r--blinker/_utilities.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/blinker/_utilities.py b/blinker/_utilities.py
index a0c26bb..056270d 100644
--- a/blinker/_utilities.py
+++ b/blinker/_utilities.py
@@ -111,7 +111,9 @@ except NameError:
def hashable_identity(obj):
- if hasattr(obj, 'im_func'):
+ if hasattr(obj, '__func__'):
+ return (id(obj.__func__), id(obj.__self__))
+ elif hasattr(obj, 'im_func'):
return (id(obj.im_func), id(obj.im_self))
elif isinstance(obj, text):
return obj