# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1367861983 -7200
# Node ID 1c01f53b8d6e73f266e579c9fc277366567e4c4a
# Parent  f4d79e83beb1cbffb286d4c7ed974e4c6cd26d94# Parent  6455833b5173862296c1eec521ffdae1e2f1f398
Merged new development with 0.10.1 fixes.

diff -r f4d79e83beb1 -r 1c01f53b8d6e EventAggregatorSupport/Resources.py
--- a/EventAggregatorSupport/Resources.py	Mon May 06 19:38:32 2013 +0200
+++ b/EventAggregatorSupport/Resources.py	Mon May 06 19:39:43 2013 +0200
@@ -9,10 +9,9 @@
 from EventAggregatorSupport.Filter import *
 from EventAggregatorSupport.Types import *
 
-from ContentTypeSupport import getContentTypeAndEncoding
 from DateSupport import Date, Month
 from MoinSupport import *
-from MoinRemoteSupport import getCachedResource
+from MoinRemoteSupport import getCachedResource, getCachedResourceMetadata
 
 import codecs
 import urllib
@@ -115,22 +114,14 @@
 
             f = StringIO(data)
             try:
-                url = f.readline()
-
                 # Get the content type and encoding, making sure that the data
                 # can be parsed.
 
-                content_type, encoding = getContentTypeAndEncoding(f.readline())
+                url, content_type, encoding, metadata = getCachedResourceMetadata(f)
+
                 if content_type != required_content_type:
                     continue
 
-                metadata = {}
-                line = f.readline()
-                while line.strip():
-                    key, value = [v.strip() for v in line.split(":", 1)]
-                    metadata[key] = value
-                    line = f.readline()
-
                 # Send the data to the parser.
 
                 uf = codecs.getreader(encoding or "utf-8")(f)
diff -r f4d79e83beb1 -r 1c01f53b8d6e README.txt
--- a/README.txt	Mon May 06 19:38:32 2013 +0200
+++ b/README.txt	Mon May 06 19:39:43 2013 +0200
@@ -340,7 +340,7 @@
 Packages                    Release Information
 --------                    -------------------
 
-MoinSupport                 Tested with 0.3
+MoinSupport                 Tested with 0.4
                             Source: http://hgweb.boddie.org.uk/MoinSupport
 
 vContent                    Tested with 0.2