From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 26 Oct 2006 06:39:47 +0000 (-0000)
Subject: Test for basestring instead of types.DictType so that the test more generic.
X-Git-Tag: v2.1.2~549
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=017e1a5720d08133e8edd325bebe4145ed22add4;p=portage.git

Test for basestring instead of types.DictType so that the test more generic.

svn path=/main/trunk/; revision=4820
---

diff --git a/pym/cache/metadata.py b/pym/cache/metadata.py
index a190cb883..df039d5e2 100644
--- a/pym/cache/metadata.py
+++ b/pym/cache/metadata.py
@@ -66,7 +66,7 @@ class database(flat_hash.database):
 			if "INHERITED" in d:
 				d["_eclasses_"] = self.ec.get_eclass_data(d["INHERITED"].split(), from_master_only=True)
 				del d["INHERITED"]
-		elif not isinstance(d["_eclasses_"], types.DictType):
+		elif isinstance(d["_eclasses_"], basestring):
 			# We skip this if flat_hash.database._parse_data() was called above
 			# because it calls reconstruct_eclasses() internally.
 			d["_eclasses_"] = reconstruct_eclasses(None, d["_eclasses_"])