Merge branch 'legacy/0.9'

Conflicts:
	CHANGES.rst
	setup.py
This commit is contained in:
Martin Zimmermann 2014-09-25 13:39:47 +02:00
commit 9c2a48b388
3 changed files with 12 additions and 6 deletions

View File

@ -7,12 +7,19 @@ Changelog for Isso
- Nothing changed yet. - Nothing changed yet.
0.9.7 (unreleased) 0.9.8 (unreleased)
------------------ ------------------
- Nothing changed yet. - Nothing changed yet.
0.9.7 (2014-09-25)
------------------
- fix SMTP authentication using CRAM-MD5 (incorrect usage of
`smtplib`), #126
0.9.6 (2014-08-18) 0.9.6 (2014-08-18)
------------------ ------------------

View File

@ -8,7 +8,6 @@ a quickstart quide that covers the most common setup. Sections covered:
:local: :local:
:depth: 1 :depth: 1
Configuration Configuration
------------- -------------
@ -68,8 +67,8 @@ on *Discussions* and select the *Export* tab. You'll receive an email with your
comments. Unfortunately, Disqus does not export up- and downvotes. comments. Unfortunately, Disqus does not export up- and downvotes.
To export comments from your previous WordPress installation, go to *Tools*, To export comments from your previous WordPress installation, go to *Tools*,
export your data. WordPress WXR import is quite new and may not work for you; export your data. It has been reported that WordPress may generate broken XML.
please report any failures. Try to repair the file using ``xmllint`` before you continue with the import.
Now import the XML dump: Now import the XML dump:

View File

@ -71,8 +71,8 @@ class SMTP(object):
self.client.starttls() self.client.starttls()
if self.conf.get('username') and self.conf.get('password'): if self.conf.get('username') and self.conf.get('password'):
self.client.login(self.conf.get('username'), self.client.login(self.conf.get('username').encode('ascii', errors='ignore'),
self.conf.get('password')) self.conf.get('password').encode('ascii', errors='ignore'))
return self.client return self.client