diff options
Diffstat (limited to 'lib/portage/env/loaders.py')
| -rw-r--r-- | lib/portage/env/loaders.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/portage/env/loaders.py b/lib/portage/env/loaders.py index 284c311a1..81386fd32 100644 --- a/lib/portage/env/loaders.py +++ b/lib/portage/env/loaders.py @@ -3,7 +3,6 @@ # Distributed under the terms of the GNU General Public License v2 import errno -import io import stat import portage @@ -31,7 +30,7 @@ class LoaderError(Exception): self.error_msg = error_msg def __str__(self): - return "Failed while loading resource: %s, error was: %s" % ( + return "Failed while loading resource: {}, error was: {}".format( self.resource, self.error_msg, ) @@ -159,14 +158,13 @@ class FileLoader(DataLoader): func = self.lineParser for fn in RecursiveFileLoader(self.fname): try: - with io.open( + with open( _unicode_encode(fn, encoding=_encodings["fs"], errors="strict"), - mode="r", encoding=_encodings["content"], errors="replace", ) as f: lines = f.readlines() - except EnvironmentError as e: + except OSError as e: if e.errno == errno.EACCES: writemsg(_("Permission denied: '%s'\n") % fn, noiselevel=-1) del e |