[Python-modules-commits] [jinja2] 01/06: Import jinja2_2.9.6.orig.tar.gz

[Piotr Ożarowski]

This is an automated email from the git hooks/post-receive script.

piotr pushed a commit to branch master
in repository jinja2.

commit 687f65cdfdb4c171c027cef56cbb7adc3d2046b5
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Tue Jun 20 15:21:13 2017 +0200

    Import jinja2_2.9.6.orig.tar.gz
---
 CHANGES                  | 6 ++++++
 Jinja2.egg-info/PKG-INFO | 2 +-
 PKG-INFO                 | 2 +-
 docs/api.rst             | 2 +-
 jinja2/__init__.py       | 2 +-
 jinja2/runtime.py        | 4 +++-
 setup.cfg                | 4 ----
 setup.py                 | 2 +-
 8 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/CHANGES b/CHANGES
index fb14601..967b40a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,12 @@
 Jinja2 Changelog
 ================
 
+Version 2.9.6
+-------------
+(bugfix release, released on April 3rd 2017)
+
+- Fixed custom context behavior in fast resolve mode (#675)
+
 Version 2.9.5
 -------------
 (bugfix release, released on January 28th 2017)
diff --git a/Jinja2.egg-info/PKG-INFO b/Jinja2.egg-info/PKG-INFO
index 0dcd123..5e763fb 100644
--- a/Jinja2.egg-info/PKG-INFO
+++ b/Jinja2.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Jinja2
-Version: 2.9.5
+Version: 2.9.6
 Summary: A small but fast and easy to use stand-alone template engine written in pure python.
 Home-page: http://jinja.pocoo.org/
 Author: Armin Ronacher
diff --git a/PKG-INFO b/PKG-INFO
index 0dcd123..5e763fb 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Jinja2
-Version: 2.9.5
+Version: 2.9.6
 Summary: A small but fast and easy to use stand-alone template engine written in pure python.
 Home-page: http://jinja.pocoo.org/
 Author: Armin Ronacher
diff --git a/docs/api.rst b/docs/api.rst
index 443d053..bbe6c36 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -742,7 +742,7 @@ enabled::
         return result
 
 Context filters work the same just that the first argument is the current
-active :class:`Context` rather then the environment.
+active :class:`Context` rather than the environment.
 
 
 .. _eval-context:
diff --git a/jinja2/__init__.py b/jinja2/__init__.py
index 2662818..4b0b7a8 100644
--- a/jinja2/__init__.py
+++ b/jinja2/__init__.py
@@ -27,7 +27,7 @@
     :license: BSD, see LICENSE for more details.
 """
 __docformat__ = 'restructuredtext en'
-__version__ = '2.9.5'
+__version__ = '2.9.6'
 
 # high level interface
 from jinja2.environment import Environment, Template
diff --git a/jinja2/runtime.py b/jinja2/runtime.py
index 2443001..00d5f03 100644
--- a/jinja2/runtime.py
+++ b/jinja2/runtime.py
@@ -11,6 +11,8 @@
 import sys
 
 from itertools import chain
+from types import MethodType
+
 from jinja2.nodes import EvalContext, _context_function_types
 from jinja2.utils import Markup, soft_unicode, escape, missing, concat, \
      internalcode, object_type_repr, evalcontextfunction
@@ -167,7 +169,7 @@ class Context(with_metaclass(ContextMeta)):
         # In case we detect the fast resolve mode we can set up an alias
         # here that bypasses the legacy code logic.
         if self._fast_resolve_mode:
-            self.resolve_or_missing = resolve_or_missing
+            self.resolve_or_missing = MethodType(resolve_or_missing, self)
 
     def super(self, name, current):
         """Render a parent block."""
diff --git a/setup.cfg b/setup.cfg
index e143b99..24864d9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,14 +4,10 @@ universal = 1
 [metadata]
 license_file = LICENSE
 
-[aliases]
-release = egg_info -RDb ''
-
 [tool:pytest]
 norecursedirs = .* *.egg *.egg-info env* artwork docs examples venv*
 
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 
diff --git a/setup.py b/setup.py
index 391c140..127bc21 100644
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@ from setuptools import setup
 
 setup(
     name='Jinja2',
-    version='2.9.5',
+    version='2.9.6',
     url='http://jinja.pocoo.org/',
     license='BSD',
     author='Armin Ronacher',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/jinja2.git