Merge lp:~stefanor/wadllib/datetime-924240 into lp:wadllib

[Stefano Rivera]

I don't understand the purpose of the roundtrippnig through ET in _from_string. More to the point, it claims to track namespaces, but clearly doesn't correctly, causing LP: #924240.

My not understanding, is entirely possibly due to me not knowing this code at all, but the change fixes the issue for me, and the tests still pass under python 2 & 3.

[Richard Harding (rharding)]

So I'm working on getting a test case for this and so I understand how this stuff works. I've got the start of a test case, but it passes with both the old code and your update.

So I'm wondering if maybe the test data in the wadllib isn't up to date. The JSON file that houses the tested data has date strings in the format

"date_created": "2005-06-06T08:59:51.561685+00:00"

And I wonder if that's not true for what you're getting.

Can you please get a copy of the json you're testing against so I can try to create a test that breaks as you're seeing it to make sure this doesn't become an issue in the future.

This is a paste of the test I've started to try to fire up:
https://pastebin.canonical.com/62637/

review: Needs Information

[Richard Harding (rharding)]

I've been unable to break this, but this change, regardless doesn't break any wadllib tests and makes the code simpler so approving.

review: Approve (code*)

[j.c.sackett (jcsackett)]

I don't see anything wrong with this change. Please do provide the data requested by Rick so he can get tests in, thanks.

review: Approve

[Stefano Rivera (stefanor)]

We discussed it on IRC. I didn't have any particular test data, was just looking at datetimes with launchpadlib. But I'll have a look and see if I can prepare a test.

[Richard Harding (rharding)]

That's ok Stefano, we chatted in irc and I think the test would require some integration between not just the wadllib, but the api library as well. We ok on this change.

[j.c.sackett (jcsackett)]

> We discussed it on IRC. I didn't have any particular test data, was just
> looking at datetimes with launchpadlib. But I'll have a look and see if I can
> prepare a test.

Ah, thanks for the update. As Rick said, nevermind on the test, then. :-)

[Stefano Rivera (stefanor)]

phew :P

=== modified file 'src/wadllib/application.py'
--- src/wadllib/application.py	2012-01-27 18:43:16 +0000
+++ src/wadllib/application.py	2012-03-12 20:47:20 +0000
@@ -1104,13 +1104,8 @@
         return ET.ElementTree(root)
 
     def _from_string(self, markup):
-        """Turns markup into a document.
-
-        Just a wrapper around ElementTree which keeps track of namespaces.
-        """
-        # We're using the ET fromstring/tostring to help make sure we maintain
-        # py2/3 compatiblity and keeping things in Unicode.
-        return self._from_stream(BytesIO(ET.tostring(ET.fromstring(markup))))
+        """Turns markup into a document."""
+        return self._from_stream(BytesIO(markup))
 
     def get_resource_type(self, resource_type_url):
         """Retrieve a resource type by the URL of its description."""