# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1371223477 -7200
# Node ID b2931587316ffcbc0e03d18b47ef61898ed847e2
# Parent  843637df61d25a2cd240d34e0b68a0754a7ce2a8
Removed superfluous carriage return characters.

diff -r 843637df61d2 -r b2931587316f EventAggregatorSupport/Formatting.py
--- a/EventAggregatorSupport/Formatting.py	Fri Jun 14 00:40:23 2013 +0200
+++ b/EventAggregatorSupport/Formatting.py	Fri Jun 14 17:24:37 2013 +0200
@@ -110,14 +110,14 @@
 
         path_info = getPathInfo(request)
 
-        write('<rss version="2.0">\r\n')
-        write('<channel>\r\n')
-        write('<title>%s</title>\r\n' % path_info[1:])
-        write('<link>%s%s</link>\r\n' % (request.getBaseURL(), path_info))
-        write('<description>Events published on %s%s</description>\r\n' % (request.getBaseURL(), path_info))
+        write('<rss version="2.0">\n')
+        write('<channel>\n')
+        write('<title>%s</title>\n' % path_info[1:])
+        write('<link>%s%s</link>\n' % (request.getBaseURL(), path_info))
+        write('<description>Events published on %s%s</description>\n' % (request.getBaseURL(), path_info))
 
         if latest_timestamp is not None:
-            write('<lastBuildDate>%s</lastBuildDate>\r\n' % latest_timestamp.as_HTTP_datetime_string())
+            write('<lastBuildDate>%s</lastBuildDate>\n' % latest_timestamp.as_HTTP_datetime_string())
  
         # Sort the events by start date, reversed.
 
@@ -140,8 +140,8 @@
         _write("END", {}, "VCALENDAR")
 
     elif mimetype == "application/rss+xml":
-        write('</channel>\r\n')
-        write('</rss>\r\n')
+        write('</channel>\n')
+        write('</rss>\n')
 
     elif mimetype == "text/html":
         write('</body>')
@@ -229,9 +229,9 @@
         event_summary = event.getSummary(parent)
         link = event.getEventURL()
 
-        write('<item>\r\n')
-        write('<title>%s</title>\r\n' % escape(event_summary))
-        write('<link>%s</link>\r\n' % link)
+        write('<item>\n')
+        write('<title>%s</title>\n' % escape(event_summary))
+        write('<link>%s</link>\n' % link)
 
         # Write a description according to the preferred source of
         # descriptions.
@@ -241,16 +241,16 @@
         else:
             description = event_metadata["last-comment"]
 
-        write('<description>%s</description>\r\n' %
+        write('<description>%s</description>\n' %
             fmt.text(event_page.formatText(description, fmt)))
 
         for topic in event_details.get("topics") or event_details.get("categories") or []:
-            write('<category>%s</category>\r\n' %
+            write('<category>%s</category>\n' %
                 fmt.text(event_page.formatText(topic, fmt)))
 
-        write('<pubDate>%s</pubDate>\r\n' % event_metadata["created"].as_HTTP_datetime_string())
-        write('<guid>%s#%s</guid>\r\n' % (link, event_metadata["sequence"]))
-        write('</item>\r\n')
+        write('<pubDate>%s</pubDate>\n' % event_metadata["created"].as_HTTP_datetime_string())
+        write('<guid>%s#%s</guid>\n' % (link, event_metadata["sequence"]))
+        write('</item>\n')
 
     elif mimetype == "text/html":
         fmt = request.html_formatter