diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2011-09-13 23:52:05 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2011-09-13 23:52:05 +0000 |
| commit | c449666aad0f99a9a724a965bf9e3d80b0e6b036 (patch) | |
| tree | c01088267b313d037596e18aa0d11eed0c059267 /dev-python/werkzeug | |
| parent | whitespace (diff) | |
| download | gentoo-2-c449666aad0f99a9a724a965bf9e3d80b0e6b036.tar.gz gentoo-2-c449666aad0f99a9a724a965bf9e3d80b0e6b036.tar.bz2 gentoo-2-c449666aad0f99a9a724a965bf9e3d80b0e6b036.zip | |
Fix syntax error with python2.4, bug 382761
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/werkzeug')
| -rw-r--r-- | dev-python/werkzeug/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-python/werkzeug/files/werkzeug-0.7.1-py24.patch | 22 | ||||
| -rw-r--r-- | dev-python/werkzeug/werkzeug-0.7.1-r1.ebuild (renamed from dev-python/werkzeug/werkzeug-0.7.1.ebuild) | 10 |
3 files changed, 37 insertions, 3 deletions
diff --git a/dev-python/werkzeug/ChangeLog b/dev-python/werkzeug/ChangeLog index 9555e59939e7..44599a9530b1 100644 --- a/dev-python/werkzeug/ChangeLog +++ b/dev-python/werkzeug/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-python/werkzeug # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/ChangeLog,v 1.25 2011/07/28 19:05:51 rafaelmartins Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/ChangeLog,v 1.26 2011/09/13 23:52:05 floppym Exp $ + +*werkzeug-0.7.1-r1 (13 Sep 2011) + + 13 Sep 2011; Mike Gilbert <floppym@gentoo.org> -werkzeug-0.7.1.ebuild, + +werkzeug-0.7.1-r1.ebuild, +files/werkzeug-0.7.1-py24.patch: + Fix syntax error with python2.4, bug 382761 *werkzeug-0.7.1 (28 Jul 2011) diff --git a/dev-python/werkzeug/files/werkzeug-0.7.1-py24.patch b/dev-python/werkzeug/files/werkzeug-0.7.1-py24.patch new file mode 100644 index 000000000000..2b0e334e6e9f --- /dev/null +++ b/dev-python/werkzeug/files/werkzeug-0.7.1-py24.patch @@ -0,0 +1,22 @@ +commit 5a3888cea7a40c7260e1994530a46977810459e7 +Author: Mike Gilbert <floppymaster@gmail.com> +Date: Tue Sep 13 19:24:09 2011 -0400 + + werkzeug/contrib/cache.py: Fix for python2.4 + +diff --git a/werkzeug/contrib/cache.py b/werkzeug/contrib/cache.py +index 7a68cb8..b0a89fd 100644 +--- a/werkzeug/contrib/cache.py ++++ b/werkzeug/contrib/cache.py +@@ -79,8 +79,9 @@ def _items(mappingorseq): + ... assert k*k == v + + """ +- return mappingorseq.iteritems() if hasattr(mappingorseq, 'iteritems') \ +- else mappingorseq ++ if hasattr(mappingorseq, 'iteritems'): ++ return mappingorseq.iteritems() ++ return mappingorseq + + class BaseCache(object): + """Baseclass for the cache systems. All the cache systems implement this diff --git a/dev-python/werkzeug/werkzeug-0.7.1.ebuild b/dev-python/werkzeug/werkzeug-0.7.1-r1.ebuild index 9d980191ea9f..dc3daa2060d5 100644 --- a/dev-python/werkzeug/werkzeug-0.7.1.ebuild +++ b/dev-python/werkzeug/werkzeug-0.7.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/werkzeug-0.7.1.ebuild,v 1.1 2011/07/28 19:05:51 rafaelmartins Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/werkzeug-0.7.1-r1.ebuild,v 1.1 2011/09/13 23:52:05 floppym Exp $ EAPI="3" PYTHON_DEPEND="2" @@ -8,7 +8,7 @@ SUPPORT_PYTHON_ABIS="1" RESTRICT_PYTHON_ABIS="3.*" DISTUTILS_SRC_TEST="nosetests" -inherit distutils +inherit distutils eutils MY_PN="Werkzeug" MY_P="${MY_PN}-${PV}" @@ -30,6 +30,12 @@ S="${WORKDIR}/${MY_P}" DOCS="CHANGES" +src_prepare() { + # Bug 382761: Fix syntax error with python2.4 + epatch "${FILESDIR}/${P}-py24.patch" + distutils_src_prepare +} + src_test() { distutils_src_test -e '^test_app$' tests tests/contrib } |