Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
f569826f
Commit
f569826f
authored
Oct 31, 2010
by
Antoine Pitrou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #10266: uu.decode didn't close in_file explicitly when it was given
as a filename. Patch by Brian Brazil.
parent
e974571d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
77 additions
and
53 deletions
+77
-53
Lib/test/test_uu.py
Lib/test/test_uu.py
+17
-0
Lib/uu.py
Lib/uu.py
+57
-53
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/test/test_uu.py
View file @
f569826f
...
...
@@ -196,6 +196,23 @@ class UUFileTest(unittest.TestCase):
finally
:
self
.
_kill
(
f
)
def
test_decode_filename
(
self
):
f
=
None
try
:
support
.
unlink
(
self
.
tmpin
)
f
=
open
(
self
.
tmpin
,
'wb'
)
f
.
write
(
encodedtextwrapped
(
0o644
,
self
.
tmpout
))
f
.
close
()
uu
.
decode
(
self
.
tmpin
)
f
=
open
(
self
.
tmpout
,
'rb'
)
s
=
f
.
read
()
f
.
close
()
self
.
assertEqual
(
s
,
plaintext
)
finally
:
self
.
_kill
(
f
)
def
test_decodetwice
(
self
):
# Verify that decode() will refuse to overwrite an existing file
f
=
None
...
...
Lib/uu.py
View file @
f569826f
...
...
@@ -92,10 +92,14 @@ def decode(in_file, out_file=None, mode=None, quiet=False):
#
# Open the input file, if needed.
#
opened_files
=
[]
if
in_file
==
'-'
:
in_file
=
sys
.
stdin
.
buffer
elif
isinstance
(
in_file
,
str
):
in_file
=
open
(
in_file
,
'rb'
)
opened_files
.
append
(
in_file
)
try
:
#
# Read until a begin is encountered or we've exhausted the file
#
...
...
@@ -122,7 +126,6 @@ def decode(in_file, out_file=None, mode=None, quiet=False):
#
# Open the output file
#
opened
=
False
if
out_file
==
'-'
:
out_file
=
sys
.
stdout
.
buffer
elif
isinstance
(
out_file
,
str
):
...
...
@@ -132,7 +135,7 @@ def decode(in_file, out_file=None, mode=None, quiet=False):
except
AttributeError
:
pass
out_file
=
fp
opened
=
True
opened_files
.
append
(
out_file
)
#
# Main decoding loop
#
...
...
@@ -150,8 +153,9 @@ def decode(in_file, out_file=None, mode=None, quiet=False):
s
=
in_file
.
readline
()
if
not
s
:
raise
Error
(
'Truncated input file'
)
if
opened
:
out_file
.
close
()
finally
:
for
f
in
opened_files
:
f
.
close
()
def
test
():
"""uuencode/uudecode main program"""
...
...
Misc/NEWS
View file @
f569826f
...
...
@@ -59,6 +59,9 @@ Core and Builtins
Library
-------
- Issue #10266: uu.decode didn't close in_file explicitly when it was given
as a filename. Patch by Brian Brazil.
- Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou.
- logging: Added style option to basicConfig() to allow %, {} or $-formatting.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment