Merge branch 'revamp' of github.com:kivy/python-for-android into revamp

inclement · inclement · commit 46df99970ef2 · 2015-09-12T13:04:39.000+01:00
diff --git a/pythonforandroid/bootstraps/pygame/build/build.py b/pythonforandroid/bootstraps/pygame/build/build.py
@@ -183,7 +183,7 @@ def select(fn):
     tf = tarfile.open(tfn, 'w:gz', format=tarfile.USTAR_FORMAT)
     dirs = []
     for fn, afn in files:
-        print '%s: %s' % (tfn, fn)
+        print('%s: %s' % (tfn, fn))
         dn = dirname(afn)
         if dn not in dirs:
             # create every dirs first if not exist yet
diff --git a/pythonforandroid/bootstraps/pygame/build/buildlib/jinja2.egg/jinja2/compiler.py b/pythonforandroid/bootstraps/pygame/build/buildlib/jinja2.egg/jinja2/compiler.py
@@ -30,7 +30,7 @@
 }
 
 try:
-    exec '(0 if 0 else 0)'
+    exec('(0 if 0 else 0)')
 except SyntaxError:
     have_condexpr = False
 else:
diff --git a/pythonforandroid/bootstraps/pygame/build/buildlib/jinja2.egg/jinja2/debug.py b/pythonforandroid/bootstraps/pygame/build/buildlib/jinja2.egg/jinja2/debug.py
@@ -18,7 +18,7 @@
 
 # how does the raise helper look like?
 try:
-    exec "raise TypeError, 'foo'"
+    exec("raise TypeError, 'foo'")
 except SyntaxError:
     raise_helper = 'raise __jinja_exception__[1]'
 except TypeError:
diff --git a/pythonforandroid/bootstraps/pygame/build/buildlib/jinja2.egg/jinja2/environment.py b/pythonforandroid/bootstraps/pygame/build/buildlib/jinja2.egg/jinja2/environment.py
@@ -549,7 +549,7 @@ def compile_templates(self, target, extensions=None, filter_func=None,
         def write_file(filename, data, mode):
             if zip:
                 info = ZipInfo(filename)
-                info.external_attr = 0755 << 16L
+                info.external_attr = 0o755 << 16L
                 zip_file.writestr(info, data)
             else:
                 f = open(os.path.join(target, filename), mode)
diff --git a/pythonforandroid/bootstraps/pygame/build/buildlib/jinja2.egg/jinja2/ext.py b/pythonforandroid/bootstraps/pygame/build/buildlib/jinja2.egg/jinja2/ext.py
@@ -536,7 +536,7 @@ def babel_extract(fileobj, keywords, comment_tags, options):
     try:
         node = environment.parse(source)
         tokens = list(environment.lex(environment.preprocess(source)))
-    except TemplateSyntaxError, e:
+    except TemplateSyntaxError as e:
         # skip templates with syntax errors
         return
 
diff --git a/pythonforandroid/bootstraps/pygame/build/buildlib/jinja2.egg/jinja2/filters.py b/pythonforandroid/bootstraps/pygame/build/buildlib/jinja2.egg/jinja2/filters.py
@@ -615,8 +615,9 @@ class _GroupTuple(tuple):
     grouper = property(itemgetter(0))
     list = property(itemgetter(1))
 
-    def __new__(cls, (key, value)):
-        return tuple.__new__(cls, (key, list(value)))
+    #def __new__(cls, (key, value)):
+    def __new__(cls, kv):
+        return tuple.__new__(cls, (kv[0], list(kv[1])))
 
 
 def do_list(value):
diff --git a/pythonforandroid/bootstraps/pygame/build/buildlib/jinja2.egg/jinja2/lexer.py b/pythonforandroid/bootstraps/pygame/build/buildlib/jinja2.egg/jinja2/lexer.py
@@ -525,7 +525,7 @@ def wrap(self, stream, name=None, filename=None):
                     value = self._normalize_newlines(value[1:-1]) \
                         .encode('ascii', 'backslashreplace') \
                         .decode('unicode-escape')
-                except Exception, e:
+                except Exception as e:
                     msg = str(e).split(':')[-1].strip()
                     raise TemplateSyntaxError(msg, lineno, name, filename)
                 # if we can express it as bytestring (ascii only)
diff --git a/pythonforandroid/bootstraps/pygame/build/buildlib/jinja2.egg/jinja2/utils.py b/pythonforandroid/bootstraps/pygame/build/buildlib/jinja2.egg/jinja2/utils.py
@@ -48,7 +48,7 @@ def _test_gen_bug():
         raise TypeError(_test_gen_bug)
         yield None
     _concat(_test_gen_bug())
-except TypeError, _error:
+except TypeError as _error:
     if not _error.args or _error.args[0] is not _test_gen_bug:
         def concat(gen):
             try:
@@ -370,7 +370,7 @@ class Markup(unicode):
     >>> class Foo(object):
     ...  def __html__(self):
     ...   return '<a href="#">foo</a>'
-    ... 
+    ...
     >>> Markup(Foo())
     Markup(u'<a href="#">foo</a>')
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`try:`
`33`		`- exec '(0 if 0 else 0)'`
	`33`	`+ exec('(0 if 0 else 0)')`
`34`	`34`	`except SyntaxError:`
`35`	`35`	`have_condexpr = False`
`36`	`36`	`else:`