fix #3861 and #3860

kivy · Dec 22, 2015 · ff17850 · ff17850
1 parent 47c60f1
commit ff17850
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/kivy/core/image/img_pil.py b/kivy/core/image/img_pil.py
@@ -83,7 +83,7 @@ def _img_read(self, im):
                     img_tmp = img_ol
                 img_ol = img_tmp
                 yield ImageData(img_tmp.size[0], img_tmp.size[1],
-                                img_tmp.mode.lower(), img_tmp.tostring())
+                                img_tmp.mode.lower(), img_tmp.tobytes())
                 im.seek(im.tell() + 1)
         except EOFError:
             pass

diff --git a/kivy/uix/behaviors/button.py b/kivy/uix/behaviors/button.py
@@ -43,6 +43,16 @@ class ButtonBehavior(object):
     defaults to `None`.
     '''
 
+    MIN_STATE_TIME = 0.035
+    '''The minimum period of time which the widget must remain in the
+    `'down'` state.
+
+    ..warning::
+        This is deprecated, and will be removed in the next major release.
+        Use :attr:`min_state_time` instead.
+
+    :attr:`MIN_STATE_TIME` is a float and defaults to 0.035.'''
+
     min_state_time = NumericProperty(0.035)
     '''The minimum period of time which the widget must remain in the
     `'down'` state.