[Merge] lp:~sjakthol/software-properties/fix-1111291 into lp:software-properties

[Sami Jaktholm]

Sami Jaktholm has proposed merging lp:~sjakthol/software-properties/fix-1111291 into lp:software-properties.

Commit message:
* softwareproperties/ppa.py:
  - Convert bytes to string in CurlCallback.body_callback. Testcase added to
    tests/test_lp.py. Fixes LP: #1111291.

Requested reviews:
  Ubuntu Core Development Team (ubuntu-core-dev)
Related bugs:
  Bug #1111291 in software-properties (Ubuntu): "add-apt-repository crashed with TypeError in body_callback(): Can't convert 'bytes' object to str implicitly"
  https://bugs.launchpad.net/ubuntu/+source/software-properties/+bug/1111291

For more details, see:
https://code.launchpad.net/~sjakthol/software-properties/fix-1111291/+merge/157514

This is hard to test as the code is only run if urllib fails. Luckily the changes are pretty straightforward.
-- 
https://code.launchpad.net/~sjakthol/software-properties/fix-1111291/+merge/157514
Your team Ubuntu Core Development Team is requested to review the proposed merge of lp:~sjakthol/software-properties/fix-1111291 into lp:software-properties.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 1164 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20130406/56ff55b4/attachment.diff>