From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 19 Sep 2009 20:14:25 +0000 (-0000)
Subject: Revert accidental changes _unicode_module_wrapper.__getattribute__ from
X-Git-Tag: v2.2_rc41~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=38a8bb241387a446b27ca7ab86410c5be7bb7d9b;p=portage.git

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 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))