diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-09-19 20:14:25 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-09-19 20:14:25 +0000 |
| commit | 38a8bb241387a446b27ca7ab86410c5be7bb7d9b (patch) | |
| tree | 8abf3fb68b5fa4c0e6b4a2153c8acdf99e3209dd | |
| parent | d85e2123491fd84414b8d071de986d249ac194d9 (diff) | |
| download | portage-38a8bb241387a446b27ca7ab86410c5be7bb7d9b.tar.gz portage-38a8bb241387a446b27ca7ab86410c5be7bb7d9b.tar.bz2 portage-38a8bb241387a446b27ca7ab86410c5be7bb7d9b.zip | |
Revert accidental changes _unicode_module_wrapper.__getattribute__ from
previous commit.
svn path=/main/trunk/; revision=14284
| -rw-r--r-- | pym/portage/__init__.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index e84165041..3ea8b3b72 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -213,10 +213,10 @@ class _unicode_module_wrapper(object): object.__setattr__(self, '_encoding', encoding) object.__setattr__(self, '_overrides', overrides) - def __getattr__(self, attr): - result = getattr(self._mod, attr) - encoding = self._encoding - overrides = self._overrides + def __getattribute__(self, attr): + result = getattr(object.__getattribute__(self, '_mod'), attr) + encoding = object.__getattribute__(self, '_encoding') + overrides = object.__getattribute__(self, '_overrides') override = None if overrides is not None: override = overrides.get(id(result)) |