Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def render(template, dest, **kwargs):
template = environment.get_template(template)
text = template.render(**kwargs)

f = file(dest, 'wb')
f = open(dest, 'wb')#
f.write(text.encode('utf-8'))
f.close()

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -224,7 +224,8 @@ def make_package(args):

args.numeric_version = str(version_code)

args.name = args.name.decode('utf-8')
if sys.version_info[0] == 2:
args.name = args.name.decode('utf-8')
if args.icon_name:
args.icon_name = args.icon_name.decode('utf-8')

Expand Down Expand Up @@ -306,8 +307,8 @@ def make_package(args):
subprocess.call([ANDROID, 'update', 'project', '-p', '.', '-t',
'android-{}'.format(args.sdk_version)])
except (OSError, IOError):
print 'An error occured while calling', ANDROID, 'update'
print 'Your PATH must include android tools.'
print('An error occured while calling', ANDROID, 'update')
print('Your PATH must include android tools.')
sys.exit(-1)

# Delete the old assets.
Expand Down Expand Up @@ -346,7 +347,7 @@ def make_package(args):
if args.add_jar:
for jarname in args.add_jar:
if not os.path.exists(jarname):
print 'Requested jar does not exist: {}'.format(jarname)
print('Requested jar does not exist: {}'.format(jarname))
sys.exit(-1)
shutil.copy(jarname, 'libs')

Expand All @@ -355,8 +356,8 @@ def make_package(args):
for arg in args.command:
subprocess.check_call([ANT, arg])
except (OSError, IOError):
print 'An error occured while calling', ANT
print 'Did you install ant on your system ?'
print('An error occured while calling', ANT)
print('Did you install ant on your system ?')
sys.exit(-1)

if __name__ == '__main__':
Expand Down
6 changes: 1 addition & 5 deletions src/buildlib/jinja2.egg/jinja2/__init__.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,7 @@
:license: BSD, see LICENSE for more details.
"""
__docformat__ = 'restructuredtext en'
try:
__version__ = __import__('pkg_resources') \
.get_distribution('Jinja2').version
except:
__version__ = 'unknown'
__version__ = '2.7.2'

# high level interface
from jinja2.environment import Environment, Template
Expand Down
150 changes: 150 additions & 0 deletions src/buildlib/jinja2.egg/jinja2/_compat.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
# -*- coding: utf-8 -*-
"""
jinja2._compat
~~~~~~~~~~~~~~

Some py2/py3 compatibility support based on a stripped down
version of six so we don't have to depend on a specific version
of it.

:copyright: Copyright 2013 by the Jinja team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
import sys

PY2 = sys.version_info[0] == 2
PYPY = hasattr(sys, 'pypy_translation_info')
_identity = lambda x: x


if not PY2:
unichr = chr
range_type = range
text_type = str
string_types = (str,)

iterkeys = lambda d: iter(d.keys())
itervalues = lambda d: iter(d.values())
iteritems = lambda d: iter(d.items())

import pickle
from io import BytesIO, StringIO
NativeStringIO = StringIO

def reraise(tp, value, tb=None):
if value.__traceback__ is not tb:
raise value.with_traceback(tb)
raise value

ifilter = filter
imap = map
izip = zip
intern = sys.intern

implements_iterator = _identity
implements_to_string = _identity
encode_filename = _identity
get_next = lambda x: x.__next__

else:
unichr = unichr
text_type = unicode
range_type = xrange
string_types = (str, unicode)

iterkeys = lambda d: d.iterkeys()
itervalues = lambda d: d.itervalues()
iteritems = lambda d: d.iteritems()

import cPickle as pickle
from cStringIO import StringIO as BytesIO, StringIO
NativeStringIO = BytesIO

exec('def reraise(tp, value, tb=None):\n raise tp, value, tb')

from itertools import imap, izip, ifilter
intern = intern

def implements_iterator(cls):
cls.next = cls.__next__
del cls.__next__
return cls

def implements_to_string(cls):
cls.__unicode__ = cls.__str__
cls.__str__ = lambda x: x.__unicode__().encode('utf-8')
return cls

get_next = lambda x: x.next

def encode_filename(filename):
if isinstance(filename, unicode):
return filename.encode('utf-8')
return filename

try:
next = next
except NameError:
def next(it):
return it.next()


def with_metaclass(meta, *bases):
# This requires a bit of explanation: the basic idea is to make a
# dummy metaclass for one level of class instanciation that replaces
# itself with the actual metaclass. Because of internal type checks
# we also need to make sure that we downgrade the custom metaclass
# for one level to something closer to type (that's why __call__ and
# __init__ comes back from type etc.).
#
# This has the advantage over six.with_metaclass in that it does not
# introduce dummy classes into the final MRO.
class metaclass(meta):
__call__ = type.__call__
__init__ = type.__init__
def __new__(cls, name, this_bases, d):
if this_bases is None:
return type.__new__(cls, name, (), d)
return meta(name, bases, d)
return metaclass('temporary_class', None, {})


try:
from collections import Mapping as mapping_types
except ImportError:
import UserDict
mapping_types = (UserDict.UserDict, UserDict.DictMixin, dict)


# common types. These do exist in the special types module too which however
# does not exist in IronPython out of the box. Also that way we don't have
# to deal with implementation specific stuff here
class _C(object):
def method(self): pass
def _func():
yield None
function_type = type(_func)
generator_type = type(_func())
method_type = type(_C().method)
code_type = type(_C.method.__code__)
try:
raise TypeError()
except TypeError:
_tb = sys.exc_info()[2]
traceback_type = type(_tb)
frame_type = type(_tb.tb_frame)


try:
from urllib.parse import quote_from_bytes as url_quote
except ImportError:
from urllib import quote as url_quote


try:
from thread import allocate_lock
except ImportError:
try:
from threading import Lock as allocate_lock
except ImportError:
from dummy_thread import allocate_lock
Loading