From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 085531389E2 for ; Sat, 13 Dec 2014 16:52:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3D9EE0B01; Sat, 13 Dec 2014 16:52:40 +0000 (UTC) Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3470CE0AEE for ; Sat, 13 Dec 2014 16:52:40 +0000 (UTC) Received: by mail-wi0-f180.google.com with SMTP id n3so5317502wiv.7 for ; Sat, 13 Dec 2014 08:52:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:user-agent:mime-version:content-type :content-transfer-encoding:message-id; bh=IdCKsDISqGEDHqzWTCSqbjCZnTFC2lxZkDb193I4sO4=; b=BWA3mYsb6rCHQRa/LlfC/Cy4yW+dwNt+nkZsCxoYsjeenje1IN+CuKuh8/H20Qkjas rz+E872rTPit+3iET0i9dbWZLahaMTjc5Ei3A75JQWHFp7d1lAlgnfFBm2QaLCoD9Oo9 58Jl4yMcqMld503s+D1oQsQ5u0O/gda/rqEAkXLTgtezp2w30IcFIg1F5pL+2wMg2COR XCPX4GQrS1ucOBPK8PzAOY8EzrbAV+y3fAeJ5nhGAm4GfINsGl1g3FtX3hOYXx8VeEBX nCW/KCkRPNnTHPHnteZ6qwETkpuFWQNMhR0JLhE6MPlluAi88lcOr32kR028HoMMWV0Q QIRg== X-Received: by 10.180.76.7 with SMTP id g7mr17809410wiw.38.1418489559001; Sat, 13 Dec 2014 08:52:39 -0800 (PST) Received: from afta-picea.localnet (host-94-251-141-202.dynamic.mm.pl. [94.251.141.202]) by mx.google.com with ESMTPSA id p1sm6140950wjy.22.2014.12.13.08.52.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 13 Dec 2014 08:52:38 -0800 (PST) From: Arfrever Frehtes Taifersar Arahesis X-Google-Original-From: Arfrever Frehtes Taifersar Arahesis To: Gentoo Portage Development Subject: [gentoo-portage-dev] [PATCH] portage.tests.dbapi.test_portdb_cache: Delete deprecated code. Date: Sat, 13 Dec 2014 17:52:21 +0100 User-Agent: KMail (GNU/Linux) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart2219763.BDG03yvryM"; protocol="application/pgp-signature"; micalg=pgp-sha512 Content-Transfer-Encoding: 7bit Message-Id: <201412131752.23014.Arfrever.FTA@gmail.com> X-Archives-Salt: bfe87919-d899-40d7-a335-e424ea3fe7cf X-Archives-Hash: dfcaf4eccdad09ea94504d7705bd9260 --nextPart2219763.BDG03yvryM Content-Type: multipart/mixed; boundary="Boundary-01=_G7GjUUM6Y1jLUKN" Content-Transfer-Encoding: 7bit --Boundary-01=_G7GjUUM6Y1jLUKN Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline [[[ portage.tests.dbapi.test_portdb_cache: Delete deprecated code. 9 calls to deprecated portage.repository.config.RepoConfigLoader.mainRepoLocation() function have been deleted. ]]] -- Arfrever Frehtes Taifersar Arahesis --Boundary-01=_G7GjUUM6Y1jLUKN Content-Type: text/x-patch; charset="utf-8"; name="portage.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline; filename="portage.patch" =2D-- pym/portage/tests/dbapi/test_portdb_cache.py +++ pym/portage/tests/dbapi/test_portdb_cache.py @@ -47,7 +47,7 @@ (lambda: not os.path.exists(md5_cache_dir),), python_cmd + (textwrap.dedent(""" import os, sys, portage =2D if portage.portdb.repositories.mainRepoLocation() in portage.portdb.= _pregen_auxdb: + if portage.portdb.repositories['test_repo'].location in portage.portdb= =2E_pregen_auxdb: sys.exit(1) """),), =20 @@ -56,13 +56,13 @@ (lambda: os.path.exists(md5_cache_dir),), python_cmd + (textwrap.dedent(""" import os, sys, portage =2D if portage.portdb.repositories.mainRepoLocation() not in portage.por= tdb._pregen_auxdb: + if portage.portdb.repositories['test_repo'].location not in portage.po= rtdb._pregen_auxdb: sys.exit(1) """),), python_cmd + (textwrap.dedent(""" import os, sys, portage from portage.cache.flat_hash import md5_database =2D if not isinstance(portage.portdb._pregen_auxdb[portage.portdb.reposi= tories.mainRepoLocation()], md5_database): + if not isinstance(portage.portdb._pregen_auxdb[portage.portdb.reposito= ries['test_repo'].location], md5_database): sys.exit(1) """),), =20 @@ -73,13 +73,13 @@ (lambda: os.path.exists(md5_cache_dir),), python_cmd + (textwrap.dedent(""" import os, sys, portage =2D if portage.portdb.repositories.mainRepoLocation() not in portage.por= tdb._pregen_auxdb: + if portage.portdb.repositories['test_repo'].location not in portage.po= rtdb._pregen_auxdb: sys.exit(1) """),), python_cmd + (textwrap.dedent(""" import os, sys, portage from portage.cache.flat_hash import md5_database =2D if not isinstance(portage.portdb._pregen_auxdb[portage.portdb.reposi= tories.mainRepoLocation()], md5_database): + if not isinstance(portage.portdb._pregen_auxdb[portage.portdb.reposito= ries['test_repo'].location], md5_database): sys.exit(1) """),), =20 @@ -90,13 +90,13 @@ ("cache-formats =3D pms md5-dict", layout_conf_path,)))), (portage_python, "-b", "-Wd", "-Wi::DeprecationWarning", "-c") + (textw= rap.dedent(""" import os, sys, portage =2D if portage.portdb.repositories.mainRepoLocation() not in portage.por= tdb._pregen_auxdb: + if portage.portdb.repositories['test_repo'].location not in portage.po= rtdb._pregen_auxdb: sys.exit(1) """),), (portage_python, "-b", "-Wd", "-Wi::DeprecationWarning", "-c") + (textw= rap.dedent(""" import os, sys, portage from portage.cache.metadata import database as pms_database =2D if not isinstance(portage.portdb._pregen_auxdb[portage.portdb.reposi= tories.mainRepoLocation()], pms_database): + if not isinstance(portage.portdb._pregen_auxdb[portage.portdb.reposito= ries['test_repo'].location], pms_database): sys.exit(1) """),), =20 @@ -105,13 +105,13 @@ (BASH_BINARY, "-c", "rm %s" % portage._shell_quote(layout_conf_path)), python_cmd + (textwrap.dedent(""" import os, sys, portage =2D if portage.portdb.repositories.mainRepoLocation() not in portage.por= tdb._pregen_auxdb: + if portage.portdb.repositories['test_repo'].location not in portage.po= rtdb._pregen_auxdb: sys.exit(1) """),), python_cmd + (textwrap.dedent(""" import os, sys, portage from portage.cache.flat_hash import md5_database =2D if not isinstance(portage.portdb._pregen_auxdb[portage.portdb.reposi= tories.mainRepoLocation()], md5_database): + if not isinstance(portage.portdb._pregen_auxdb[portage.portdb.reposito= ries['test_repo'].location], md5_database): sys.exit(1) """),), ) --Boundary-01=_G7GjUUM6Y1jLUKN-- --nextPart2219763.BDG03yvryM Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCgAGBQJUjG7GAAoJEHgbAhhyXND8WvAP/2dun7DzIr2srsLS/ufUp6z0 JtdivkCguAnBR0/2wMowch+Pp+BA7NyalDO0h1aLkfBDkhxFQWy+4G5A8lMp6HUV 6a4J1DIdTq6rZp2Ao3V3Do3GTSqIXs5EArGtGRFDBycE/pGOJrTiw4VHDaLVIPOY TAdYkjvo8x5hv67GeQYyBiNzEdFardkmycUClETLBE1x77lHmf7B2Q1ICjbYkUmw KocIerEJDrH6LUKpzOy+0VI0MVj/hr+gXBoSUVNtrqttVvM7KSy1H5yZIRkh+GKw OlfNB0dGRSJC6rznBY7VkShOC3wIlG58dVfvq8vEIO+ToYziQBom2FBKY9BEVa1t F8GnF1I3MXcRLqg0m49p4IX7qEwmnl/6nRn8TIWSgujelvbo3XYconqjPPd/1J13 YR8i3tAjCuq+okP+Ucv20LT9oLSJYuu/PkLpFym/zcAw8v8qjz1YRp6O50QE7dJr QD+SF+0CCUpmpSAKjwHhRioEKLz3Qu9BltXcW3gOglq1FAIB/ClMO2GRxd5Cw5Wz LUTuNdkcnIUPIIv5ZfMI7EfjtV8A8iBotJIv1cn7StHXeFTBzcLe45u66F4i0pma 5PPTjJR8zcjGCJ/VVjj5y2VAdTJqd3YkH6b3rtJ5xWFOHu5GcxHwaus07SGRsH0x E1/T8H+16UMF3XIBSWfD =2Fbl -----END PGP SIGNATURE----- --nextPart2219763.BDG03yvryM--