Backport patch for deprecated functions

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

diff --git a/dev-python/django-tables2/ChangeLog b/dev-python/django-tables2/ChangeLog
index 00728a040ca588da274cabfdfc4bb00398814ecf..8ae9d7e1b338bb5aa3235eb7316457fd847a98c1 100644 (file)
--- a/dev-python/django-tables2/ChangeLog
+++ b/dev-python/django-tables2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/django-tables2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-tables2/ChangeLog,v 1.1 2015/04/08 14:17:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-tables2/ChangeLog,v 1.2 2015/05/08 13:50:06 jlec Exp $
+
+*django-tables2-0.16.0-r1 (08 May 2015)
+
+  08 May 2015; Justin Lecher <jlec@gentoo.org> +django-tables2-0.16.0-r1.ebuild,
+  +files/django-tables2-0.16.0-django-1.9-deprecation.patch:
+  Backport patch for deprecated functions
 
 *django-tables2-0.16.0 (08 Apr 2015)
 

diff --git a/dev-python/django-tables2/Manifest b/dev-python/django-tables2/Manifest
index 970f15cc5897197d238c4fbbbfe934394dfe252f..d4af5f1673c186c3f01929a2d1a43b0a67973301 100644 (file)
--- a/dev-python/django-tables2/Manifest
+++ b/dev-python/django-tables2/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX django-tables2-0.16.0-django-1.9-deprecation.patch 5274 SHA256 93743cbb814dbe10c2efcaca29fc2c759be83b4d0daba1c919bfcc72013f45c0 SHA512 0ecfbc1d5a82a9e8a3b4cbe0770d3c0b76f96335f60cd3c55c0427fa8642c57e3bc0fc4e3d31b16cb259792006203f0f536ab6e064642a63445ed1586166c7be WHIRLPOOL cffb52566481edf089e324553292a53f32be0f9fb73de6ad38feca6be66dce13bf6baf244aa77cef31cc7918bace02de649ed266bcbe93baddddc13d3346ac33
 DIST django-tables2-0.16.0.tar.gz 43672 SHA256 53a643166377c44a030d860f3c0f045c4b75e727432ddde4065a67c2df41bf33 SHA512 9d490bbcaab6049d74e81f25c0a2e1ebd3caa00930877661cc823dcfc429f020b3146ec778ccc840951e89f53047e8d6ad71cf7b689cfb76aa2eadf5db54280a WHIRLPOOL 907acbfb5599589ebf5dc49ebedd0f9e07003df7730a5bcc04667207140d9728fbed56afc08ed25167414bc4596a91e2106958223f5c48b5ccea2c6642b0365e
+EBUILD django-tables2-0.16.0-r1.ebuild 772 SHA256 1e4eb42feafe8e35ddaf05eef1b2d8041efcb1d2909a2b1c3b4e3c6c85986230 SHA512 bb185ac10debbe4fdbdd8f1222697e699bfc20bc53429eb6792edbdc4b21a622e36fe6c8d8252efc623cef7a415fb534f1dbdd122e8c185975f6323f11591ea7 WHIRLPOOL f754fb1fc73f2fb465da30a2b1c492ddde7245528eb67173851bc683f9363247fc0fe3a3db5f7d6084559b7f4bc15541d151ad2a01df725f96ff86039d4e0847
 EBUILD django-tables2-0.16.0.ebuild 707 SHA256 3be856bb461416c75e3a05cafa6261a9e954a362e2815d9469b07c82b318978b SHA512 259a53f29e083d30540db102a9b47c35834628fede780bc449b289006b5a2a6921b17d8c164de9177ca99b611cf6643c78a26511e04bb03a091eab8340652c7e WHIRLPOOL 92aad32f33e98f5478854947deb7a06f18a5ef2ab0f7e29bbb3787ab6d9524398e9270e8efb4afdfcb4e10bd49c280b99fd970063a94d63e1b116751d1e77e08
-MISC ChangeLog 382 SHA256 5f9a82b0f3e02c43dd42dde4ede5401fcd3fa1f713c69e4443d5f6ed4ff54a80 SHA512 0d3302cb8a97fe9c9acf2d01be084914b65ce612edc08b9341808c585ea19bee7d27e515b3f4ec2b290b4b262e93f673eef1fd682ebff2326811041835b9a595 WHIRLPOOL 5c44d2fcc5933df8356095fac9ed37748fa4397df921ab3f42851bd88f0b5a2b9e8802f0a7ba7e08c3591740aa1baef9e38b2f91f512a65e56878f258153a06c
+MISC ChangeLog 608 SHA256 5f89c66c341e9a59096d5784e080e75c3faa3c0df1aefc589bf8c1574fe38eb0 SHA512 f89ae2e42f5bb3268d4d38da7782ff2910d3490dc229622b61858d8380ce5019fd2ef345959012a84d0d7a5fdd8f70eecec563e99e52b5c5debc42a5bbdffda1 WHIRLPOOL 3c67ba7479b6eaef75b38bc5609698d685c2e2e7594a1663507a433f18467f80db88cba45e66893087cefbaba20fa883b2d28c9a255ca73df439131987648487
 MISC metadata.xml 258 SHA256 f9120561eb5a0eb0be48e47772750941e1a206da5fda56321b45eb76fd145ba7 SHA512 adbf77e7b9f35851720e2f9ef564420d0d128c19fd2a72cd4c9f25e0261419d46c1f72c45fc7093a00eb15e551a14742f969157fb3356f8a60b3d31dee38c8c2 WHIRLPOOL 7811fe6099018241061d288dcc1333c7bad35703bb201f921041c7faeeacb03faf748f1d34699afe4e21b1a3f95149fafbbb18633548dfd344fbb736a3ddf495
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVJThvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir9cAP/3qLoiAhNhW4pYtjQClvQoQS
-Tv4wMcEr7IglXBV0j9UUlF62P1dBfojFHGGaB3amZ9li/ujdAYC4plT1M82+Xp8+
-2p/QESsIt8vs9fMXZ8yW3rJg0AEYPUaX7UwtlqNk6hK6GVoNZ83PsbV3ZTxyILWR
-bd24Sj2kiJ9zRJk8Ap4stp7YJAcBO92Jppy1ytI2xdSWX6gd/TPV4NOyPA+4SV/2
-zmtqK+odmuBnoNWO+WkS3NmyR/C8hmuRVWM00IT4mpoXHewjmPRWQ2N9fD3MEEQp
-y0tPf1rG/QzREaAkCMwsEbZwNctTujTLt8w3vdgFuIOU368ynYbYI2LTzgY3G+2O
-mTBUVHsjgLrTUSJsTWlQhwUFzBXubwZQg7ZIlhnmfQY+SOb+HP71TOtzOJ1c/lKU
-8XesgmblJEtpLQK7LrFoQVc2SEEtzTFqRDtEPoQnRbOtsoQW15Np/oGhHIJxpiuS
-p/aBdu8FqRXTNL0WAQq0VFKnasj1Q9X+55YPCDAMvgXk4gRpmTxB4ZR870XGnRwr
-otFNgBpARXUszn1WcXfyCcpzNL5r0R5exDrXuPEL8bgsOWH8W1Wkm8HAmCi1xX4d
-aTyZuwdUY/C8w/Cca59YwKor2Cbl5mu5BOQNNl6Os0j9mnwwyAoiVwGOHQJz+si7
-nXYkOhA6vfJLhpHiDSmM
-=t/cX
+iQJ8BAEBCgBmBQJVTL8PXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiRFwQAKIkGq23rDhNtXDjtKmD7vcO
+EKXnsoIJ3xWZQByP3eTBqr9bcbQXkK2nhFmZeA+EGcPazG96aYvjmVQeRBGVbTFX
+hxkr9MEhc9Bdb3jQ2zxixSbWH51pfthJgvMutqp2lHX8583LA3URC7EEIPuQd8qS
+tXSmXnlQN43rVa4JnzXVq9Sq33JiPgvnn97wJAAXDObQZU8vu6TilF5H6ddidKrN
+5RfC9KyZltftoSEagk/llvKFkARFaMP3NZ0qNtsUd5EFRdt02P/TzPFCEV8pkZEQ
+giq53J3nEL2ICF3vsdmG/aF7Ixj4NV5r3u114rFnwBnnCLIOkEnb4yEw8V5ew6uC
+Vz4t/x/WD7wsGnChc9mFKTDoQ18oSO/lnp1Nnj/BuoUynXdGVem5T0f+y2XUOscH
+Vtht9Y4Zp6SdsdCdB+z+SIJenexdwMaFPU4lHOYYbuEMnGEAnVPfcUImNPs6LsS2
+uuIfY2hhfYAbcI2U+aah5exmmymCuEQbHMnHMV2mFBymR0ZnHbOoxLLGJ3ysi5gI
+SxHqH4zUNrDCUEQvddGn86vCaqZamMMGcXJp87gMlxq2fhSfTq6JdayT9D30Y4nh
+a4j/tgPZSE8UpMV9skHAQewK604ZyU9PENOXWgEBP4bceVXrPHc2mI5bhL62sg1O
+HZzm0UAREYPfFCzFkjig
+=dpR4
 -----END PGP SIGNATURE-----

diff --git a/dev-python/django-tables2/django-tables2-0.16.0-r1.ebuild b/dev-python/django-tables2/django-tables2-0.16.0-r1.ebuild
new file mode 100644 (file)
index 0000000..a0a3d2b
--- /dev/null
+++ b/dev-python/django-tables2/django-tables2-0.16.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-tables2/django-tables2-0.16.0-r1.ebuild,v 1.1 2015/05/08 13:50:06 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Table/data-grid framework for Django"
+HOMEPAGE="https://pypi.python.org/pypi/django-tables2/ https://github.com/bradleyayers/django-tables2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+       dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}"/${P}-django-1.9-deprecation.patch  )

diff --git a/dev-python/django-tables2/files/django-tables2-0.16.0-django-1.9-deprecation.patch b/dev-python/django-tables2/files/django-tables2-0.16.0-django-1.9-deprecation.patch
new file mode 100644 (file)
index 0000000..12460d4
--- /dev/null
+++ b/dev-python/django-tables2/files/django-tables2-0.16.0-django-1.9-deprecation.patch
@@ -0,0 +1,118 @@
+From cb71f869bbc8aac3a14f3d4d1f67641e21892bba Mon Sep 17 00:00:00 2001
+From: Gert Steyn <gert@senseware.com>
+Date: Thu, 19 Mar 2015 12:20:42 +0200
+Subject: [PATCH] Changed from django.utils.datastructures.SortedDict
+ (deprecated) to collections.OrderedDict
+
+---
+ django_tables2/columns/base.py                |  6 +++---
+ django_tables2/tables.py                      | 10 +++++-----
+ django_tables2/templatetags/django_tables2.py |  4 ++--
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/django_tables2/columns/base.py b/django_tables2/columns/base.py
+index 20b3477..3b377e6 100644
+--- a/django_tables2/columns/base.py
++++ b/django_tables2/columns/base.py
+@@ -1,9 +1,9 @@
+ # coding: utf-8
+ from __future__ import absolute_import, unicode_literals
+ from django.db.models.fields import FieldDoesNotExist
+-from django.utils.datastructures import SortedDict
+ from django_tables2.templatetags.django_tables2 import title
+ from django_tables2.utils import A, AttributeDict, OrderBy, OrderByTuple
++from collections import OrderedDict
+ from itertools import islice
+ import six
+ import warnings
+@@ -498,7 +498,7 @@ class BoundColumns(object):
+     A `BoundColumns` object is a container for holding `BoundColumn` objects.
+     It provides methods that make accessing columns easier than if they were
+     stored in a `list` or `dict`. `Columns` has a similar API to a `dict` (it
+-    actually uses a `~django.utils.datastructures.SortedDict` interally).
++    actually uses a `~collections.OrderedDict` interally).
+ 
+     At the moment you'll only come across this class when you access a
+     `.Table.columns` property.
+@@ -508,7 +508,7 @@ class BoundColumns(object):
+     """
+     def __init__(self, table):
+         self.table = table
+-        self.columns = SortedDict()
++        self.columns = OrderedDict()
+         for name, column in six.iteritems(table.base_columns):
+             self.columns[name] = bc = BoundColumn(table, column, name)
+             bc.render = getattr(table, 'render_' + name, column.render)
+diff --git a/django_tables2/tables.py b/django_tables2/tables.py
+index 01a0671..2f31069 100644
+--- a/django_tables2/tables.py
++++ b/django_tables2/tables.py
+@@ -9,9 +9,9 @@
+ import sys
+ from django.core.paginator       import Paginator
+ from django.db.models.fields     import FieldDoesNotExist
+-from django.utils.datastructures import SortedDict
+ from django.template             import RequestContext
+ from django.template.loader      import get_template
++from collections import OrderedDict
+ import six
+ import warnings
+ 
+@@ -172,10 +172,10 @@ def __new__(mcs, name, bases, attrs):
+             if hasattr(base, "base_columns"):
+                 parent_columns = list(base.base_columns.items()) + parent_columns
+         # Start with the parent columns
+-        attrs["base_columns"] = SortedDict(parent_columns)
++        attrs["base_columns"] = OrderedDict(parent_columns)
+         # Possibly add some generated columns based on a model
+         if opts.model:
+-            extra = SortedDict()
++            extra = OrderedDict()
+             # honor Table.Meta.fields, fallback to model._meta.fields
+             if opts.fields:
+                 # Each item in opts.fields is the name of a model field or a
+@@ -194,7 +194,7 @@ def __new__(mcs, name, bases, attrs):
+             attrs["base_columns"].update(extra)
+ 
+         # Explicit columns override both parent and generated columns
+-        attrs["base_columns"].update(SortedDict(cols))
++        attrs["base_columns"].update(OrderedDict(cols))
+         # Apply any explicit exclude setting
+         for exclusion in opts.exclude:
+             if exclusion in attrs["base_columns"]:
+@@ -204,7 +204,7 @@ def __new__(mcs, name, bases, attrs):
+             opts.sequence.expand(attrs["base_columns"].keys())
+             # Table's sequence defaults to sequence declared in Meta
+             #attrs['_sequence'] = opts.sequence
+-            attrs["base_columns"] = SortedDict(((x, attrs["base_columns"][x]) for x in opts.sequence))
++            attrs["base_columns"] = OrderedDict(((x, attrs["base_columns"][x]) for x in opts.sequence))
+ 
+         # set localize on columns
+         for col_name in attrs["base_columns"].keys():
+diff --git a/django_tables2/templatetags/django_tables2.py b/django_tables2/templatetags/django_tables2.py
+index 1e72d74..1ca91de 100644
+--- a/django_tables2/templatetags/django_tables2.py
++++ b/django_tables2/templatetags/django_tables2.py
+@@ -5,12 +5,12 @@
+ from django.template import TemplateSyntaxError, Variable, Node
+ from django.template.loader import get_template, select_template
+ from django.template.defaultfilters import stringfilter, title as old_title
+-from django.utils.datastructures import SortedDict
+ from django.utils.http import urlencode
+ from django.utils.html import escape
+ from django.utils.safestring import mark_safe
+ import django_tables2 as tables
+ from django_tables2.config import RequestConfig
++from collections import OrderedDict
+ import re
+ import six
+ import tokenize
+@@ -35,7 +35,7 @@ def token_kwargs(bits, parser):
+     """
+     if not bits:
+         return {}
+-    kwargs = SortedDict()
++    kwargs = OrderedDict()
+     while bits:
+         match = kwarg_re.match(bits[0])
+         if not match or not match.group(1):