Permalink
Browse files

[svn] some small updates to make jinja performing better

--HG--
branch : trunk
  • Loading branch information...
1 parent e4ad284 commit de478f63cab6e8a1ef405c3c0ae7269170b5a3af @mitsuhiko mitsuhiko committed Feb 28, 2007
Showing with 526 additions and 49 deletions.
  1. +215 −0 ez_setup.py
  2. +31 −25 jinja/environment.py
  3. +6 −0 jinja/loaders.py
  4. +41 −24 jinja/translators/python.py
  5. +100 −0 setup.py
  6. +133 −0 tests/bigtable.py
View
@@ -0,0 +1,215 @@
+#!python
+"""Bootstrap setuptools installation
+
+If you want to use setuptools in your package's setup.py, just include this
+file in the same directory with it, and add this to the top of your setup.py::
+
+ from ez_setup import use_setuptools
+ use_setuptools()
+
+If you want to require a specific version of setuptools, set a download
+mirror, or use an alternate download directory, you can do so by supplying
+the appropriate options to ``use_setuptools()``.
+
+This file can also be run as a script to install or upgrade setuptools.
+"""
+import sys
+DEFAULT_VERSION = "0.6b3"
+DEFAULT_URL = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3]
+
+md5_data = {
+ 'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
+ 'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
+ 'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
+ 'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
+ 'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
+ 'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
+ 'setuptools-0.6b3dev_r46791-py2.3.egg': 'e765a29566575ffac5d81cdf0c6f8db9',
+ 'setuptools-0.6b3dev_r46791-py2.4.egg': 'd249c022ed029ad60d134bd998adc880',
+}
+
+import sys, os
+
+def _validate_md5(egg_name, data):
+ if egg_name in md5_data:
+ from md5 import md5
+ digest = md5(data).hexdigest()
+ if digest != md5_data[egg_name]:
+ print >>sys.stderr, (
+ "md5 validation of %s failed! (Possible download problem?)"
+ % egg_name
+ )
+ sys.exit(2)
+ return data
+
+
+def use_setuptools(
+ version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
+ download_delay=15
+):
+ """Automatically find/download setuptools and make it available on sys.path
+
+ `version` should be a valid setuptools version number that is available
+ as an egg for download under the `download_base` URL (which should end with
+ a '/'). `to_dir` is the directory where setuptools will be downloaded, if
+ it is not already available. If `download_delay` is specified, it should
+ be the number of seconds that will be paused before initiating a download,
+ should one be required. If an older version of setuptools is installed,
+ this routine will print a message to ``sys.stderr`` and raise SystemExit in
+ an attempt to abort the calling script.
+ """
+ try:
+ import setuptools
+ if setuptools.__version__ == '0.0.1':
+ print >>sys.stderr, (
+ "You have an obsolete version of setuptools installed. Please\n"
+ "remove it from your system entirely before rerunning this script."
+ )
+ sys.exit(2)
+ except ImportError:
+ egg = download_setuptools(version, download_base, to_dir, download_delay)
+ sys.path.insert(0, egg)
+ import setuptools; setuptools.bootstrap_install_from = egg
+
+ import pkg_resources
+ try:
+ pkg_resources.require("setuptools>="+version)
+
+ except pkg_resources.VersionConflict:
+ # XXX could we install in a subprocess here?
+ print >>sys.stderr, (
+ "The required version of setuptools (>=%s) is not available, and\n"
+ "can't be installed while this script is running. Please install\n"
+ " a more recent version first."
+ ) % version
+ sys.exit(2)
+
+def download_setuptools(
+ version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
+ delay = 15
+):
+ """Download setuptools from a specified location and return its filename
+
+ `version` should be a valid setuptools version number that is available
+ as an egg for download under the `download_base` URL (which should end
+ with a '/'). `to_dir` is the directory where the egg will be downloaded.
+ `delay` is the number of seconds to pause before an actual download attempt.
+ """
+ import urllib2, shutil
+ egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3])
+ url = download_base + egg_name
+ saveto = os.path.join(to_dir, egg_name)
+ src = dst = None
+ if not os.path.exists(saveto): # Avoid repeated downloads
+ try:
+ from distutils import log
+ if delay:
+ log.warn("""
+---------------------------------------------------------------------------
+This script requires setuptools version %s to run (even to display
+help). I will attempt to download it for you (from
+%s), but
+you may need to enable firewall access for this script first.
+I will start the download in %d seconds.
+
+(Note: if this machine does not have network access, please obtain the file
+
+ %s
+
+and place it in this directory before rerunning this script.)
+---------------------------------------------------------------------------""",
+ version, download_base, delay, url
+ ); from time import sleep; sleep(delay)
+ log.warn("Downloading %s", url)
+ src = urllib2.urlopen(url)
+ # Read/write all in one block, so we don't create a corrupt file
+ # if the download is interrupted.
+ data = _validate_md5(egg_name, src.read())
+ dst = open(saveto,"wb"); dst.write(data)
+ finally:
+ if src: src.close()
+ if dst: dst.close()
+ return os.path.realpath(saveto)
+
+def main(argv, version=DEFAULT_VERSION):
+ """Install or upgrade setuptools and EasyInstall"""
+
+ try:
+ import setuptools
+ except ImportError:
+ import tempfile, shutil
+ tmpdir = tempfile.mkdtemp(prefix="easy_install-")
+ try:
+ egg = download_setuptools(version, to_dir=tmpdir, delay=0)
+ sys.path.insert(0,egg)
+ from setuptools.command.easy_install import main
+ return main(list(argv)+[egg]) # we're done here
+ finally:
+ shutil.rmtree(tmpdir)
+ else:
+ if setuptools.__version__ == '0.0.1':
+ # tell the user to uninstall obsolete version
+ use_setuptools(version)
+
+ req = "setuptools>="+version
+ import pkg_resources
+ try:
+ pkg_resources.require(req)
+ except pkg_resources.VersionConflict:
+ try:
+ from setuptools.command.easy_install import main
+ except ImportError:
+ from easy_install import main
+ main(list(argv)+[download_setuptools(delay=0)])
+ sys.exit(0) # try to force an exit
+ else:
+ if argv:
+ from setuptools.command.easy_install import main
+ main(argv)
+ else:
+ print "Setuptools version",version,"or greater has been installed."
+ print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
+
+
+
+def update_md5(filenames):
+ """Update our built-in md5 registry"""
+
+ import re
+ from md5 import md5
+
+ for name in filenames:
+ base = os.path.basename(name)
+ f = open(name,'rb')
+ md5_data[base] = md5(f.read()).hexdigest()
+ f.close()
+
+ data = [" %r: %r,\n" % it for it in md5_data.items()]
+ data.sort()
+ repl = "".join(data)
+
+ import inspect
+ srcfile = inspect.getsourcefile(sys.modules[__name__])
+ f = open(srcfile, 'rb'); src = f.read(); f.close()
+
+ match = re.search("\nmd5_data = {\n([^}]+)}", src)
+ if not match:
+ print >>sys.stderr, "Internal error!"
+ sys.exit(2)
+
+ src = src[:match.start(1)] + repl + src[match.end(1):]
+ f = open(srcfile,'w')
+ f.write(src)
+ f.close()
+
+
+if __name__=='__main__':
+ if len(sys.argv)>2 and sys.argv[1]=='--md5update':
+ update_md5(sys.argv[2:])
+ else:
+ main(sys.argv[1:])
+
+
+
+
+
View
@@ -67,7 +67,7 @@ def loader(self, value):
def parse(self, source):
"""Function that creates a new parser and parses the source."""
parser = Parser(self, source)
- return parser.parse_page()
+ return parser.parse()
def from_string(self, source):
"""Load a template from a string."""
@@ -87,59 +87,65 @@ def to_unicode(self, value):
except UnicodeError:
return str(value).decode(self.charset, 'ignore')
- def prepare_filter(self, name, *args):
- """
- Prepare a filter.
- """
- try:
- return self.filters[name](*args)
- except KeyError:
- raise FilterNotFound(name)
-
- def apply_filters(self, value, context, filters):
+ def apply_filters(self, value, filtercache, context, filters):
"""
Apply a list of filters on the variable.
"""
- for f in filters:
- value = f(self, context, value)
+ for key in filters:
+ if key in filtercache:
+ func = filtercache[key]
+ else:
+ filtername, args = key
+ if filtername not in self.filters:
+ raise FilterNotFound(filtername)
+ filtercache[key] = func = self.filters[filtername](*args)
+ value = func(self, context, value)
return value
- def perform_test(self, value, context, testname):
+ def perform_test(self, context, testname, value):
"""
Perform a test on a variable.
"""
- try:
- test = self.tests[testname]
- except KeyError:
+ if testname not in self.tests:
raise TestNotFound(testname)
- return bool(test(self, context, value))
+ return bool(self.tests[testname](self, context, value))
def get_attribute(self, obj, name):
"""
Get the attribute name from obj.
"""
- try:
+ if name in obj:
+ return obj[name]
+ elif hasattr(obj, name):
rv = getattr(obj, name)
r = getattr(obj, 'jinja_allowed_attributes', None)
if r is not None:
if name not in r:
raise AttributeError()
return rv
- except AttributeError:
- return obj[name]
- except:
- return Undefined
+ return Undefined
def call_function(self, f, args, kwargs, dyn_args, dyn_kwargs):
"""
- Function call helper
+ Function call helper. Called for all functions that are passed
+ any arguments.
"""
if dyn_args is not None:
- args += dyn_args
+ args += tuple(dyn_args)
elif dyn_kwargs is not None:
kwargs.update(dyn_kwargs)
+ if getattr(f, 'jinja_unsafe_call', False):
+ raise SecurityException('unsafe function %r called' % f.__name__)
return f(*args, **kwargs)
+ def call_function_simple(self, f):
+ """
+ Function call without arguments.
+ """
+ if getattr(f, 'jinja_unsafe_call', False):
+ raise SecurityException('unsafe function %r called' % f.__name__)
+ return f()
+
def finish_var(self, value):
"""
As long as no write_var function is passed to the template
View
@@ -37,12 +37,16 @@ def get_source(self, name, parent=None):
"""
Retrieve the sourcecode of a template.
"""
+ # just ascii chars are allowed as template names
+ name = str(name)
return self.loader.get_source(self.environment, name, parent)
def parse(self, name, parent=None):
"""
Retreive a template and parse it.
"""
+ # just ascii chars are allowed as template names
+ name = str(name)
return self.loader.parse(self.environment, name, parent)
def load(self, name, translator=PythonTranslator):
@@ -51,6 +55,8 @@ def load(self, name, translator=PythonTranslator):
be a template class. The javascript translator for example
will just output a string with the translated code.
"""
+ # just ascii chars are allowed as template names
+ name = str(name)
return self.loader.load(self.environment, name, translator)
Oops, something went wrong.

0 comments on commit de478f6

Please sign in to comment.