Skip to content

/ cpython

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bpo-39259: ftplib.FTP/FTP_TLS now reject timeout = 0 #17959

Merged
merged 1 commit into from Jan 13, 2020
Merged

bpo-39259: ftplib.FTP/FTP_TLS now reject timeout = 0 #17959

merged 1 commit into from Jan 13, 2020

Conversation

@corona10
Copy link
Member

corona10 commented Jan 12, 2020 •
edited by bedevere-bot

https://bugs.python.org/issue39259
@corona10 corona10 requested a review from vstinner Jan 12, 2020
@corona10 corona10 force-pushed the corona10:bpo-39259-ftplib branch from 0e9e0ae to 7fa1935 Jan 12, 2020
@corona10
bpo-39259: ftplib.FTP/FTP_TLS now reject timeout = 0
Loading status checks…
abda7c4
@corona10 corona10 force-pushed the corona10:bpo-39259-ftplib branch from 7fa1935 to abda7c4 Jan 12, 2020
@vstinner
vstinner approved these changes Jan 13, 2020
View changes
Copy link
Member

vstinner left a comment

LGTM.
Lib/test/test_ftplib.py
@@ -1045,6 +1045,10 @@ def testTimeoutValue(self):
self.evt.wait()
ftp.close()

# bpo-39259
with self.assertRaises(ValueError):
ftplib.FTP(HOST, timeout=0)

This comment has been minimized.

Sign in to view
Copy link
@vstinner

vstinner Jan 13, 2020

Member

FTP_TLS is not tested, but I don't think that its a big deal. FTP_TLS requires to check if ssl is available, and the current test suite isn't properly designed to test FTP and FTP_TLS at the same time.
@vstinner vstinner merged commit a190e2a into python:master Jan 13, 2020
9 checks passed
9 checks passed
Docs
Details
Windows (x86)
Details
Windows (x64)
Details
macOS
Details
Ubuntu
Details
Azure Pipelines PR #20200112.19 succeeded
Details
bedevere/issue-number Issue number 39259 found
Details
bedevere/news News entry found in Misc/NEWS.d
continuous-integration/travis-ci/pr The Travis CI build passed
Details
sthagen added a commit to sthagen/cpython that referenced this pull request Jan 13, 2020
@sthagen
Merge pull request #177 from python/master
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
f008028 
bpo-39259: ftplib.FTP/FTP_TLS now reject timeout = 0 (pythonGH-17959)
petdance added a commit to petdance/cpython that referenced this pull request Jan 17, 2020
@corona10 @petdance
bpo-39259: ftplib.FTP/FTP_TLS now reject timeout = 0 (pythonGH-17959)
817fb45
petdance added a commit to petdance/cpython that referenced this pull request Jan 17, 2020
@corona10 @petdance
bpo-39259: ftplib.FTP/FTP_TLS now reject timeout = 0 (pythonGH-17959)
c010cf7
petdance added a commit to petdance/cpython that referenced this pull request Jan 17, 2020
@corona10 @petdance
bpo-39259: ftplib.FTP/FTP_TLS now reject timeout = 0 (pythonGH-17959)
64642f9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vstinner vstinner

Assignees
No one assigned
Labels
CLA signed
Projects
None yet
Milestone
No milestone
4 participants
@corona10 @vstinner @the-knights-who-say-ni @bedevere-bot
You can’t perform that action at this time.