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

[Adi Roiban]

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 ftp.py.

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

Regards,
Adi

=== modified file 'twisted/protocols/ftp.py'
--- twisted/protocols/ftp.py	2011-04-10 14:17:53 +0000
+++ twisted/protocols/ftp.py	2011-09-11 19:32:32 +0000
@@ -135,7 +135,6 @@
     MKD_REPLY:                          '257 "%s" created',
 
     # -- 300's --
-    'userotp':                          '331 Response to %s.',  # ???
     USR_NAME_OK_NEED_PASS:              '331 Password required for %s.',
     GUEST_NAME_OK_NEED_EMAIL:           '331 Guest login ok, type your email address as password.',
     NEED_ACCT_FOR_LOGIN:                '332 Need account for login.',