Merge branch 'master' of https://github.com/kivy/kivy

doc/sources/installation/installation-macosx.rst

@@ -10,6 +10,9 @@ Installation on MacOSX
     components yourself. We suggest using
     `homebrew <http://mxcl.github.com/homebrew/>`_ to do that.
 
+    There can be a limitation on some OS X with more than one monitor.
+    The application will crash when you try to start it on the second monitor.
+
 For Mac OS X 10.7 and later, we provide a Kivy.app with all dependencies
 bundled. Download it from our `Download Page <http://kivy.org/#download>`_.
 It comes as a .dmg 

kivy/core/image/img_imageio.pyx

@@ -278,9 +278,10 @@ class ImageLoaderImageIO(ImageLoaderBase):
         # FIXME check which one are available on osx
         return ('bmp', 'bufr', 'cur', 'dcx', 'fits', 'fl', 'fpx', 'gbr',
                 'gd', 'gif', 'grib', 'hdf5', 'ico', 'im', 'imt', 'iptc',
-                'jpeg', 'jpg', 'mcidas', 'mic', 'mpeg', 'msp', 'pcd',
-                'pcx', 'pixar', 'png', 'ppm', 'psd', 'sgi', 'spider',
-                'tga', 'tiff', 'wal', 'wmf', 'xbm', 'xpm', 'xv')
+                'jpeg', 'jpg', 'jpe', 'mcidas', 'mic', 'mpeg', 'msp',
+                'pcd', 'pcx', 'pixar', 'png', 'ppm', 'psd', 'sgi',
+                'spider', 'tga', 'tiff', 'wal', 'wmf', 'xbm', 'xpm',
+                'xv')
 
     def load(self, filename):
         # FIXME: if the filename is unicode, the loader is failing.

kivy/core/image/img_pil.py

@@ -40,9 +40,10 @@ class ImageLoaderPIL(ImageLoaderBase):
         # See http://www.pythonware.com/library/pil/handbook/index.htm
         return ('bmp', 'bufr', 'cur', 'dcx', 'fits', 'fl', 'fpx', 'gbr',
                 'gd', 'gif', 'grib', 'hdf5', 'ico', 'im', 'imt', 'iptc',
-                'jpeg', 'jpg', 'mcidas', 'mic', 'mpeg', 'msp', 'pcd',
-                'pcx', 'pixar', 'png', 'ppm', 'psd', 'sgi', 'spider',
-                'tga', 'tiff', 'wal', 'wmf', 'xbm', 'xpm', 'xv')
+                'jpeg', 'jpg', 'jpe', 'mcidas', 'mic', 'mpeg', 'msp',
+                'pcd', 'pcx', 'pixar', 'png', 'ppm', 'psd', 'sgi',
+                'spider', 'tga', 'tiff', 'wal', 'wmf', 'xbm', 'xpm',
+                'xv')
 
     def _img_correct(self, _img_tmp):
         '''Convert image to the correct format and orientation.

kivy/core/image/img_pygame.py

@@ -28,7 +28,7 @@ class ImageLoaderPygame(ImageLoaderBase):
             return ('bmp', )
         # Note to self:try to learn to use loader preferences instead-
         # of this- remove gif support from pygame
-        return ('jpg', 'jpeg', 'png', 'bmp', 'pcx', 'tga', 'tiff',
+        return ('jpg', 'jpeg', 'jpe', 'png', 'bmp', 'pcx', 'tga', 'tiff',
                 'tif', 'lbm', 'pbm', 'ppm', 'xpm')
 
     @staticmethod

kivy/graphics/vertex_instructions.pyx

@@ -370,7 +370,8 @@ cdef class Mesh(VertexInstruction):
 
     property mode:
         '''VBO Mode used for drawing vertices/indices. Can be one of 'points',
-        'line_strip', 'line_loop', 'lines', 'triangle_strip' or 'triangle_fan'.
+        'line_strip', 'line_loop', 'lines', 'triangles', 'triangle_strip' or 
+        'triangle_fan'.
         '''
         def __get__(self):
             self.batch.get_mode()

kivy/lang.py

@@ -919,6 +919,9 @@ class ParserRuleProperty(object):
         # now, detect obj.prop
         # first, remove all the string from the value
         tmp = sub(lang_str, '', value)
+        idx = tmp.find('#')
+        if idx != -1:
+            tmp = tmp[:idx]
         # detect key.value inside value, and split them
         wk = list(set(findall(lang_keyvalue, tmp)))
         if len(wk):

kivy/properties.pyx

@@ -1280,7 +1280,7 @@ cdef class VariableListProperty(Property):
             return x
 
         tp = type(x)
-        if tp is list or tp is tuple:
+        if isinstance(x, (list, tuple)):
             l = len(x)
             if l == 1:
                 y = self._convert_numeric(obj, x[0])