# HG changeset patch # User Paul Boddie # Date 1343513265 -7200 # Node ID 5989ec91c5a1dc741b09754a1af7f55b0bea86e3 # Parent 8e9825a38cdb1206224fb763f27645ddb5f043ec Moved the writeHeaders function to MoinSupport. Fixed docstrings in the actions. diff -r 8e9825a38cdb -r 5989ec91c5a1 MoinShare.py --- a/MoinShare.py Tue Jul 17 00:41:14 2012 +0200 +++ b/MoinShare.py Sun Jul 29 00:07:45 2012 +0200 @@ -7,7 +7,7 @@ """ from MoinSupport import * -from MoinMoin import config, wikiutil +from MoinMoin import wikiutil from DateSupport import getCurrentTime import re @@ -156,32 +156,6 @@ else: return mimetypes -def writeHeaders(request, mimetype, metadata, status=None): - - """ - Using the 'request', write resource headers using the given 'mimetype', - based on the given 'metadata'. If the optional 'status' is specified, set - the status header to the given value. - """ - - send_headers = get_send_headers(request) - - # Define headers. - - headers = ["Content-Type: %s; charset=%s" % (mimetype, config.charset)] - - # Define the last modified time. - # NOTE: Consider using request.httpDate. - - latest_timestamp = metadata.get("last-modified") - if latest_timestamp: - headers.append("Last-Modified: %s" % latest_timestamp.as_HTTP_datetime_string()) - - if status: - headers.append("Status: %s" % status) - - send_headers(headers) - def getUpdatedTime(metadata): """ diff -r 8e9825a38cdb -r 5989ec91c5a1 actions/SharedUpdate.py --- a/actions/SharedUpdate.py Tue Jul 17 00:41:14 2012 +0200 +++ b/actions/SharedUpdate.py Sun Jul 29 00:07:45 2012 +0200 @@ -16,7 +16,7 @@ class SharedUpdate(ActionBase, ActionSupport): - "A summary dialogue requesting various parameters." + "An update retrieval dialogue requesting various parameters." def get_form_html(self, buttons_html): _ = self._ diff -r 8e9825a38cdb -r 5989ec91c5a1 actions/SharedUpdates.py --- a/actions/SharedUpdates.py Tue Jul 17 00:41:14 2012 +0200 +++ b/actions/SharedUpdates.py Sun Jul 29 00:07:45 2012 +0200 @@ -16,7 +16,7 @@ class SharedUpdates(ActionBase, ActionSupport): - "A summary dialogue requesting various parameters." + "An update manifest retrieval dialogue requesting various parameters." def get_form_html(self, buttons_html): _ = self._