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
fde86ff6
Commit
fde86ff6
authored
May 07, 2011
by
Giampaolo Rodola
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
63e4230c
0b5c21f9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
Lib/ftplib.py
Lib/ftplib.py
+2
-1
Lib/test/test_ftplib.py
Lib/test/test_ftplib.py
+8
-0
No files found.
Lib/ftplib.py
View file @
fde86ff6
...
...
@@ -232,12 +232,13 @@ class FTP:
This does not follow the procedure from the RFC to send Telnet
IP and Synch; that doesn't seem to work with the servers I've
tried. Instead, just send the ABOR command as OOB data.'''
line
=
'ABOR'
+
CRLF
line
=
b'ABOR'
+
B_
CRLF
if
self
.
debugging
>
1
:
print
(
'*put urgent*'
,
self
.
sanitize
(
line
))
self
.
sock
.
sendall
(
line
,
MSG_OOB
)
resp
=
self
.
getmultiline
()
if
resp
[:
3
]
not
in
(
'426'
,
'225'
,
'226'
):
raise
error_proto
(
resp
)
return
resp
def
sendcmd
(
self
,
cmd
):
'''Send a command and return the response.'''
...
...
Lib/test/test_ftplib.py
View file @
fde86ff6
...
...
@@ -42,6 +42,8 @@ class DummyFTPHandler(asynchat.async_chat):
def
__init__
(
self
,
conn
):
asynchat
.
async_chat
.
__init__
(
self
,
conn
)
# tells the socket to handle urgent data inline (ABOR command)
self
.
socket
.
setsockopt
(
socket
.
SOL_SOCKET
,
socket
.
SO_OOBINLINE
,
1
)
self
.
set_terminator
(
b"
\
r
\
n
"
)
self
.
in_buffer
=
[]
self
.
dtp
=
None
...
...
@@ -158,6 +160,9 @@ class DummyFTPHandler(asynchat.async_chat):
self
.
push
(
'221 quit ok'
)
self
.
close
()
def
cmd_abor
(
self
,
arg
):
self
.
push
(
'226 abor ok'
)
def
cmd_stor
(
self
,
arg
):
self
.
push
(
'125 stor ok'
)
...
...
@@ -312,6 +317,9 @@ class TestFTPClass(TestCase):
# Ensure the connection gets closed; sock attribute should be None
self
.
assertEqual
(
self
.
client
.
sock
,
None
)
def
test_abort
(
self
):
self
.
client
.
abort
()
def
test_retrbinary
(
self
):
def
callback
(
data
):
received
.
append
(
data
.
decode
(
'ascii'
))
...
...
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