Merge branch 'master' of git://github.com/tito/kivy into pdf

Author: tshirtman

kivy/__init__.py

@@ -28,7 +28,7 @@
     'kivy_config_fn', 'kivy_usermodules_dir',
 )
 
-__version__ = '1.0.9-dev'
+__version__ = '1.0.10-dev'
 
 import sys
 import shutil

kivy/config.py

@@ -313,9 +313,9 @@ def write(self):
             Config.setdefault('input', 'mouse', 'mouse')
 
             # activate native input provider in configuration
-            if platform == 'darwin':
-                Config.setdefault('input', 'mactouch', 'mactouch')
-            elif platform == 'win32':
+            # from 1.0.9, don't activate mactouch by default, or app are
+            # unusable.
+            if platform == 'win32':
                 Config.setdefault('input', 'wm_touch', 'wm_touch')
                 Config.setdefault('input', 'wm_pen', 'wm_pen')
             elif platform == 'linux2':

kivy/core/video/video_gstreamer.py

@@ -20,6 +20,7 @@
 
 from os import path
 from threading import Lock
+from urllib import pathname2url
 from kivy.graphics.texture import Texture
 from kivy.logger import Logger
 from functools import partial
@@ -143,9 +144,13 @@ def seek(self, percent):
                 self._buffer = self._videosink.emit('pull-preroll')
 
     def _get_uri(self):
-        if ':' in self.filename:
-            return self.filename
-        return 'file://'+path.abspath(self.filename)
+        uri = self.filename
+        if not uri:
+            return
+        if uri.split(':')[0] not in (
+                'http', 'https', 'file', 'udp', 'rtp', 'rtsp'):
+            uri = 'file:' + pathname2url(path.realpath(uri))
+        return uri
 
     def _do_eos(self, *args):
         self.seek(0)

kivy/data/style.kv

@@ -11,6 +11,7 @@
 
 <Button,ToggleButton>:
     canvas:
+        Clear
         Color:
             rgba: self.background_color
         BorderImage:
@@ -253,25 +254,25 @@
             size: root.size
             source: 'data/images/filechooser_selected.png'
 
-	Image:
-		size: 48, 48
-		source: 'data/images/filechooser_%s.png' % ('folder' if ctx.isdir else 'file')
-		pos: root.x + 24, root.y + 40
-	Label:
-		text: unicode(ctx.name)
-		text_size: (root.width, self.height)
-		halign: 'center'
-		shorten: True
-		size: 100, 16
-		pos: root.x, root.y + 16
-
-	Label:
-		text: unicode(ctx.get_nice_size())
-		font_size: 8
-		color: .8, .8, .8, 1
-		size: 100, 16
-		pos: root.pos
-		halign: 'center'
+    Image:
+        size: 48, 48
+        source: 'data/images/filechooser_%s.png' % ('folder' if ctx.isdir else 'file')
+        pos: root.x + 24, root.y + 40
+    Label:
+        text: unicode(ctx.name)
+        text_size: (root.width, self.height)
+        halign: 'center'
+        shorten: True
+        size: 100, 16
+        pos: root.x, root.y + 16
+
+    Label:
+        text: unicode(ctx.get_nice_size())
+        font_size: 8
+        color: .8, .8, .8, 1
+        size: 100, 16
+        pos: root.pos
+        halign: 'center'
 
 
 # Switch widget

kivy/lang.py

@@ -453,7 +453,9 @@
 from kivy.logger import Logger
 from kivy.utils import OrderedDict, QueryDict
 from kivy.cache import Cache
-from kivy import kivy_data_dir
+from kivy import kivy_data_dir, require
+from kivy.lib.debug import make_traceback
+
 
 trace = Logger.trace
 global_idmap = {}
@@ -467,7 +469,7 @@
 lang_keyvalue = re.compile('([a-zA-Z_][a-zA-Z0-9_.]*\.[a-zA-Z0-9_.]+)')
 
 
-def precompile_value(name, value):
+def precompile_value(name, value, line=1, parser=None):
     # if it's an id, we don't need to compile, the value is the id.
     if name == 'id':
         return value
@@ -480,18 +482,18 @@ def precompile_value(name, value):
         # if we don't detect any string/key in it, we can eval and give the
         # result
         if re.search(lang_key, tmp) is None:
-            return (None, eval(value), value)
+            return (None, eval(value), value, line + 1, parser)
 
     # ok, we can compile.
-    code = compile(value, '<string>', mode)
+    code = compile(value, parser.filename or '<string>', mode)
 
     # now, detect obj.prop
     # first, remove all the string from the value
     tmp = re.sub(lang_str, '', value)
     # detect key.value inside value
     kw = re.findall(lang_keyvalue, tmp)
 
-    return (kw, code, value)
+    return (kw, code, value, line + 1, parser)
 
 
 class ParserError(Exception):
@@ -529,13 +531,10 @@ def __init__(self, **kwargs):
         self.sourcecode = []
         self.objects = []
         self.directives = []
+        self.filename = kwargs.get('filename', None)
         content = kwargs.get('content', None)
-        self.filename = filename = kwargs.get('filename', None)
-        if filename:
-            content = self.load_resource(filename)
         if content is None:
-            raise ValueError('No content passed. Use filename or '
-                             'content attribute.')
+            raise ValueError('No content passed')
         self.parse(content)
 
     def execute_directives(self):
@@ -633,7 +632,7 @@ def precompile_objects(self, objects):
                         'canvas.after'):
                     self.precompile_objects(value[0])
                     continue
-                value[0] = precompile_value(key, value[0])
+                value[0] = precompile_value(key, value[0], value[1], value[2])
 
     def parse_version(self, line):
         '''Parse the version line.
@@ -648,9 +647,9 @@ def parse_version(self, line):
                            '#:kivy <version>')
 
         version = content[6:].strip()
-        if version != '1.0':
-            raise ParserError(self, ln, 'Only Kivy language 1.0 is supported'
-                          ' (<%s> found)' % version)
+        if len(version.split('.')) == 2:
+            version += '.0'
+        require(version)
         if __debug__:
             trace('Parser: Kivy version is %s' % version)
 
@@ -792,9 +791,16 @@ def _eval_center(boxsize, center):
 
 def custom_callback(*largs, **kwargs):
     element, key, value, idmap = largs[0]
+    __kvlang__ = value
     locals().update(idmap)
     args = largs[1:]
-    exec value[1]
+    try:
+        exec value[1]
+    except:
+        exc_info = sys.exc_info()
+        traceback = make_traceback(exc_info)
+        exc_type, exc_value, tb = traceback.standard_exc_info
+        raise exc_type, exc_value, tb
 
 
 def create_handler(element, key, vd, idmap):
@@ -960,7 +966,8 @@ def load_string(self, string, **kwargs):
         kwargs.setdefault('rulesonly', False)
         self._current_filename = kwargs.get('filename', None)
         try:
-            parser = Parser(content=string)
+            parser = Parser(content=string, filename=kwargs.get(
+                'filename', None))
             root = self.build(parser.objects)
             if kwargs['rulesonly'] and root:
                 filename = kwargs.get('rulesonly', '<string>')