Skip to content

Enforce PEP 257 conventions in ftplib.py #15604

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.

Sign up for GitHub

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

Merged
miss-islington merged 5 commits into from
Sep 3, 2019
Merged

Enforce PEP 257 conventions in ftplib.py #15604

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
16a1926
Update ftplib.py
alanyee Aug 29, 2019
737a260
Update according to feedback
alanyee Aug 31, 2019
d97616c
Revert exclusive format changes
alanyee Sep 1, 2019
fee51e0
Update Lib/ftplib.py
alanyee Sep 2, 2019
d71f89d
Update Lib/ftplib.py
alanyee Sep 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions Lib/ftplib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ class error_proto(Error): pass # response does not begin with [1-5]

# The class itself
class FTP:

'''An FTP client class.

To create a connection, call the class using these arguments:
Expand Down Expand Up @@ -105,12 +104,13 @@ class FTP:
passiveserver = 1
encoding = "latin-1"

# Initialization method (called by class instantiation).
# Initialize host to localhost, port to standard ftp port
# Optional arguments are host (for connect()),
# and user, passwd, acct (for login())
def __init__(self, host='', user='', passwd='', acct='',
timeout=_GLOBAL_DEFAULT_TIMEOUT, source_address=None):
"""Initialization method (called by class instantiation).
Initialize host to localhost, port to standard ftp port
Comment thread
alanyee marked this conversation as resolved.
Outdated
Optional arguments are host (for connect()),
and user, passwd, acct (for login())
Comment thread
alanyee marked this conversation as resolved.
Outdated
"""

@aeros aeros Aug 31, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is good, FTP.__init__ is a public method and didn't have a docstring previously.

self.source_address = source_address
self.timeout = timeout
if host:
Expand Down Expand Up @@ -823,7 +823,6 @@ def parse227(resp):
'''Parse the '227' response for a PASV request.
Raises error_proto if it does not contain '(h1,h2,h3,h4,p1,p2)'
Return ('host.addr.as.numbers', port#) tuple.'''

if resp[:3] != '227':
raise error_reply(resp)
global _227_re
Expand All @@ -843,7 +842,6 @@ def parse229(resp, peer):
'''Parse the '229' response for an EPSV request.
Raises error_proto if it does not contain '(|||port|)'
Return ('host.addr.as.numbers', port#) tuple.'''

if resp[:3] != '229':
raise error_reply(resp)
left = resp.find('(')
Expand All @@ -865,7 +863,6 @@ def parse257(resp):
'''Parse the '257' response for a MKD or PWD request.
This is a response to a MKD or PWD request: a directory name.
Returns the directoryname in the 257 reply.'''

if resp[:3] != '257':
raise error_reply(resp)
if resp[3:5] != ' "':
Expand Down