Merge lp://staging/~cjwatson/txpkgupload/ipv6-ftp into lp://staging/~lazr-developers/txpkgupload/trunk

Proposed by Colin Watson
Status: Merged
Merged at revision: 45
Proposed branch: lp://staging/~cjwatson/txpkgupload/ipv6-ftp
Merge into: lp://staging/~lazr-developers/txpkgupload/trunk
Diff against target: 224 lines (+184/-3)
1 file modified
src/txpkgupload/twistedftp.py (+184/-3)
To merge this branch: bzr merge lp://staging/~cjwatson/txpkgupload/ipv6-ftp
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+368202@code.staging.launchpad.net

Commit message

Implement FTP extensions for IPv6.

Description of the change

This is a backport from https://github.com/twisted/twisted/pull/1149; if and when it's merged into a released version of Twisted then we should drop this rather hacky backport and use that instead.

Portions of this are by William Grant, but I did some more work to get things like EPSV ALL working. Getting the tests backported here as well was unfortunately unreasonably difficult, but I've at least tested it manually and hopefully the fact that the Twisted PR has reasonable test coverage will be good enough.

To post a comment you must log in.
44. By Colin Watson

Implement FTP extensions for IPv6.

This is a backport from https://github.com/twisted/twisted/pull/1149; if
and when it's merged into a released version of Twisted then we should
drop this rather hacky backport and use that instead.

Portions of this are by William Grant, but I did some more work to get
things like EPSV ALL working. Getting the tests backported here as well
was unfortunately unreasonably difficult, but I've at least tested it
manually and hopefully the fact that the Twisted PR has reasonable test
coverage will be good enough.

Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: