[MERGE] Patch: smtp_connection.py

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Amit Saha wrote:
> Looking forward to your comments and hints for improvement, if any so
> as to enable this patch to be merged.

bb:resubmit

Your patch reverts some recent improvements to smtp_connection.py, and
it does not appear that you meant to.  It appears that you just copied
smtp_connection.py over top of a more recent version.

Please submit a patch that makes only the changes you want.

> === modified file 'bzrlib/smtp_connection.py'
> --- bzrlib/smtp_connection.py	2009-04-27 16:10:10 +0000
> +++ bzrlib/smtp_connection.py	2009-05-06 12:57:08 +0000
> @@ -12,7 +12,7 @@
>  #
>  # You should have received a copy of the GNU General Public License
>  # along with this program; if not, write to the Free Software
> -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

The Franklin address is the current FSF location

> -        # smtplib requires that the username and password be byte
> -        # strings.  The CRAM-MD5 spec doesn't give any guidance on
> -        # encodings, but the SASL PLAIN spec says UTF-8, so that's
> -        # what we'll use.
> -        username = osutils.safe_utf8(self._smtp_username)
> -        password = osutils.safe_utf8(self._smtp_password)

passwords should be binary.  Reverting this is bad.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkoBmNAACgkQ0F+nu1YWqI3l9wCffV2fTxuaiHUOM/JS6Gw4/uzi
gpIAnjg2P2AWh0U6D5m5tz9NfvISP2WZ
=oWrB
-----END PGP SIGNATURE-----