Cleanup python3.3 patch based on feedback from Arfrever.

(Portage version: 2.2.0_alpha176/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

3 files changed, 7 insertions, 65 deletions

diff --git a/dev-python/jinja/ChangeLog b/dev-python/jinja/ChangeLog
index 5516eb5fc87f..994e81f490ca 100644
--- a/dev-python/jinja/ChangeLog
+++ b/dev-python/jinja/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/jinja
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/ChangeLog,v 1.68 2013/05/23 01:17:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/ChangeLog,v 1.69 2013/05/23 01:28:07 floppym Exp $
+
+  23 May 2013; Mike Gilbert <floppym@gentoo.org>
+  files/jinja-2.6-python3.3.patch, jinja-2.6-r2.ebuild:
+  Cleanup python3.3 patch based on feedback from Arfrever.
 
   23 May 2013; Mike Gilbert <floppym@gentoo.org> jinja-2.6-r100.ebuild:
   Don't apply python3.3 patch.
diff --git a/dev-python/jinja/files/jinja-2.6-python3.3.patch b/dev-python/jinja/files/jinja-2.6-python3.3.patch
index 08155f670cd3..29bd38ead6df 100644
--- a/dev-python/jinja/files/jinja-2.6-python3.3.patch
+++ b/dev-python/jinja/files/jinja-2.6-python3.3.patch
@@ -1,62 +1,3 @@
-diff --git a/docs/jinjaext.py b/docs/jinjaext.py
-index 12b5447..8395a55 100644
---- a/docs/jinjaext.py
-+++ b/docs/jinjaext.py
-@@ -8,6 +8,7 @@
-     :copyright: Copyright 2008 by Armin Ronacher.
-     :license: BSD.
- """
-+import collections
- import os
- import re
- import inspect
-@@ -22,6 +23,7 @@ from pygments.style import Style
- from pygments.token import Keyword, Name, Comment, String, Error, \
-      Number, Operator, Generic
- from jinja2 import Environment, FileSystemLoader
-+from jinja2.utils import next
- 
- 
- def parse_rst(state, content_offset, doc):
-@@ -110,10 +112,10 @@ def dump_functions(mapping):
-     def directive(dirname, arguments, options, content, lineno,
-                       content_offset, block_text, state, state_machine):
-         reverse_mapping = {}
--        for name, func in mapping.iteritems():
-+        for name, func in mapping.items():
-             reverse_mapping.setdefault(func, []).append(name)
-         filters = []
--        for func, names in reverse_mapping.iteritems():
-+        for func, names in reverse_mapping.items():
-             aliases = sorted(names, key=lambda x: len(x))
-             name = aliases.pop()
-             filters.append((name, aliases, func))
-@@ -145,9 +147,9 @@ def jinja_nodes(dirname, arguments, options, content, lineno,
-         doc.append(p + '.. autoclass:: %s(%s)' % (node.__name__, sig), '')
-         if node.abstract:
-             members = []
--            for key, name in node.__dict__.iteritems():
-+            for key, name in node.__dict__.items():
-                 if not key.startswith('_') and \
--                   not hasattr(node.__base__, key) and callable(name):
-+                   not hasattr(node.__base__, key) and isinstance(name, collections.Callable):
-                     members.append(key)
-             if members:
-                 members.sort()
-@@ -169,10 +171,10 @@ def inject_toc(app, doctree, docname):
-     titleiter = iter(doctree.traverse(nodes.title))
-     try:
-         # skip first title, we are not interested in that one
--        titleiter.next()
--        title = titleiter.next()
-+        next(titleiter)
-+        title = next(titleiter)
-         # and check if there is at least another title
--        titleiter.next()
-+        next(titleiter)
-     except StopIteration:
-         return
-     tocnode = nodes.section('')
 diff --git a/jinja2/environment.py b/jinja2/environment.py
 index ebb5454..1b5dc40 100644
 --- a/jinja2/environment.py
diff --git a/dev-python/jinja/jinja-2.6-r2.ebuild b/dev-python/jinja/jinja-2.6-r2.ebuild
index fa48b01f1249..e94a984fea96 100644
--- a/dev-python/jinja/jinja-2.6-r2.ebuild
+++ b/dev-python/jinja/jinja-2.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.6-r2.ebuild,v 1.1 2013/04/28 16:14:34 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.6-r2.ebuild,v 1.2 2013/05/23 01:28:07 floppym Exp $
 
 EAPI=5
 
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND}
 # XXX: handle Babel better?
 
 S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}"/${P}-python3.3.patch )
 
 wrap_opts() {
 	local mydistutilsargs=()
@@ -39,10 +40,6 @@ wrap_opts() {
 	"${@}"
 }
 
-python_prepare() {
-	epatch "${FILESDIR}"/${P}-python3.3.patch
-}
-
 python_compile() {
 	wrap_opts distutils-r1_python_compile
 }