Revert accidental changes _unicode_module_wrapper.__getattribute__ from

previous commit.

svn path=/main/trunk/; revision=14284

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index e84165041471ef632fc572dce8ac26a234259858..3ea8b3b72872fd40ec363b050d70b1ba3ce9fd17 100644 (file)
--- 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))