Change file() to open() for bug 413625 by Alexander Brüning. Patch from upstream.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 98 insertions, 5 deletions

diff --git a/dev-python/astng/ChangeLog b/dev-python/astng/ChangeLog
index aea15fb9117f..933115217efd 100644
--- a/dev-python/astng/ChangeLog
+++ b/dev-python/astng/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/astng
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/ChangeLog,v 1.55 2012/04/20 01:41:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/ChangeLog,v 1.56 2012/05/05 15:13:45 floppym Exp $
+
+*astng-0.23.1-r1 (05 May 2012)
+
+  05 May 2012; Mike Gilbert <floppym@gentoo.org> +astng-0.23.1-r1.ebuild,
+  +files/astng-0.23.1-file-open.patch:
+  Change file() to open() for bug 413625 by Alexander Brüning. Patch from
+  upstream.
 
   20 Apr 2012; Mike Gilbert <floppym@gentoo.org> astng-0.23.1.ebuild:
   Rebase ebuild from 0.22.0, restoring python 3 support. Use separate source
diff --git a/dev-python/astng/Manifest b/dev-python/astng/Manifest
index b56a1221dc1c..9991588a6aa8 100644
--- a/dev-python/astng/Manifest
+++ b/dev-python/astng/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX astng-0.23.1-file-open.patch 680 RMD160 51bf5d84b418f73ae3c1e8a24b4c59068f3a7ca7 SHA1 86078ec284ce7d1220d33f10943fa3edebb8954b SHA256 a84773606091b6270960be9545cfc51d8ba5fc226d04d362b66c9757bcccf1a4
 DIST logilab-astng-0.20.3.tar.gz 104537 RMD160 b769e76f5a13d133fc5e031ce038afdd11319f27 SHA1 f5e26182d6dd4cfa9501edd0e7486a2ce3f608d1 SHA256 9bfb6b469a905d89eadfea888397c6cec6cc6f3d521db62145edd7a559afbc37
 DIST logilab-astng-0.21.0.tar.gz 101362 RMD160 a8bb10423267ba402b613c44822b48932f364564 SHA1 fbb8cc9a5f65de35122f3c2f9f61ed909e27ca83 SHA256 4d663d772fa342329137ac502b5a5e6fdb8041d38b7d717819297ef9570fe7ea
 DIST logilab-astng-0.21.1.tar.gz 99399 RMD160 3863bf4242f5cf94de68ba8dce291f70d46a4d63 SHA1 d26083973b540faaa8cde4f93968afa464810f67 SHA256 7bb3000f670ce473c3060081661894942c8bdb38ba9f0d599bf257357e14c7db
@@ -10,13 +11,14 @@ EBUILD astng-0.20.3.ebuild 1932 RMD160 e25f37f7cdcc26e4adc158d23c2dcc60c8b4283a
 EBUILD astng-0.21.0.ebuild 2141 RMD160 fa5804b831b0b2b16e7470ab0f5993ada7423928 SHA1 c16d1c65302397db0340ec9e67d6bcfae8443fbd SHA256 a27f9ae3ae0def5636f7db120ed08ba370e264dbf4b79287a2b2bb081057d432
 EBUILD astng-0.21.1.ebuild 2297 RMD160 a2be0db6e88621d6bdde5227505878884cd46d70 SHA1 302ee3ca9c2b75b3640ca677bff3e7173a040a12 SHA256 97017cbc710c79c11524a811e7be13727ffc2bd536be235c0d21fe37bace3e42
 EBUILD astng-0.22.0.ebuild 1933 RMD160 462598f8b89d5a6d612fac3aba1aede9d08f2909 SHA1 b76600af6a9e51d8f906afd11d83577973d20c7e SHA256 c03e0f262188d17c99871364c4c12c9aef5ce011e86b9c2081f8f0e4bc6e82c1
+EBUILD astng-0.23.1-r1.ebuild 2064 RMD160 ccab8ee4a28eb9e3b1916fe04bb40ea20a6d9bf5 SHA1 a4899c27f4bffeac81e7cd51a03ac3798019d7b4 SHA256 cf987b8570aa16d977fb66be83d57b59de3d6d011e42842e6fbc8f9481c4e243
 EBUILD astng-0.23.1.ebuild 1969 RMD160 beb1e6693ff52966167eb25e5bdf368ab84870c4 SHA1 bcea344961ba8b0e5d536ceff6fb0896880914df SHA256 0ea9ca8bc0b9f5909d6d6fc4cfe47219bbe2cd5f48d20df11610503c2e3d6648
-MISC ChangeLog 7532 RMD160 2ed30a882f66cf6384f9cf280a49a61a489f6d24 SHA1 2ec426c36cf29ac19408ef97f44e4ffa86a9f97c SHA256 40cdd97dfe0f6aedb669f14aa588417a7922a549ed677aa1018519455a79b104
+MISC ChangeLog 7765 RMD160 678470d1e68fd73f067ba56b53a392f3a8c908cc SHA1 3612902f6b6457fbf92a2cf308b02f2bd05cb2b7 SHA256 aa677a9130812edb9d0e3432f029e5521f3230cca00b09142bf996c2f943a732
 MISC metadata.xml 977 RMD160 b282dc87c0058e7da53c827ff043099a5d356eb8 SHA1 a6713710c31c6fa335bd07f747f5c8443ec2640b SHA256 5eb8114b349efc7a2c741eeea56299cd585b687515fb2ec0d37690fabf63e5a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk+QvtIACgkQC77qH+pIQ6SqRwEAnFmn61pMkQcSqYCmT/gC59Rt
-GWUOLO1AlEPyAe9AvsYA/RjAn4Yv78kjIrMV+pT5gEUKXSIeetdjsTEEMYGYItPX
-=SAQf
+iF4EAREIAAYFAk+lQ68ACgkQC77qH+pIQ6QBjgEArWrk3z5KXL9L4JRzxYeuyj1a
+0ST68KgE/MQGfsZQjSYBAKIChtvf5uYWLijJLP+vu/ue5w0EuELeC1YO9Rk+mvU5
+=wCNa
 -----END PGP SIGNATURE-----
diff --git a/dev-python/astng/astng-0.23.1-r1.ebuild b/dev-python/astng/astng-0.23.1-r1.ebuild
new file mode 100644
index 000000000000..3277eb41b604
--- /dev/null
+++ b/dev-python/astng/astng-0.23.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/astng-0.23.1-r1.ebuild,v 1.1 2012/05/05 15:13:45 floppym Exp $
+
+EAPI="4"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_TESTS_RESTRICTED_ABIS="3.* *-jython *-pypy-*"
+
+inherit distutils eutils
+
+DESCRIPTION="Abstract Syntax Tree New Generation for logilab packages"
+HOMEPAGE="http://www.logilab.org/projects/astng/ http://pypi.python.org/pypi/logilab-astng"
+SRC_URI="ftp://ftp.logilab.org/pub/astng/logilab-${P}.tar.gz mirror://pypi/l/logilab-astng/logilab-${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
+IUSE="test"
+
+# Version specified in __pkginfo__.py.
+RDEPEND=">=dev-python/logilab-common-0.53.0"
+DEPEND="${RDEPEND}
+	dev-python/setuptools
+	test? ( >=dev-python/egenix-mx-base-3.0.0 )"
+
+S="${WORKDIR}/logilab-${P}"
+PYTHON_MODNAME="logilab/astng"
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-file-open.patch"
+	distutils_src_prepare
+}
+
+src_test() {
+	testing() {
+		local tpath="${T}/test-${PYTHON_ABI}"
+		local spath="${tpath}$(python_get_sitedir)"
+
+		mkdir -p "${spath}/logilab" || return 1
+		cp -r "$(python_get_sitedir)/logilab/common" "${spath}/logilab" || return 1
+
+		"$(PYTHON)" setup.py build -b build install --root="${tpath}" ||
+			die "Installation for tests failed with $(python_get_implementation_and_version)"
+
+		# pytest uses tests placed relatively to the current directory.
+		pushd "${spath}/logilab/astng" > /dev/null || return 1
+		PYTHONPATH="${spath}" pytest -v || return 1
+		popd > /dev/null || return 1
+	}
+	python_execute_function -s testing
+}
+
+src_install() {
+	distutils_src_install
+
+	deletion_of_unneeded_files() {
+		# Avoid collision with dev-python/logilab-common.
+		rm -f "${ED}$(python_get_sitedir)/logilab/__init__.py" || return 1
+
+		# Don't install tests.
+		rm -fr "${ED}$(python_get_sitedir)/logilab/astng/test" || return 1
+	}
+	python_execute_function -q deletion_of_unneeded_files
+}
diff --git a/dev-python/astng/files/astng-0.23.1-file-open.patch b/dev-python/astng/files/astng-0.23.1-file-open.patch
new file mode 100644
index 000000000000..90decf12c646
--- /dev/null
+++ b/dev-python/astng/files/astng-0.23.1-file-open.patch
@@ -0,0 +1,19 @@
+# HG changeset patch
+# User Sylvain Thénault <sylvain.thenault@logilab.fr>
+# Date 1326988959 -3600
+# Node ID 0272006bdfbee3a0a1447315633bbfeb2f5920e8
+# Parent  b763bb212ddd6df802ec09338f69abfd96917698
+use open rather than file as 2to3 miss it (probably because of the file class attribute)
+
+diff -r b763bb212ddd -r 0272006bdfbe scoped_nodes.py
+--- a/scoped_nodes.py	Thu Dec 08 17:37:40 2011 +0100
++++ b/scoped_nodes.py	Thu Jan 19 17:02:39 2012 +0100
+@@ -246,7 +246,7 @@
+     @property
+     def file_stream(self):
+         if self.file is not None:
+-            return file(self.file)
++            return open(self.file)
+         return None
+ 
+     def block_range(self, lineno):