Fix compatibility for py3

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 68 insertions, 18 deletions

diff --git a/dev-python/django-baker/ChangeLog b/dev-python/django-baker/ChangeLog
index 1776e421393c..9a6712c71afa 100644
--- a/dev-python/django-baker/ChangeLog
+++ b/dev-python/django-baker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/django-baker
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-baker/ChangeLog,v 1.2 2015/03/01 17:33:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-baker/ChangeLog,v 1.3 2015/03/07 09:52:53 jlec Exp $
+
+*django-baker-0.11-r2 (07 Mar 2015)
+
+  07 Mar 2015; Justin Lecher <jlec@gentoo.org> +django-baker-0.11-r2.ebuild,
+  +files/django-baker-0.11-py3-iter.patch, -django-baker-0.11-r1.ebuild:
+  Fix compatibility for py3
 
 *django-baker-0.11-r1 (01 Mar 2015)
 
diff --git a/dev-python/django-baker/Manifest b/dev-python/django-baker/Manifest
index 85c2d4194f82..721872638630 100644
--- a/dev-python/django-baker/Manifest
+++ b/dev-python/django-baker/Manifest
@@ -2,26 +2,27 @@
 Hash: SHA512
 
 AUX django-baker-0.11-py3-backport.patch 2127 SHA256 6ad6ff8459547917723d82a9ef469fd5e993dca88543954788eb5d516efb6f8b SHA512 bc5785df9258579b3f583f4573e8907f5794f2a09576e91f770fe2e19b74043db1068c493cf0c0d7f448a4d1cbc7774187b474dd3d3c1cf80a1a68e2d4d77c54 WHIRLPOOL 75fcf909cd457e3cd3ca9d77e91926f637e8099547aa980c2e56569511372ab4e13fdd3ad563c55521da89f0057d8dd0440635c8e50bb587413f79afbdbd6984
+AUX django-baker-0.11-py3-iter.patch 1820 SHA256 3f38e4539ab2e87cefec42649a92778fa5b441e0c8cfe579ac7c10763584ca72 SHA512 d20fbb4ae9de91c3af36a902a5600f3f4dbaae82e7c33285f157fc3a40cc416e3fd2ce0a453e6138d7381fdbe1834694eacb2214a49b9528dc0c8b26e5ac5f47 WHIRLPOOL 61c75a1a52ad9d6ef8545f30ce88c69db884b9f9748d590ce30ba7b291be8296a94e4a067a09fc2a7a97610951b39c5a2b650993a646c3a2fcf6da51b3c74805
 DIST django-baker-0.11.tar.gz 14920 SHA256 b656577f8234529374251ccf760a0e3e4cda613ea4a19ee17ae87647aeefc364 SHA512 98a64efec8a0cabe9c4091852f3dcbff95007c0ff2020b782f73ab6cc5e3d73cd52356546f1f64b55a69fefdf8f053d95d604584831cf07cb1b8037446892439 WHIRLPOOL 8feddec1f8dd57bdbfe7632c0da998ddaabdc0fb4711a84d9a31b1f0c4db15282311d41db323549a15fefebc41bde605b6f9052c215d756f56968c432529f33a
-EBUILD django-baker-0.11-r1.ebuild 684 SHA256 61af40918aa58bde3cfb9fdbcf80639f3c49794a8c5bc94f5d58114f9b107ce2 SHA512 af49480ffb388898a41d4ca343046189b25e165771feef966743dd291b588516c197b06204a111d024a7d3fde3a760f447557834875ff3d8f6e66011d5c382af WHIRLPOOL 90a46c03f9b2ec71c43aa5aa3d539255fa16adafe4755a2d0637bc70e04887738d8d8066da2f9d7798435674cbd1d96b2e8744502e47cc0ab6f54bf38531c44d
-MISC ChangeLog 577 SHA256 e5ead29beaa86ff72c0c659eb222611c668685f76cc60e6d9f17b89eabebecbc SHA512 5b142a5bb5626c637a23f22773b09c8e024d214e78224c00513024ae957af58b8e6ac97b2b7904d9a79ba17fc2bd0aaa0aadd25656263a75f5814cfa10661f55 WHIRLPOOL 8a40a3e63a6cbca0eb3479809f119268a8dbe17afc70c7c9eb7facff8771eebb8317495d30ec390f1b685cec3eb9d23699a2515146b1d0dc116de6eb4c53548f
+EBUILD django-baker-0.11-r2.ebuild 719 SHA256 beb68797393aae7909fdc10c014bb021c9e4fccb461c5497788454a2218b39df SHA512 31b210a6d9f0b9174850380fc7e6475199d6bee34605a232469f54c458e18e8b982cef28e49c0b2a7b4f4239b719b5ab8e92d168025937cd2c7b7fbf9da1d37e WHIRLPOOL c6ff7ed8b71ecb81a686eaa0ebaab84df1cee99cfe9685156be431d5db2027f0632dab88bbaa3d8a4ed31aa0ff3598bd37c590ce841abecfc4bd50e6cb0f7806
+MISC ChangeLog 793 SHA256 89f130bb8d441e6bdb21657e0bc3f2a7eb4605b9c713d209f65d1373c9ab3145 SHA512 c5069783e6fb67646ad5a8f4f35a2228af1f4c5a6863e6fb433f0aaaa82e92db2337a36156b912cf6af19c794e9467d958b94eb11526513b76809e9e47010c81 WHIRLPOOL e84cb704a28289113eb44c67aefa9bfcc300f4416825b760f864432d5b106a965766550b9a7a94c38af2c0bc4c2186db08c75c348618209f947bbada96db6224
 MISC metadata.xml 236 SHA256 feedd499ae6ddebc364ebb0f38d08bfbcc6b5d499f805a307a9367fb82dd12e8 SHA512 02882c2ecdf4fe400bf3e4455df1feae173e12b6fbb09181ea50541bb9dbf43780a0ab00fa799ccf5b7f2c27dcf9d854e16146cfb336ff3270a7b4369e451860 WHIRLPOOL b6580a9428931142ea961e985e6b5c736ab716eefb85706692c780c11f97d6019be488493c2e2a51b7ae8b480be80276edddb2858fe19684d48df64433475e06
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJU801UXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJU+sp5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirL1oP/RVq6l9YzXT6HqUYE0VW+2xM
-gJVzZ5CqepXZo5GQ0S+igB7pG1487R6Anxs+zMmUpisYjH6PAmrIwoP3C1wBjIV2
-wOIdpspyqlqFFUKfY10OoXbgcUCPFhtDfhFfPUWfR8hx7w20MOQASgS3BmjPr4by
-ItXRIRHvCHYB9jDFi64IakiL2C+uopmOoEAkICrjqGGv4Rd5dIsT0HOS8cZM3NQ5
-mCM3cT3Th//zsqTRQNgMqnSLbd8U8dKlxkFsGymoF4IINeeX6jP5eLR6avnS5jKk
-DJZJl8hideynn7tpmf9FsKqWDCkn714wJW6fYFgCwv1c0HCjfMCl/CM6cHW4KMpy
-VHoLHBymCV7MTzDKutob6ajsEwMSo0rlr7iUuhDUls033vxNTT60wDgKrj0eaAA3
-EyB4nB1ZEC6doUMENrsjvRFEeVabaNIEw1azhUbthOunK40sZ51EiZwevxCpu0oy
-5mBewSv+KovpDbwuOMSuwmiaAYwXLU7BCEawf0sw0L+lVO0g8Mz1a+x6CgJx+BBJ
-Cttn0Ka0mpCKSc1UGb8rcG1emwKalvVS35UwbQZrQZn4xVRKJyPxV/hYBbdT59I4
-Mt8zFyPvoPFM8rYIqIzHhXd7yqGCVJxVZ9c2rN1Q9OM3M0R6TF22ejRVJxQDIk+q
-DwkgiyVjJ+/3YwnrHLgp
-=OF7G
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirNRsP/2ayZxhHHQ1dmcjTgJvSyKuo
+yL5fwPNGvlrnTbO0HiyBuz14b3Y8xTNSNSNw7DAkJACq3G5L3rFEeC0uuvlewgge
+unY2dcwOVjtNt9o2BkwAjEp5bNcKOw1pxiMQ1eLcjf04OycJ+p3xts5qkmSjoaf7
+gmS/hkUV5yRhkA0o2OX7FKNKkZbQRnNWGmh6s437PC/cPov6tkuN9XoZ9u0csmOV
+Byn43eayCWRjY4ZOW0TDZd7M3KH+bMejRUk+8sfM5p5hDNADCMyVqN/yVzWxm54j
+m+zSRdGBFTehvTQLm+MKDMCqnJGXSvs0TWq9yRjASkSUI3gAI98h4FrgDfoDZZTO
+XKAJN7sMh53WflktQDDKDCpV5Xlv3f3p9dup0FidD5FmMrqoWjRDBkZFWSHrDSmr
+Vb4APb1Ayl2aF4smpV0XRurRhVjsZxvnVBLJu0i/c5gcL9R7yao549ApdUhxHXWg
+TbfLqlGWdlxYYUHQ2fsnMvq4nhzeaPd8MV+YoqI/9BSTtZFlC3wTw/kty0umypOo
+YgpdrDy9MUNHB0IslsipvYbQj373MkK/t9ejZLzcZSC672WwCDERhpSKqMkD/Uun
+F6MA3IkuWoooT0QflXTLCb+4vtEE4+CFTFsnbMEbYO+Eftu6pUF/xHDS04KCzclW
+Tn/19dY4hube5RPTRnP1
+=b4L6
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django-baker/django-baker-0.11-r1.ebuild b/dev-python/django-baker/django-baker-0.11-r2.ebuild
index ed303d9f0f4f..103750d62222 100644
--- a/dev-python/django-baker/django-baker-0.11-r1.ebuild
+++ b/dev-python/django-baker/django-baker-0.11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-baker/django-baker-0.11-r1.ebuild,v 1.1 2015/03/01 17:33:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-baker/django-baker-0.11-r2.ebuild,v 1.1 2015/03/07 09:52:53 jlec Exp $
 
 EAPI=5
 
@@ -19,4 +19,5 @@ IUSE=""
 
 PATCHES=(
 	"${FILESDIR}"/${P}-py3-backport.patch
+	"${FILESDIR}"/${P}-py3-iter.patch
 )
diff --git a/dev-python/django-baker/files/django-baker-0.11-py3-iter.patch b/dev-python/django-baker/files/django-baker-0.11-py3-iter.patch
new file mode 100644
index 000000000000..a2902b8f487d
--- /dev/null
+++ b/dev-python/django-baker/files/django-baker-0.11-py3-iter.patch
@@ -0,0 +1,42 @@
+From c6c856c999cb9a9ce4ec8ecee714da7f6719019d Mon Sep 17 00:00:00 2001
+From: Matt Clement <mclement@savantgroup.com>
+Date: Tue, 3 Mar 2015 14:57:41 -0500
+Subject: [PATCH] Switch iteritems to items for Py3 compatibility
+
+---
+ django_baker/templates/django_baker/__init__urls | 2 +-
+ django_baker/templates/django_baker/forms        | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/django_baker/templates/django_baker/__init__urls b/django_baker/templates/django_baker/__init__urls
+index 1baf063..d6c9bec 100644
+--- a/django_baker/templates/django_baker/__init__urls
++++ b/django_baker/templates/django_baker/__init__urls
+@@ -1,6 +1,6 @@
+ from django.conf.urls import patterns, include
+ 
+ urlpatterns = patterns('',
+-{% for model_name_slug, plural_model_name_slug in model_names_dict.iteritems %}
++{% for model_name_slug, plural_model_name_slug in model_names_dict.items %}
+     (r'^{{ plural_model_name_slug }}/', include('{{ app_label }}.urls.{{ model_name_slug }}_urls')),{% if forloop.first %}  # NOQA{% endif %}{% endfor %}
+ )
+diff --git a/django_baker/templates/django_baker/forms b/django_baker/templates/django_baker/forms
+index 1f55c86..a21234d 100644
+--- a/django_baker/templates/django_baker/forms
++++ b/django_baker/templates/django_baker/forms
+@@ -1,7 +1,7 @@
+ from django import forms
+ from .models import {{ model_names|join:", " }}
+ 
+-{% for model_name, model_fields in model_names.iteritems %}
++{% for model_name, model_fields in model_names.items %}
+ class {{ model_name }}Form(forms.ModelForm):
+ 
+     class Meta:
+@@ -36,4 +36,4 @@ class {{ model_name }}Form(forms.ModelForm):
+     def save(self, commit=True):
+         return super({{ model_name }}Form, self).save(commit)
+ {% if not forloop.last %}
+-{% endif %}{% endfor %}
+\ No newline at end of file
++{% endif %}{% endfor %}