Merge lp:~adiroiban/twisted/twisted-5046 into lp:twisted

Proposed by Adi Roiban on 2011-09-11
Status: Merged
Merge reported by: Jean-Paul Calderone
Merged at revision: not available
Proposed branch: lp:~adiroiban/twisted/twisted-5046
Merge into: lp:twisted
Diff against target: 11 lines (+0/-1)
1 file modified
twisted/protocols/ (+0/-1)
To merge this branch: bzr merge lp:~adiroiban/twisted/twisted-5046
Reviewer Review Type Date Requested Status
Twisted-dev 2011-09-11 Pending
Review via email:

Description of the Change

I would like to see ticket 5046 closed, so I started a branch to fix the issues raised by that ticket.

At a first look at the ftp code, it looks like only 'userotp' should be removed from

Please let me know if you think there should be other changes and I will be happy to investigate them.


To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'twisted/protocols/'
2--- twisted/protocols/ 2011-04-10 14:17:53 +0000
3+++ twisted/protocols/ 2011-09-11 19:32:32 +0000
4@@ -135,7 +135,6 @@
5 MKD_REPLY: '257 "%s" created',
7 # -- 300's --
8- 'userotp': '331 Response to %s.', # ???
9 USR_NAME_OK_NEED_PASS: '331 Password required for %s.',
10 GUEST_NAME_OK_NEED_EMAIL: '331 Guest login ok, type your email address as password.',
11 NEED_ACCT_FOR_LOGIN: '332 Need account for login.',


People subscribed via source and target branches

to all changes: