From 24fb1338cb852950fffdad058cb1d88ef2eec43a Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 28 Oct 2011 00:17:25 -0700
Subject: RepoConfigLoader: python3.2 readfp deprecation

---
 pym/portage/repository/config.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'pym/portage/repository')

diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
index d6a648ea0..06a4d94aa 100644
--- a/pym/portage/repository/config.py
+++ b/pym/portage/repository/config.py
@@ -326,7 +326,14 @@ class RepoConfigLoader(object):
 	def _parse(paths, prepos, ignored_map, ignored_location_map):
 		"""Parse files in paths to load config"""
 		parser = SafeConfigParser()
-		# use readfp in order to control decoding of unicode
+
+		# use read_file/readfp in order to control decoding of unicode
+		try:
+			# Python >=3.2
+			read_file = parser.read_file
+		except AttributeError:
+			read_file = parser.readfp
+
 		for p in paths:
 			f = None
 			try:
@@ -338,7 +345,7 @@ class RepoConfigLoader(object):
 				pass
 			else:
 				try:
-					parser.readfp(f)
+					read_file(f)
 				except ParsingError as e:
 					writemsg(_unicode_decode(
 						_("!!! Error while reading repo config file: %s\n")
-- 
cgit v1.2.3-1-g7c22