From 36a91804330dca702f9d924bfa2ca98c00deb7c6 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 20 Jun 2008 14:37:49 +0000 Subject: Instead of having Atom inherit from str, just emulate the interface. This allows us to define __slots__ (not allowed when inheriting from str) and therefore should conserve some memory by avoiding a __dict__ attribute on every Atom. svn path=/main/trunk/; revision=10740 --- pym/portage/dep.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pym/portage/dep.py b/pym/portage/dep.py index df6bdfd3e..03f428495 100644 --- a/pym/portage/dep.py +++ b/pym/portage/dep.py @@ -392,12 +392,25 @@ class _use_dep(object): tokens.extend(self.conditional_disabled.difference(use)) return _use_dep(tokens) -class Atom(str): +class Atom(object): + + """ + For compatibility with existing atom string manipulation code, this + class emulates most of the str methods that are useful with atoms. + """ + + _str_methods = ("endswith", "find", "index", "lstrip", "replace", + "startswith", "strip", "rindex", "rfind", "rstrip", "__getitem__", + "__len__", "__repr__", "__str__") + + __slots__ = ("__weakref__", "blocker", "cp", "cpv", "operator", + "slot", "string", "use") + _str_methods def __init__(self, s): - str.__init__(self, s) if not isvalidatom(s, allow_blockers=True): raise InvalidAtom(s) + for x in self._str_methods: + setattr(self, x, getattr(s, x)) self.blocker = "!" == s[:1] if self.blocker: s = s[1:] -- cgit v1.2.3-1-g7c22