From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qst2v-00020i-1w for garchives@archives.gentoo.org; Mon, 15 Aug 2011 09:01:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1BBE21C0D0; Mon, 15 Aug 2011 09:01:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 80FBB21C0D0 for ; Mon, 15 Aug 2011 09:01:12 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D50A11B4082 for ; Mon, 15 Aug 2011 09:01:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DC1C680040 for ; Mon, 15 Aug 2011 09:01:10 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <25f69989d8f27d4e7557f94d684c83e216f8332b.mgorny@gentoo> Subject: [gentoo-commits] proj/gentoopm:master commit in: gentoopm/portagepm/, gentoopm/pkgcorepm/, gentoopm/paludispm/, gentoopm/basepm/ X-VCS-Repository: proj/gentoopm X-VCS-Files: gentoopm/basepm/depend.py gentoopm/paludispm/atom.py gentoopm/paludispm/pkg.py gentoopm/pkgcorepm/atom.py gentoopm/pkgcorepm/pkg.py gentoopm/portagepm/atom.py gentoopm/portagepm/pkg.py X-VCS-Directories: gentoopm/portagepm/ gentoopm/pkgcorepm/ gentoopm/paludispm/ gentoopm/basepm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 25f69989d8f27d4e7557f94d684c83e216f8332b Date: Mon, 15 Aug 2011 09:01:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 485c505d4aee8ace0024c59fff6e3b5d commit: 25f69989d8f27d4e7557f94d684c83e216f8332b Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Mon Aug 15 09:02:19 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Mon Aug 15 09:02:19 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoopm.git;= a=3Dcommit;h=3D25f69989 Split __new__() into __new__()+__init__() in StringCompat subclasses. --- gentoopm/basepm/depend.py | 10 ++++------ gentoopm/paludispm/atom.py | 14 ++++++++------ gentoopm/paludispm/pkg.py | 14 ++++++++------ gentoopm/pkgcorepm/atom.py | 14 ++++++++------ gentoopm/pkgcorepm/pkg.py | 7 ++++--- gentoopm/portagepm/atom.py | 7 ++++--- gentoopm/portagepm/pkg.py | 14 ++++++++------ 7 files changed, 44 insertions(+), 36 deletions(-) diff --git a/gentoopm/basepm/depend.py b/gentoopm/basepm/depend.py index b765445..881c433 100644 --- a/gentoopm/basepm/depend.py +++ b/gentoopm/basepm/depend.py @@ -12,13 +12,11 @@ class PMRequiredUseAtom(StringCompat): An atom for C{REQUIRED_USE} specification. """ =20 - def __new__(self, s): - rua =3D StringCompat.__new__(self, s) - rua._blocks =3D s.startswith('!') - if rua._blocks: + def __init__(self, s): + self._blocks =3D s.startswith('!') + if self._blocks: s =3D s[1:] - rua._flag =3D s - return rua + self._flag =3D s =20 @property def name(self): diff --git a/gentoopm/paludispm/atom.py b/gentoopm/paludispm/atom.py index 71ed9db..d8ee5cf 100644 --- a/gentoopm/paludispm/atom.py +++ b/gentoopm/paludispm/atom.py @@ -13,9 +13,10 @@ _category_wildcard_re =3D re.compile(r'\w') =20 class PaludisPackageKey(PMPackageKey): def __new__(self, key): - k =3D PMPackageKey.__new__(self, str(key)) - k._k =3D key - return k + return PMPackageKey.__new__(self, str(key)) + + def __init__(self, key): + self._k =3D key =20 @property def category(self): @@ -31,9 +32,10 @@ class PaludisIncompletePackageKey(PMIncompletePackageK= ey): =20 class PaludisPackageVersion(PMPackageVersion): def __new__(self, ver): - v =3D PMPackageVersion.__new__(self, str(ver)) - v._v =3D ver - return v + return PMPackageVersion.__new__(self, str(ver)) + + def __init__(self, ver): + self._v =3D ver =20 @property def without_revision(self): diff --git a/gentoopm/paludispm/pkg.py b/gentoopm/paludispm/pkg.py index 9ccfed1..5b19b98 100644 --- a/gentoopm/paludispm/pkg.py +++ b/gentoopm/paludispm/pkg.py @@ -17,11 +17,12 @@ from .depend import PaludisPackageDepSet =20 class PaludisBoundPackageKey(PaludisPackageKey, PMBoundPackageKey): def __new__(self, key, pkg): - k =3D PaludisPackageKey.__new__(self, key) - k._state =3D PMPackageState( + return PaludisPackageKey.__new__(self, key) + + def __init__(self, key, pkg): + self._state =3D PMPackageState( installable =3D isinstance(pkg, PaludisInstallableID), installed =3D isinstance(pkg, PaludisInstalledID)) - return k =20 @property def state(self): @@ -42,9 +43,10 @@ class PaludisPackageDescription(PMPackageDescription): =20 class PaludisChoice(PMUseFlag): def __new__(self, choice): - uf =3D PMUseFlag.__new__(self, str(choice.name_with_prefix)) - uf._c =3D choice - return uf + return PMUseFlag.__new__(self, str(choice.name_with_prefix)) + + def __init__(self, choice): + self._c =3D choice =20 @property def enabled(self): diff --git a/gentoopm/pkgcorepm/atom.py b/gentoopm/pkgcorepm/atom.py index 65892b3..a7e7720 100644 --- a/gentoopm/pkgcorepm/atom.py +++ b/gentoopm/pkgcorepm/atom.py @@ -27,9 +27,10 @@ def _find_res(res, cls): =20 class PkgCorePackageKey(PMPackageKey): def __new__(self, atom): - k =3D PMPackageKey.__new__(self, atom.key) - k._atom =3D atom - return k + return PMPackageKey.__new__(self, atom.key) + + def __init__(self, atom): + self._atom =3D atom =20 @property def category(self): @@ -50,9 +51,10 @@ class PkgCorePackageVersion(PMPackageVersion): def __new__(self, atom): if atom.version is None: raise AssertionError('Empty version in atom') - v =3D PMPackageVersion.__new__(self, atom.fullver) - v._atom =3D atom - return v + return PMPackageVersion.__new__(self, atom.fullver) + + def __init__(self, atom): + self._atom =3D atom =20 @property def without_revision(self): diff --git a/gentoopm/pkgcorepm/pkg.py b/gentoopm/pkgcorepm/pkg.py index d2ca767..8782433 100644 --- a/gentoopm/pkgcorepm/pkg.py +++ b/gentoopm/pkgcorepm/pkg.py @@ -47,9 +47,10 @@ class PkgCorePackageDescription(PMPackageDescription): =20 class PkgCoreUseFlag(PMUseFlag): def __new__(self, s, enabled_use): - uf =3D PMUseFlag.__new__(self, s) - uf._enabled =3D self.name in enabled_use - return uf + return PMUseFlag.__new__(self, s) + + def __init__(self, s, enabled_use): + self._enabled =3D self.name in enabled_use =20 @property def enabled(self): diff --git a/gentoopm/portagepm/atom.py b/gentoopm/portagepm/atom.py index c4f76b7..c9c7874 100644 --- a/gentoopm/portagepm/atom.py +++ b/gentoopm/portagepm/atom.py @@ -29,9 +29,10 @@ class PortageIncompletePackageKey(PMIncompletePackageK= ey, PortagePackageKey): =20 class PortagePackageVersion(PMPackageVersion): def __new__(self, cpv): - v =3D PMPackageVersion.__new__(self, cpv_getversion(cpv)) - v._cpv =3D cpv - return v + return PMPackageVersion.__new__(self, cpv_getversion(cpv)) + + def __init__(self, cpv): + self._cpv =3D cpv =20 @property def without_revision(self): diff --git a/gentoopm/portagepm/pkg.py b/gentoopm/portagepm/pkg.py index 5ad9cb3..1a7661f 100644 --- a/gentoopm/portagepm/pkg.py +++ b/gentoopm/portagepm/pkg.py @@ -29,11 +29,12 @@ class PortageFilteredPackageSet(PortagePackageSet, PM= FilteredPackageSet): =20 class PortageBoundPackageKey(PortagePackageKey, PMBoundPackageKey): def __new__(self, cp, pkg): - k =3D PortagePackageKey.__new__(self, cp) - k._state =3D PMPackageState( + return PortagePackageKey.__new__(self, cp) + + def __init__(self, cp, pkg): + self._state =3D PMPackageState( installable =3D isinstance(pkg, PortageCPV), installed =3D isinstance(pkg, PortageVDBCPV)) - return k =20 @property def state(self): @@ -59,9 +60,10 @@ class PortagePackageDescription(PMPackageDescription): =20 class PortageUseFlag(PMUseFlag): def __new__(self, s, enabled_use): - uf =3D PMUseFlag.__new__(self, s) - uf._enabled =3D self.name in enabled_use - return uf + return PMUseFlag.__new__(self, s) + + def __init__(self, s, enabled_use): + self._enabled =3D self.name in enabled_use =20 @property def enabled(self):