Merge lp:~rharding/wadllib/fix_tests_922599 into lp:wadllib

[Richard Harding]

Update to using BytesIO and catching string v stream inputs.

= Summary =
Tests are failing under oneriec python 2

== Implementation Details ==
Most of this was put together by allenap but the idea is to try to standardize the input into the old from_string (now from_stream) parser so that in py3 and py2 both get a byte stream into the iterator.

== Tests ==
python setup.py test

[Benji York (benji)]

This looks good to me. We might want a comment in _from_string about
how it looks like a noop (ET.tostring(ET.fromstring(...)) but it's
actually there for Python 2/3 compatibility.

review: Approve (code)

=== modified file 'src/wadllib/application.py'
--- src/wadllib/application.py	2012-01-18 10:31:21 +0000
+++ src/wadllib/application.py	2012-01-27 18:15:28 +0000
@@ -45,9 +45,9 @@
     # Make sure to try the Python 2 form first; we don't want to use
     # io.StringIO in Python 2, because it is strict about only accepting
     # unicode input.
-    from cStringIO import StringIO
+    from cStringIO import StringIO as BytesIO
 except ImportError:
-    from io import StringIO
+    from io import BytesIO
 import datetime
 try:
     from email.mime.multipart import MIMEMultipart
@@ -1066,8 +1066,9 @@
         """
         self.markup_url = markup_url
         if hasattr(markup, 'read'):
-            markup = markup.read()
-        self.doc = self._from_string(_make_unicode(markup))
+            self.doc = self._from_stream(markup)
+        else:
+            self.doc = self._from_string(markup)
         self.resources = self.doc.find(wadl_xpath('resources'))
         self.resource_base = self.resources.attrib.get('base')
         self.representation_definitions = {}
@@ -1082,7 +1083,7 @@
             id = resource_type.attrib['id']
             self.resource_types[id] = ResourceType(resource_type)
 
-    def _from_string(self, markup):
+    def _from_stream(self, stream):
         """Turns markup into a document.
 
         Just a wrapper around ElementTree which keeps track of namespaces.
@@ -1091,7 +1092,7 @@
         root = None
         ns_map = []
 
-        for event, elem in ET.iterparse(StringIO(markup), events):
+        for event, elem in ET.iterparse(stream, events):
             if event == "start-ns":
                 ns_map.append(elem)
             elif event == "end-ns":
@@ -1102,6 +1103,12 @@
                 elem.set(NS_MAP, dict(ns_map))
         return ET.ElementTree(root)
 
+    def _from_string(self, markup):
+        """Turns markup into a document.
+
+        Just a wrapper around ElementTree which keeps track of namespaces.
+        """
+        return self._from_stream(BytesIO(ET.tostring(ET.fromstring(markup))))
 
     def get_resource_type(self, resource_type_url):
         """Retrieve a resource type by the URL of its description."""