Commits

Jason R. Coombs committed a9b43f5 Merge

Merge with 8.9.1

  • Participants
  • Parent commits 4cdd6de, a79a4c4
  • Tags 9.0.1

Comments (0)

Files changed (3)

 3bf0dcd26ddf7b0883942bcad8969f0ea7c623c3 8.7
 c6a17fb51f6d5848a4ab386cede538c56e456804 8.8
 102747e5c2dcafcce7b3d336e402cdd68661590d 8.9
+caca157db4a2b4473963d4b23db8039996e78bf6 8.9.1
 Changes
 -------
 
+9.0.1
+~~~~~
+
+* Apply fix in 8.9.1 to 9.0.
+
 9.0
 ~~~
 
 * ``itertools.one()`` now always raises a ValueError and never a
   StopIteration.
 
+8.9.1
+~~~~~
+
+* Use six for callable in NonDataProperty, restoring Python 3.1 compatibility.
+
 8.9
 ~~~
 

File jaraco/util/properties.py

 from __future__ import unicode_literals
 
+import six
+
 class NonDataProperty(object):
 	"""Much like the property builtin, but only implements __get__,
 	making it a non-data property, and can be subsequently reset.
 
 	def __init__(self, fget):
 		assert fget is not None, "fget cannot be none"
-		assert callable(fget), "fget must be callable"
+		assert six.callable(fget), "fget must be callable"
 		self.fget = fget
 
 	def __get__(self, obj, objtype=None):