From 4c5448eda225588b705074a68663b9322b54006c Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Wed, 30 Sep 2009 08:45:39 -0400 Subject: Last clean up on the egg-reading code. Fixes issue #25. --- coverage/codeunit.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'coverage/codeunit.py') diff --git a/coverage/codeunit.py b/coverage/codeunit.py index d85735d..79ae4f0 100644 --- a/coverage/codeunit.py +++ b/coverage/codeunit.py @@ -86,7 +86,6 @@ class CodeUnit: self.name = n self.modname = modname - def __repr__(self): return "" % (self.name, self.filename) @@ -129,12 +128,16 @@ class CodeUnit: def source_file(self): """Return an open file for reading the source of the code unit.""" - if not os.path.exists(self.filename): - source = self.file_locator.get_zip_data(self.filename) - if source is None: - raise CoverageException( - "No source for code %r." % self.filename - ) + if os.path.exists(self.filename): + # A regular text file: open it. + return open(self.filename) + + # Maybe it's in a zip file? + source = self.file_locator.get_zip_data(self.filename) + if source is not None: return StringIO(source) - - return open(self.filename) + + # Couldn't find source. + raise CoverageException( + "No source for code %r." % self.filename + ) -- cgit v1.2.1