From 1ce1c11a12cf13744352030dec3b04322e7f16d0 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 19 Feb 2009 10:24:06 +0000 Subject: For compatibility with python-3.0, open files in text mode where appropriate. svn path=/main/trunk/; revision=12642 --- pym/_emerge/__init__.py | 2 +- pym/portage/__init__.py | 2 +- pym/portage/elog/messages.py | 2 +- pym/portage/env/loaders.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pym') diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 413792606..aab09d86b 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -10616,7 +10616,7 @@ class Scheduler(PollScheduler): log_path = self._locate_failure_log(failed_pkg) if log_path is not None: try: - log_file = open(log_path, 'rb') + log_file = open(log_path) except IOError: pass diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 9769f3607..b025142f9 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -4688,7 +4688,7 @@ def _check_build_log(mysettings, out=None): if logfile is None: return try: - f = open(logfile, 'rb') + f = open(logfile) except EnvironmentError: return diff --git a/pym/portage/elog/messages.py b/pym/portage/elog/messages.py index ad95c975d..a09b73229 100644 --- a/pym/portage/elog/messages.py +++ b/pym/portage/elog/messages.py @@ -35,7 +35,7 @@ def collect_ebuild_messages(path): logentries[msgfunction] = [] lastmsgtype = None msgcontent = [] - for l in open(filename, "rb"): + for l in open(filename): if not l: continue try: diff --git a/pym/portage/env/loaders.py b/pym/portage/env/loaders.py index 61bb69126..b23c7f393 100644 --- a/pym/portage/env/loaders.py +++ b/pym/portage/env/loaders.py @@ -132,7 +132,7 @@ class FileLoader(DataLoader): # once, which may be expensive due to digging in child classes. func = self.lineParser for fn in RecursiveFileLoader(self.fname): - f = open(fn, 'rb') + f = open(fn) for line_num, line in enumerate(f): func(line, line_num, data, errors) return (data, errors) -- cgit v1.2.3-1-g7c22