Merge lp:~gz/lazr.restfulclient/python_2.4_compatibility into lp:lazr.restfulclient

[Martin Packman]

Installed launchpadlib just now and launchpadlib.launchpad failed to import because lazr.restfulclient uses the new PEP-8 happy "email.message" spelling rather than the Python 2.4 compatible "email.Message" spelling.

Unrelated complaint: is the bootstrap.py symlink really necessary? Makes branching this project a pain.

[Gavin Panella (allenap)]

Thanks for fixing this, +1.

> Unrelated complaint: is the bootstrap.py symlink really necessary?
> Makes branching this project a pain.

I assume you're using Windows? Out of interest, what happens?

Please file a bug about this, there's no reason why we shouldn't fix
it.

review: Approve

[Leonard Richardson (leonardr)]

I'm also +1 on this code, I've verified that the tests pass (in 2.6, I don't have 2.4 handy), and will land.

[Martin Packman (gz)]

Thanks! I filed bug 671135 on the symlink annoyance.

=== modified file 'src/lazr/restfulclient/resource.py'
--- src/lazr/restfulclient/resource.py	2010-04-29 13:21:39 +0000
+++ src/lazr/restfulclient/resource.py	2010-05-20 19:30:45 +0000
@@ -30,7 +30,10 @@
 
 
 import cgi
-from email.message import Message
+try:
+    from email.message import Message
+except ImportError:
+    from email.Message import Message
 import simplejson
 from StringIO import StringIO
 import urllib