Rooba
/
kivy
mirror of https://github.com/kivy/kivy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4510 from Bakterija/master 

fixed py2 kivy/uix/image ascii error
This commit is contained in:
Richard Larkin 2016-08-06 04:19:20 +02:00 committed by GitHub
parent f8f156fd41 4b2fa9d577
commit e31299a5e7
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kivy/uix/image.py
View File

@ -52,6 +52,7 @@ from kivy.resources import resource_find
from kivy.properties import StringProperty, ObjectProperty, ListProperty, \
AliasProperty, BooleanProperty, NumericProperty
from kivy.logger import Logger
from kivy.compat import PY2
# delayed imports
Loader = None
@ -252,11 +253,14 @@ class Image(Widget):
if self._coreimage is not None:
self._coreimage.unbind(on_texture=self._on_tex_change)
try:
if PY2:
filename = filename.decode('utf-8')
self._coreimage = ci = CoreImage(filename, mipmap=mipmap,
anim_delay=self.anim_delay,
keep_data=self.keep_data,
nocache=self.nocache)
except:
except Exception as e:
Logger.exception(e)
self._coreimage = ci = None
if ci: