diff options
author | Giampaolo Rodola' <g.rodola@gmail.com> | 2013-02-12 01:04:27 (GMT) |
---|---|---|
committer | Giampaolo Rodola' <g.rodola@gmail.com> | 2013-02-12 01:04:27 (GMT) |
commit | 2f50aaf2ff427fb713e82699a6dcbeeb038b10c2 (patch) | |
tree | 0e2c24897b8918f19d8504915ccebd466c0bbd92 /Lib/pkgutil.py | |
parent | fd6e6cfa29b2289e711dc7f57f36897c78899ee7 (diff) | |
download | cpython-2f50aaf2ff427fb713e82699a6dcbeeb038b10c2.zip cpython-2f50aaf2ff427fb713e82699a6dcbeeb038b10c2.tar.gz cpython-2f50aaf2ff427fb713e82699a6dcbeeb038b10c2.tar.bz2 |
modernize some modules' code by using with statement around open()
Diffstat (limited to 'Lib/pkgutil.py')
-rw-r--r-- | Lib/pkgutil.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Lib/pkgutil.py b/Lib/pkgutil.py index 0f783de..8fa8405 100644 --- a/Lib/pkgutil.py +++ b/Lib/pkgutil.py @@ -349,9 +349,8 @@ class ImpLoader: self.file.close() elif mod_type==imp.PY_COMPILED: if os.path.exists(self.filename[:-1]): - f = open(self.filename[:-1], 'r') - self.source = f.read() - f.close() + with open(self.filename[:-1], 'r') as f: + self.source = f.read() elif mod_type==imp.PKG_DIRECTORY: self.source = self._get_delegate().get_source() return self.source @@ -591,12 +590,12 @@ def extend_path(path, name): sys.stderr.write("Can't open %s: %s\n" % (pkgfile, msg)) else: - for line in f: - line = line.rstrip('\n') - if not line or line.startswith('#'): - continue - path.append(line) # Don't check for existence! - f.close() + with f: + for line in f: + line = line.rstrip('\n') + if not line or line.startswith('#'): + continue + path.append(line) # Don't check for existence! return path |