diff options
author | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-01-26 20:08:19 +0000 |
---|---|---|
committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-01-26 20:08:19 +0000 |
commit | 0a81b6a4a15b0af1f5abfe265663e7f426cdf2f2 (patch) | |
tree | a4ecc69aca794def394dabf444866046e4b69484 /dev-python | |
parent | old (diff) | |
download | historical-0a81b6a4a15b0af1f5abfe265663e7f426cdf2f2.tar.gz historical-0a81b6a4a15b0af1f5abfe265663e7f426cdf2f2.tar.bz2 historical-0a81b6a4a15b0af1f5abfe265663e7f426cdf2f2.zip |
Delete older ebuilds.
Package-Manager: portage-2.2.0_alpha19_p2/cvs/Linux x86_64
Diffstat (limited to 'dev-python')
-rw-r--r-- | dev-python/django/ChangeLog | 7 | ||||
-rw-r--r-- | dev-python/django/Manifest | 20 | ||||
-rw-r--r-- | dev-python/django/django-1.0.4.ebuild | 107 | ||||
-rw-r--r-- | dev-python/django/django-1.1.2.ebuild | 107 | ||||
-rw-r--r-- | dev-python/django/django-1.2.3.ebuild | 101 | ||||
-rw-r--r-- | dev-python/django/django-1.2.4.ebuild | 96 | ||||
-rw-r--r-- | dev-python/django/files/django-1.2.3-fix_tests.patch | 42 |
7 files changed, 7 insertions, 473 deletions
diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog index 58247276efd5..394cf2c5ff4a 100644 --- a/dev-python/django/ChangeLog +++ b/dev-python/django/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/django # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.60 2011/01/26 19:56:35 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.61 2011/01/26 20:08:18 arfrever Exp $ + + 26 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + -django-1.0.4.ebuild, -django-1.1.2.ebuild, -django-1.2.3.ebuild, + -files/django-1.2.3-fix_tests.patch, -django-1.2.4.ebuild: + Delete. 26 Jan 2011; Christian Faulhammer <fauli@gentoo.org> django-1.2.4-r1.ebuild: diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest index 17a7f06e3b6b..128a4e1165b2 100644 --- a/dev-python/django/Manifest +++ b/dev-python/django/Manifest @@ -1,27 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX django-1.2.3-fix_tests.patch 2323 RMD160 44b1cebe3bbc662be547464b2363b2097efdc3f9 SHA1 66cfc68b2a544714f6102995a595b8737be44700 SHA256 e2b3ec046e8e4a1536a0d13ade78c35ee77504a02e3602fdd1608e82a4b6a337 AUX django-1.2.4-python-2.7.patch 1466 RMD160 5661eb7856dd4690c9a89182a248ea4236362c83 SHA1 11c54fec7aecebb02265991dd9bdd482d547a2df SHA256 7b24df97848bd867b333afc193c779719fd145950bfd50200580c2d1cde21d3b AUX django-1.2.4-ticket-14576.patch 2379 RMD160 55894fdf1d2c6c0e255b7c773b34aa7d0f52789d SHA1 c24debf30e27a709b44f8a350bbd3c14c7c4e3f1 SHA256 4d663ab67309be059394cda8406d344e1f34ccd1c815cd71a8bc56a37bf58808 -DIST Django-1.0.4.tar.gz 5088869 RMD160 9f61455bc4cc0277ddfe4a957863d5995f8c23f3 SHA1 a8b9f33adb007146b8b57f22f0f38467f0d2693a SHA256 a9388a047814bbe356c43d3d2e3afff42b1f93190c86aa4ac72f828a5ef107eb -DIST Django-1.1.2.tar.gz 5748420 RMD160 234ed051b4b0424f8bbd06b7021aaf94c4d185ff SHA1 1d3df9f1f7bbd5ba6334cb3503791a2b290af96e SHA256 5ccea372454536148e603b1a7c010711c25a991ffaf3b2d6ab2034ad05e1ec25 DIST Django-1.1.3.tar.gz 5748608 RMD160 8280e797c071d7a8f227fb416bbddf98fe19f658 SHA1 2b54824a3d9800797935dfd5e3b37653727084cc SHA256 0e5034cf8046ba77c62e95a45d776d2c59998b26f181ceaf5cec516115e3f85a -DIST Django-1.2.3.tar.gz 6306760 RMD160 f412f42c1ab6c4829a7768b988e2db1adc9adb5c SHA1 f65146218ab61bf5efe715db3fc3a177a24fba0d SHA256 cb830f6038b78037647150d977f6cd5cf2bfd731f1788ecf8758a03c213a0f84 DIST Django-1.2.4.tar.gz 6357270 RMD160 e28338a82d662df999a68a4473ed76bd00c974fc SHA1 d8347a9062404de49e2f474e6e99395361f34db8 SHA256 0f06cccd4ca92173b958dd80edff35035888f15554be425e5d6d55c7f94a8381 -EBUILD django-1.0.4.ebuild 2846 RMD160 93856cd111d176d1f1bb0f239c048a693a10d57b SHA1 e160b15aa8e68d29089bb853bc551489c14d00f5 SHA256 ce9b58183b1c72f0808756b55e3199750b5f5ff84f4803022f348f4ad03aa12b -EBUILD django-1.1.2.ebuild 2885 RMD160 4f26f4f012474ae892a16fcc4ae6d3f4049276ef SHA1 99578222e63e1d58eed5799d094f367dc5e24cd0 SHA256 d87c78c6d70b529b5d3bb8fef90e4e8a1a860a8daa61b198dc7a8f03d47faa4a EBUILD django-1.1.3.ebuild 2549 RMD160 65cae1f9c6fb65fddb2641d1356c3d84127ac79f SHA1 36be46c54742e968822f3b8d029e8b12e43e2322 SHA256 553fd8f644c4eefa24b6fbb4c4b2c5dc82c63794805f0563eb1fcf52bffb017a -EBUILD django-1.2.3.ebuild 2782 RMD160 e4f1773bd6d9f37f843f42364eaadc32acf9cd9d SHA1 52b1c0308420710ee069fa100efbf9cba41da70a SHA256 e1dbec5d0aff61c1e68c5d91e3fdcb135005343464320b1429c0b8590ddf1058 EBUILD django-1.2.4-r1.ebuild 2827 RMD160 c26e8c635817da8b6b527d19c1556a68f7f641e8 SHA1 b83341dc52b0725f17630d77fd76170e74ea1503 SHA256 fcf07054f5e6c2623c19633c8ed07bdc86c4922ec111ade9e2ef9b607d904693 -EBUILD django-1.2.4.ebuild 2690 RMD160 f78cc69c6727cfc5f3739b0769c6898b668cb6a7 SHA1 96f41fc52d2c9e6245c3fcfed152c4dc620d4550 SHA256 509a21499c259ed3b49a08321249d6599afa5add303b3f919c5901d3249a4c9b EBUILD django-9999.ebuild 2608 RMD160 8e6086c8322b9e53d109afc0da9f23b101a5446e SHA1 a32603f8985d40a48ce6459239aa2ed313f4b34d SHA256 1ae9d563db7b5bcb47e4f959f35092deecca01fb8c1b627ad41c02f27379d1f4 -MISC ChangeLog 9364 RMD160 34f04eb6c846a6b6e1e7e09da413162c08da967e SHA1 72975bf995e01ce4531480ed128c15e2b4955760 SHA256 bb02ba2810b6934494dddb675e6b1eb9eb355a24893c8a232b942746b0c109ee +MISC ChangeLog 9580 RMD160 0404f8274419c9bf4b03f5776678bf4cc6f26e9d SHA1 4831e1cc22efc94449897a6b774d7c4c590c290e SHA256 53d34057949abe2c34806ea50161c947c7ee6cfdb81623aec20887c54b782c7a MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) - -iEYEARECAAYFAk1AfHkACgkQNQqtfCuFneNJVACeNpcmRx6X7mGzmONI2+xgSkHS -QZcAn27WoqBsvIY5mhxft9YA5MVM1Lj3 -=IkYj ------END PGP SIGNATURE----- diff --git a/dev-python/django/django-1.0.4.ebuild b/dev-python/django/django-1.0.4.ebuild deleted file mode 100644 index 421bfe04c263..000000000000 --- a/dev-python/django/django-1.0.4.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.0.4.ebuild,v 1.4 2010/09/22 19:57:31 arfrever Exp $ - -EAPI="3" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" - -inherit bash-completion distutils webapp - -MY_P="Django-${PV}" - -DESCRIPTION="High-level Python web framework" -HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django" -SRC_URI="http://media.djangoproject.com/releases/${PV}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="doc examples mysql postgres sqlite test" - -RDEPEND="dev-python/imaging - sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) ) - postgres? ( dev-python/psycopg ) - mysql? ( >=dev-python/mysql-python-1.2.1_p2 )" -DEPEND="${RDEPEND} - doc? ( =dev-python/sphinx-0.6* ) - test? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )" - -S="${WORKDIR}/${MY_P}" - -DOCS="docs/* AUTHORS" -WEBAPP_MANUAL_SLOT="yes" - -pkg_setup() { - python_pkg_setup - webapp_pkg_setup -} - -src_compile() { - distutils_src_compile - - if use doc; then - einfo "Generation of documentation" - pushd docs > /dev/null - emake html || die "Generation of documentation failed" - popd > /dev/null - fi -} - -src_test() { - testing() { - cat >> tests/settings.py << __EOF__ -DATABASE_ENGINE='sqlite3' -DATABASE_NAME='test.db' -ROOT_URLCONF='tests/urls.py' -SITE_ID=1 -__EOF__ - # Tests have non-standard assumptions about PYTHONPATH and - # don't work with usual "build-${PYTHON_ABI}/lib". - PYTHONPATH="." "$(PYTHON)" tests/runtests.py --settings=settings -v1 - } - python_execute_function testing -} - -src_install() { - distutils_src_install - - dobashcompletion extras/django_bash_completion - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples - fi - - if use doc; then - rm -fr docs/_build/html/_sources - dohtml -A txt -r docs/_build/html/* - fi - - insinto "${MY_HTDOCSDIR#${EPREFIX}}" - doins -r django/contrib/admin/media/* || die "doins failed" - - webapp_src_install -} - -pkg_preinst() { - : -} - -pkg_postinst() { - bash-completion_pkg_postinst - distutils_pkg_postinst - - einfo "Now, Django has the best of both worlds with Gentoo," - einfo "ease of deployment for production and development." - echo - elog "A copy of the admin media is available to" - elog "webapp-config for installation in a webroot," - elog "as well as the traditional location in python's" - elog "site-packages dir for easy development" - echo - ewarn "If you build Django ${PV} without USE=\"vhosts\"" - ewarn "webapp-config will automatically install the" - ewarn "admin media into the localhost webroot." -} diff --git a/dev-python/django/django-1.1.2.ebuild b/dev-python/django/django-1.1.2.ebuild deleted file mode 100644 index 7ea7cacef4fb..000000000000 --- a/dev-python/django/django-1.1.2.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.2.ebuild,v 1.6 2010/09/22 19:57:31 arfrever Exp $ - -EAPI="3" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" - -inherit bash-completion distutils versionator webapp - -MY_P="Django-${PV}" - -DESCRIPTION="High-level Python web framework" -HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django" -SRC_URI="http://media.djangoproject.com/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="doc examples mysql postgres sqlite test" - -RDEPEND="dev-python/imaging - sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) ) - postgres? ( dev-python/psycopg ) - mysql? ( >=dev-python/mysql-python-1.2.1_p2 )" -DEPEND="${RDEPEND} - doc? ( =dev-python/sphinx-0.6* ) - test? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )" - -S="${WORKDIR}/${MY_P}" - -DOCS="docs/* AUTHORS" -WEBAPP_MANUAL_SLOT="yes" - -pkg_setup() { - python_pkg_setup - webapp_pkg_setup -} - -src_compile() { - distutils_src_compile - - if use doc; then - einfo "Generation of documentation" - pushd docs > /dev/null - emake html || die "Generation of documentation failed" - popd > /dev/null - fi -} - -src_test() { - testing() { - cat >> tests/settings.py << __EOF__ -DATABASE_ENGINE='sqlite3' -DATABASE_NAME='test.db' -ROOT_URLCONF='tests/urls.py' -SITE_ID=1 -__EOF__ - # Tests have non-standard assumptions about PYTHONPATH and - # don't work with usual "build-${PYTHON_ABI}/lib". - PYTHONPATH="." "$(PYTHON)" tests/runtests.py --settings=settings -v1 - } - python_execute_function testing -} - -src_install() { - distutils_src_install - - dobashcompletion extras/django_bash_completion - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples - fi - - if use doc; then - rm -fr docs/_build/html/_sources - dohtml -A txt -r docs/_build/html/* - fi - - insinto "${MY_HTDOCSDIR#${EPREFIX}}" - doins -r django/contrib/admin/media/* || die "doins failed" - - webapp_src_install -} - -pkg_preinst() { - : -} - -pkg_postinst() { - bash-completion_pkg_postinst - distutils_pkg_postinst - - einfo "Now, Django has the best of both worlds with Gentoo," - einfo "ease of deployment for production and development." - echo - elog "A copy of the admin media is available to" - elog "webapp-config for installation in a webroot," - elog "as well as the traditional location in python's" - elog "site-packages dir for easy development" - echo - ewarn "If you build Django ${PV} without USE=\"vhosts\"" - ewarn "webapp-config will automatically install the" - ewarn "admin media into the localhost webroot." -} diff --git a/dev-python/django/django-1.2.3.ebuild b/dev-python/django/django-1.2.3.ebuild deleted file mode 100644 index f10fd263910c..000000000000 --- a/dev-python/django/django-1.2.3.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.2.3.ebuild,v 1.4 2010/10/28 17:09:34 phajdan.jr Exp $ - -EAPI="3" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" - -inherit bash-completion distutils eutils versionator webapp - -MY_P="Django-${PV}" - -DESCRIPTION="High-level Python web framework" -HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django" -SRC_URI="http://media.djangoproject.com/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="doc mysql postgres sqlite test" - -RDEPEND="dev-python/imaging - sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) ) - postgres? ( dev-python/psycopg ) - mysql? ( >=dev-python/mysql-python-1.2.1_p2 )" -DEPEND="${RDEPEND} - doc? ( >=dev-python/sphinx-0.3 ) - test? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )" - -S="${WORKDIR}/${MY_P}" - -DOCS="docs/* AUTHORS" -WEBAPP_MANUAL_SLOT="yes" - -pkg_setup() { - python_pkg_setup - webapp_pkg_setup -} - -src_prepare() { - distutils_src_prepare - epatch "${FILESDIR}/${P}-fix_tests.patch" -} - -src_compile() { - distutils_src_compile - - if use doc; then - einfo "Generation of documentation" - pushd docs > /dev/null - emake html || die "Generation of documentation failed" - popd > /dev/null - fi -} - -src_test() { - testing() { - # Tests have non-standard assumptions about PYTHONPATH and - # don't work with usual "build-${PYTHON_ABI}/lib". - PYTHONPATH="." "$(PYTHON)" tests/runtests.py --settings=test_sqlite -v1 - } - python_execute_function testing -} - -src_install() { - distutils_src_install - - dobashcompletion extras/django_bash_completion - - if use doc; then - rm -fr docs/_build/html/_sources - dohtml -A txt -r docs/_build/html/* || die "dohtml failed" - fi - - insinto "${MY_HTDOCSDIR#${EPREFIX}}" - doins -r django/contrib/admin/media/* || die "doins failed" - - webapp_src_install -} - -pkg_preinst() { - : -} - -pkg_postinst() { - bash-completion_pkg_postinst - distutils_pkg_postinst - - einfo "Now, Django has the best of both worlds with Gentoo," - einfo "ease of deployment for production and development." - echo - elog "A copy of the admin media is available to" - elog "webapp-config for installation in a webroot," - elog "as well as the traditional location in python's" - elog "site-packages dir for easy development" - echo - ewarn "If you build Django ${PV} without USE=\"vhosts\"" - ewarn "webapp-config will automatically install the" - ewarn "admin media into the localhost webroot." -} diff --git a/dev-python/django/django-1.2.4.ebuild b/dev-python/django/django-1.2.4.ebuild deleted file mode 100644 index 721f2a63f10e..000000000000 --- a/dev-python/django/django-1.2.4.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.2.4.ebuild,v 1.1 2010/12/23 14:46:35 arfrever Exp $ - -EAPI="3" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" - -inherit bash-completion distutils versionator webapp - -MY_P="Django-${PV}" - -DESCRIPTION="High-level Python web framework" -HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django" -SRC_URI="http://media.djangoproject.com/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="doc mysql postgres sqlite test" - -RDEPEND="dev-python/imaging - sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) ) - postgres? ( dev-python/psycopg ) - mysql? ( >=dev-python/mysql-python-1.2.1_p2 )" -DEPEND="${RDEPEND} - doc? ( >=dev-python/sphinx-0.3 ) - test? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )" - -S="${WORKDIR}/${MY_P}" - -DOCS="docs/* AUTHORS" -WEBAPP_MANUAL_SLOT="yes" - -pkg_setup() { - python_pkg_setup - webapp_pkg_setup -} - -src_compile() { - distutils_src_compile - - if use doc; then - einfo "Generation of documentation" - pushd docs > /dev/null - emake html || die "Generation of documentation failed" - popd > /dev/null - fi -} - -src_test() { - testing() { - # Tests have non-standard assumptions about PYTHONPATH and - # don't work with usual "build-${PYTHON_ABI}/lib". - PYTHONPATH="." "$(PYTHON)" tests/runtests.py --settings=test_sqlite -v1 - } - python_execute_function testing -} - -src_install() { - distutils_src_install - - dobashcompletion extras/django_bash_completion - - if use doc; then - rm -fr docs/_build/html/_sources - dohtml -A txt -r docs/_build/html/* || die "dohtml failed" - fi - - insinto "${MY_HTDOCSDIR#${EPREFIX}}" - doins -r django/contrib/admin/media/* || die "doins failed" - - webapp_src_install -} - -pkg_preinst() { - : -} - -pkg_postinst() { - bash-completion_pkg_postinst - distutils_pkg_postinst - - einfo "Now, Django has the best of both worlds with Gentoo," - einfo "ease of deployment for production and development." - echo - elog "A copy of the admin media is available to" - elog "webapp-config for installation in a webroot," - elog "as well as the traditional location in python's" - elog "site-packages dir for easy development" - echo - ewarn "If you build Django ${PV} without USE=\"vhosts\"" - ewarn "webapp-config will automatically install the" - ewarn "admin media into the localhost webroot." -} diff --git a/dev-python/django/files/django-1.2.3-fix_tests.patch b/dev-python/django/files/django-1.2.3-fix_tests.patch deleted file mode 100644 index c217c93ad9f5..000000000000 --- a/dev-python/django/files/django-1.2.3-fix_tests.patch +++ /dev/null @@ -1,42 +0,0 @@ -http://code.djangoproject.com/changeset/13750 -http://code.djangoproject.com/changeset/13764 - ---- tests/regressiontests/admin_views/tests.py -+++ tests/regressiontests/admin_views/tests.py -@@ -2206,16 +2206,19 @@ - self.assertContains(response, "<h2>Built-in tags</h2>", count=2) - - # A builtin tag exists in both the index and detail -- self.assertContains(response, '<h3 id="autoescape">autoescape</h3>') -- self.assertContains(response, '<li><a href="#autoescape">autoescape</a></li>') -+ self.assertContains(response, '<h3 id="built_in-autoescape">autoescape</h3>') -+ self.assertContains(response, '<li><a href="#built_in-autoescape">autoescape</a></li>') - - # An app tag exists in both the index and detail -- # The builtin tag group exists -+ self.assertContains(response, '<h3 id="comments-get_comment_count">get_comment_count</h3>') -+ self.assertContains(response, '<li><a href="#comments-get_comment_count">get_comment_count</a></li>') -+ -+ # The admin list tag group exists - self.assertContains(response, "<h2>admin_list</h2>", count=2) - -- # A builtin tag exists in both the index and detail -- self.assertContains(response, '<h3 id="autoescape">autoescape</h3>') -- self.assertContains(response, '<li><a href="#admin_actions">admin_actions</a></li>') -+ # An admin list tag exists in both the index and detail -+ self.assertContains(response, '<h3 id="admin_list-admin_actions">admin_actions</h3>') -+ self.assertContains(response, '<li><a href="#admin_list-admin_actions">admin_actions</a></li>') - - def test_filters(self): - response = self.client.get('/test_admin/admin/doc/filters/') -@@ -2224,8 +2227,8 @@ - self.assertContains(response, "<h2>Built-in filters</h2>", count=2) - - # A builtin filter exists in both the index and detail -- self.assertContains(response, '<h3 id="add">add</h3>') -- self.assertContains(response, '<li><a href="#add">add</a></li>') -+ self.assertContains(response, '<h3 id="built_in-add">add</h3>') -+ self.assertContains(response, '<li><a href="#built_in-add">add</a></li>') - - except ImportError: - pass |