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

dpi: try to fix unicode/str/bytes issue with old cython version

This commit is contained in:
Mathieu Virbel 2012-09-07 02:58:34 +02:00
parent 642abedbf6
commit f0f9b05fdd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kivy/properties.pxd
View File

@ -16,7 +16,7 @@ cdef class Property:
cdef class NumericProperty(Property):
cdef float parse_str(self, object obj, value)
cdef float parse_list(self, object obj, value, bytes ext)
cdef float parse_list(self, object obj, value, str ext)
cdef class StringProperty(Property):
pass

6
kivy/properties.pyx
View File

@ -374,7 +374,7 @@ cdef class NumericProperty(Property):
raise ValueError('%s.%s must have 2 components (got %r)' % (
obj.__class__.__name__,
self.name, x))
return self.parse_list(obj, x[0], <bytes>x[1])
return self.parse_list(obj, x[0], <str>x[1])
elif tp is str:
return self.parse_str(obj, x)
else:
@ -383,9 +383,9 @@ cdef class NumericProperty(Property):
self.name, x))
cdef float parse_str(self, object obj, value):
return self.parse_list(obj, value[:-2], <bytes>value[-2:])
return self.parse_list(obj, value[:-2], <str>value[-2:])
cdef float parse_list(self, object obj, value, bytes ext):
cdef float parse_list(self, object obj, value, str ext):
# 1in = 2.54cm = 25.4mm = 72pt = 12pc
global EventLoop
if EventLoop is None: