1.1 --- a/EventAggregatorSupport/Resources.py Sun May 05 20:34:14 2013 +0200
1.2 +++ b/EventAggregatorSupport/Resources.py Mon May 06 18:10:16 2013 +0200
1.3 @@ -9,10 +9,9 @@
1.4 from EventAggregatorSupport.Filter import *
1.5 from EventAggregatorSupport.Types import *
1.6
1.7 -from ContentTypeSupport import getContentTypeAndEncoding
1.8 from DateSupport import Date, Month
1.9 from MoinSupport import *
1.10 -from MoinRemoteSupport import getCachedResource
1.11 +from MoinRemoteSupport import getCachedResource, getCachedResourceMetadata
1.12
1.13 import codecs
1.14 import urllib
1.15 @@ -115,22 +114,14 @@
1.16
1.17 f = StringIO(data)
1.18 try:
1.19 - url = f.readline()
1.20 -
1.21 # Get the content type and encoding, making sure that the data
1.22 # can be parsed.
1.23
1.24 - content_type, encoding = getContentTypeAndEncoding(f.readline())
1.25 + url, content_type, encoding, metadata = getCachedResourceMetadata(f)
1.26 +
1.27 if content_type != required_content_type:
1.28 continue
1.29
1.30 - metadata = {}
1.31 - line = f.readline()
1.32 - while line.strip():
1.33 - key, value = [v.strip() for v in line.split(":", 1)]
1.34 - metadata[key] = value
1.35 - line = f.readline()
1.36 -
1.37 # Send the data to the parser.
1.38
1.39 uf = codecs.getreader(encoding or "utf-8")(f)
2.1 --- a/README.txt Sun May 05 20:34:14 2013 +0200
2.2 +++ b/README.txt Mon May 06 18:10:16 2013 +0200
2.3 @@ -340,7 +340,7 @@
2.4 Packages Release Information
2.5 -------- -------------------
2.6
2.7 -MoinSupport Tested with 0.3
2.8 +MoinSupport Tested with 0.4
2.9 Source: http://hgweb.boddie.org.uk/MoinSupport
2.10
2.11 vContent Tested with 0.2