summaryrefslogtreecommitdiff
path: root/sphinx/websupport/storage/sqlalchemystorage.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-11-21 21:18:57 +0100
committerGeorg Brandl <georg@python.org>2010-11-21 21:18:57 +0100
commit9481a557c1ae732f2b194e27a54880cfe8b8737d (patch)
tree6788752a3a934ebee286f4a36b81534ac5c6738f /sphinx/websupport/storage/sqlalchemystorage.py
parent9a3a3df917ce1fd513b874e974f0e4f21bff6229 (diff)
downloadsphinx-git-9481a557c1ae732f2b194e27a54880cfe8b8737d.tar.gz
Add a text-based diff view e.g. for display in emails.
Diffstat (limited to 'sphinx/websupport/storage/sqlalchemystorage.py')
-rw-r--r--sphinx/websupport/storage/sqlalchemystorage.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/sphinx/websupport/storage/sqlalchemystorage.py b/sphinx/websupport/storage/sqlalchemystorage.py
index b58b1198e..fa1d0e3e4 100644
--- a/sphinx/websupport/storage/sqlalchemystorage.py
+++ b/sphinx/websupport/storage/sqlalchemystorage.py
@@ -60,11 +60,13 @@ class SQLAlchemyStorage(StorageBackend):
proposal, node_id, parent_id, moderator):
session = Session()
proposal_diff = None
+ proposal_diff_text = None
if node_id and proposal:
node = session.query(Node).filter(Node.id == node_id).one()
- differ = CombinedHtmlDiff()
- proposal_diff = differ.make_html(node.source, proposal)
+ differ = CombinedHtmlDiff(node.source, proposal)
+ proposal_diff = differ.make_html()
+ proposal_diff_text = differ.make_text()
elif parent_id:
parent = session.query(Comment.displayed).\
filter(Comment.id == parent_id).one()
@@ -82,6 +84,7 @@ class SQLAlchemyStorage(StorageBackend):
session.commit()
d = comment.serializable()
d['document'] = comment.node.document
+ d['proposal_diff_text'] = proposal_diff_text
session.close()
return d