traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-34500: Fix ResourceWarning in difflib.py (GH-8926) 

The change to Tools/scripts/diff.py effectively backports part of
a2637729f2.
The test code changed in Doc/library/difflib.rst is not present in current 3.x.
This commit is contained in:
Mickaël Schoentgen 2018-09-03 03:48:08 +02:00 committed by Terry Jan Reedy
parent 71f2dadf66
commit 30af2e737a
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Doc/library/difflib.rst
View File

@ -757,8 +757,10 @@ It is also contained in the Python source distribution, as
# we're passing these as arguments to the diff function # we're passing these as arguments to the diff function
fromdate = time.ctime(os.stat(fromfile).st_mtime) fromdate = time.ctime(os.stat(fromfile).st_mtime)
todate = time.ctime(os.stat(tofile).st_mtime) todate = time.ctime(os.stat(tofile).st_mtime)
fromlines = open(fromfile, 'U').readlines() with open(fromfile, 'U') as f:
tolines = open(tofile, 'U').readlines() fromlines = f.readlines()
with open(tofile, 'U') as f:
tolines = f.readlines()
if options.u: if options.u:
diff = difflib.unified_diff(fromlines, tolines, fromfile, tofile, diff = difflib.unified_diff(fromlines, tolines, fromfile, tofile,

1
Misc/NEWS.d/next/Tools-Demos/2018-08-25-17-13-24.bpo-34500.Edz41x.rst Normal file
View File

@ -0,0 +1 @@
Fix 2 ResourceWarning in difflib.py. Patch by Mickaël Schoentgen.

6
Tools/scripts/diff.py
View File

@ -32,8 +32,10 @@ def main():
fromdate = time.ctime(os.stat(fromfile).st_mtime) fromdate = time.ctime(os.stat(fromfile).st_mtime)
todate = time.ctime(os.stat(tofile).st_mtime) todate = time.ctime(os.stat(tofile).st_mtime)
fromlines = open(fromfile, 'U').readlines() with open(fromfile, 'U') as f:
tolines = open(tofile, 'U').readlines() fromlines = f.readlines()
with open(tofile, 'U') as f:
tolines = f.readlines()
if options.u: if options.u:
diff = difflib.unified_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n) diff = difflib.unified_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n)