diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-10-28 00:17:25 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-10-28 00:17:25 -0700 |
| commit | 24fb1338cb852950fffdad058cb1d88ef2eec43a (patch) | |
| tree | ba8ca7c8cf55f39737ab88164b89273bef97ca9b /pym/portage/repository/config.py | |
| parent | 0902b4094895a91d6784eab93eb5016987177f04 (diff) | |
| download | portage-24fb1338cb852950fffdad058cb1d88ef2eec43a.tar.gz portage-24fb1338cb852950fffdad058cb1d88ef2eec43a.tar.bz2 portage-24fb1338cb852950fffdad058cb1d88ef2eec43a.zip | |
RepoConfigLoader: python3.2 readfp deprecation
Diffstat (limited to 'pym/portage/repository/config.py')
| -rw-r--r-- | pym/portage/repository/config.py | 11 |
1 files changed, 9 insertions, 2 deletions
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") |