From: Justin Lecher Date: Sun, 1 Mar 2015 17:33:09 +0000 (+0000) Subject: Fix py3 support X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=41362eef0c949d6641a0c921f934dee04d47a3d0;p=gentoo.git Fix py3 support Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- diff --git a/dev-python/django-baker/ChangeLog b/dev-python/django-baker/ChangeLog index ae86f4e81710..1776e421393c 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.1 2015/03/01 16:19:00 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django-baker/ChangeLog,v 1.2 2015/03/01 17:33:03 jlec Exp $ + +*django-baker-0.11-r1 (01 Mar 2015) + + 01 Mar 2015; Justin Lecher +django-baker-0.11-r1.ebuild, + +files/django-baker-0.11-py3-backport.patch, -django-baker-0.11.ebuild: + Fix py3 support *django-baker-0.11 (01 Mar 2015) diff --git a/dev-python/django-baker/Manifest b/dev-python/django-baker/Manifest index 74f20b51a7fa..85c2d4194f82 100644 --- a/dev-python/django-baker/Manifest +++ b/dev-python/django-baker/Manifest @@ -1,26 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 +AUX django-baker-0.11-py3-backport.patch 2127 SHA256 6ad6ff8459547917723d82a9ef469fd5e993dca88543954788eb5d516efb6f8b SHA512 bc5785df9258579b3f583f4573e8907f5794f2a09576e91f770fe2e19b74043db1068c493cf0c0d7f448a4d1cbc7774187b474dd3d3c1cf80a1a68e2d4d77c54 WHIRLPOOL 75fcf909cd457e3cd3ca9d77e91926f637e8099547aa980c2e56569511372ab4e13fdd3ad563c55521da89f0057d8dd0440635c8e50bb587413f79afbdbd6984 DIST django-baker-0.11.tar.gz 14920 SHA256 b656577f8234529374251ccf760a0e3e4cda613ea4a19ee17ae87647aeefc364 SHA512 98a64efec8a0cabe9c4091852f3dcbff95007c0ff2020b782f73ab6cc5e3d73cd52356546f1f64b55a69fefdf8f053d95d604584831cf07cb1b8037446892439 WHIRLPOOL 8feddec1f8dd57bdbfe7632c0da998ddaabdc0fb4711a84d9a31b1f0c4db15282311d41db323549a15fefebc41bde605b6f9052c215d756f56968c432529f33a -EBUILD django-baker-0.11.ebuild 629 SHA256 6bd42d8fd98cde08ed9ed41881fe03e43a44de367757a890510fb2a3e4cf8d24 SHA512 95422886f1d048119f74c6bf9ca0a26427b4ec75291740fc833d93d8538b0729e8166b681e24d47883503b3ac8adbc383d57b7b6344c37bbf74c663ebcfe3c53 WHIRLPOOL f1e89cdf041871312d8e8cdd892f925c09b14da791de3c8fdb7c8860f4a40ed0badb5bcba70796aa41bb45c31081e05093ea57fac65e100d8be26b08b29211ca -MISC ChangeLog 370 SHA256 7c50b7b51f239992c2404f6c871a06e680edadfcac26bbf7f7643c35f21dfbc9 SHA512 36c46f0901a6c190530f6f0378586a8d992bacda867fbb0733702b9d5be33a7541f600a422bf2556a5036f4630732a2327dd1ee2d586d3df93cbd9f3a1e664d0 WHIRLPOOL 72d6188f6af549b3297090e9d92dacb4d90dccb6bc6b2d95e093f80c9dd659634509d7a36433cf482434c32f30c54f46e8ca57af85cffd348f88e7e45ae11ee5 +EBUILD django-baker-0.11-r1.ebuild 684 SHA256 61af40918aa58bde3cfb9fdbcf80639f3c49794a8c5bc94f5d58114f9b107ce2 SHA512 af49480ffb388898a41d4ca343046189b25e165771feef966743dd291b588516c197b06204a111d024a7d3fde3a760f447557834875ff3d8f6e66011d5c382af WHIRLPOOL 90a46c03f9b2ec71c43aa5aa3d539255fa16adafe4755a2d0637bc70e04887738d8d8066da2f9d7798435674cbd1d96b2e8744502e47cc0ab6f54bf38531c44d +MISC ChangeLog 577 SHA256 e5ead29beaa86ff72c0c659eb222611c668685f76cc60e6d9f17b89eabebecbc SHA512 5b142a5bb5626c637a23f22773b09c8e024d214e78224c00513024ae957af58b8e6ac97b2b7904d9a79ba17fc2bd0aaa0aadd25656263a75f5814cfa10661f55 WHIRLPOOL 8a40a3e63a6cbca0eb3479809f119268a8dbe17afc70c7c9eb7facff8771eebb8317495d30ec390f1b685cec3eb9d23699a2515146b1d0dc116de6eb4c53548f MISC metadata.xml 236 SHA256 feedd499ae6ddebc364ebb0f38d08bfbcc6b5d499f805a307a9367fb82dd12e8 SHA512 02882c2ecdf4fe400bf3e4455df1feae173e12b6fbb09181ea50541bb9dbf43780a0ab00fa799ccf5b7f2c27dcf9d854e16146cfb336ff3270a7b4369e451860 WHIRLPOOL b6580a9428931142ea961e985e6b5c736ab716eefb85706692c780c11f97d6019be488493c2e2a51b7ae8b480be80276edddb2858fe19684d48df64433475e06 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCgBmBQJU8zv6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCgBmBQJU801UXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC -OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirf+QP/iIg7gVA4ykpMYQzzgdjNVhl -SCvPkvceT6a0fFn/sVyXTb+qHHipoi/CdX60cVGGMLUfb5gbJSPL/eZCLOeKf5O7 -Aeq4mqnHv3UCnKfr5C5q5/i29eL83yNwRsNwCWRSgHw12HvWS+1b9EHaimUiHBi3 -RmVnYYX2mD0g+K3wkDy70nSs3VJaV1ccQFjtIYe4WBnc7AeqTamrXaj2V92Xkk0l -b7CGbbZVizBaXBL1RlwoX8UispGFdNRuJiW+x5Y8d/dYnYSudtWqxEF4qRRxdakl -NTrh2MkYOOqw5PUILl5nx9WJJXy/ZOMkn/A17IcSPZyAH0+IsbHvAvEKLbcHnBE6 -8PDILxeU1Pl/bv52qno00r01h8w/GKl6Lg5Fj1XFtkW5+j5qmZKT1vmr+WwSQOzo -kT7KtifnuyS5bMISNW81j+I18+oLvCm2TabuP2eC0u/nlZe7mW1b8ETrdOsdJrfj -aTFgmk3Tu0oF1sHKRi6xkoc5B2WHyvX2RIRApI+r4M45A2YGaT4ePxmD5tNaLdmt -LBWC208R2Rv1wqiZ6djFC5crzFbdn/crIMDsHhp+i2Gk2lqvdHY/KUO+m9uc7Uys -gYW9HEhJNnQ38bJcDWZRHUByRKVhWX7QfrBb0A5A2A9B12y7HYTUlacRaKpLnJaI -0N1HZ/SLYlGYsHnHTkMn -=3ez1 +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 -----END PGP SIGNATURE----- diff --git a/dev-python/django-baker/django-baker-0.11.ebuild b/dev-python/django-baker/django-baker-0.11-r1.ebuild similarity index 83% rename from dev-python/django-baker/django-baker-0.11.ebuild rename to dev-python/django-baker/django-baker-0.11-r1.ebuild index 2e5b2f1828ac..ed303d9f0f4f 100644 --- a/dev-python/django-baker/django-baker-0.11.ebuild +++ b/dev-python/django-baker/django-baker-0.11-r1.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.ebuild,v 1.1 2015/03/01 16:19:00 jlec Exp $ +# $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 $ EAPI=5 @@ -16,3 +16,7 @@ SLOT="0" LICENSE="BSD" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="" + +PATCHES=( + "${FILESDIR}"/${P}-py3-backport.patch +) diff --git a/dev-python/django-baker/files/django-baker-0.11-py3-backport.patch b/dev-python/django-baker/files/django-baker-0.11-py3-backport.patch new file mode 100644 index 000000000000..b2bc42859c2f --- /dev/null +++ b/dev-python/django-baker/files/django-baker-0.11-py3-backport.patch @@ -0,0 +1,50 @@ +From baf971a58d310d6d3bfe7ddea81b33c810e3d3cf Mon Sep 17 00:00:00 2001 +From: Tim Kamanin +Date: Sat, 21 Feb 2015 18:42:45 +0100 +Subject: [PATCH] Added Python 3 support + +--- + django_baker/bakery.py | 4 ++-- + django_baker/management/commands/bake.py | 3 ++- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/django_baker/bakery.py b/django_baker/bakery.py +index ff04ef3..7c0cbc2 100644 +--- a/django_baker/bakery.py ++++ b/django_baker/bakery.py +@@ -4,7 +4,7 @@ + import re + from django.template.loader import get_template + from django.template import Context +- ++from django.utils.six import iteritems + + class Baker(object): + """ +@@ -16,7 +16,7 @@ def bake(self, apps_and_models): + """ + Iterates a dictionary of apps and models and creates all the necessary files to get up and running quickly. + """ +- for app_label, models in apps_and_models.iteritems(): ++ for app_label, models in iteritems(apps_and_models): + model_names = {model.__name__: self.get_field_names_for_model(model) for model in models} + self.create_directories(app_label) + self.create_init_files(app_label, model_names.keys(), models) +diff --git a/django_baker/management/commands/bake.py b/django_baker/management/commands/bake.py +index e602345..f7dc16a 100644 +--- a/django_baker/management/commands/bake.py ++++ b/django_baker/management/commands/bake.py +@@ -1,3 +1,4 @@ ++from __future__ import print_function + from django.core.management.base import BaseCommand, CommandError + from django.core.exceptions import ImproperlyConfigured + from django.db.models import get_app, get_models +@@ -51,7 +52,7 @@ def get_selected_models(self, app, app_label, model_names): + """ + if model_names: + try: +- print app_label, model_names ++ print(app_label, model_names) + return [get_model(app_label, model_name) for model_name in model_names] + except: + raise CommandError("One or more of the models you entered for %s are incorrect." % app_label)