Merge lp:~andreas-pokorny/unity-system-compositor/switch-to-tobytes into lp:unity-system-compositor

[Andreas Pokorny]

follow the deprecation warning and use tobytes instead of tostring

This should fix ci failures like:
[ 1%] Scanning dependencies of target GMock
make[3]: Leaving directory '/tmp/buildd/unity-system-compositor-0.1.4+15.10.20150930.1bzr258pkg0xenial9/obj-x86_64-linux-gnu'
make -f CMakeFiles/GMock.dir/build.make CMakeFiles/GMock.dir/build
make[3]: Entering directory '/tmp/buildd/unity-system-compositor-0.1.4+15.10.20150930.1bzr258pkg0xenial9/obj-x86_64-linux-gnu'
/usr/bin/cmake -E cmake_progress_report /tmp/buildd/unity-system-compositor-0.1.4+15.10.20150930.1bzr258pkg0xenial9/obj-x86_64-linux-gnu/CMakeFiles 3
Generating orange_dot.h
cd /tmp/buildd/unity-system-compositor-0.1.4+15.10.20150930.1bzr258pkg0xenial9/obj-x86_64-linux-gnu/spinner && python /tmp/buildd/unity-system-compositor-0.1.4+15.10.20150930.1bzr258pkg0xenial9/tools/png2header.py /tmp/buildd/unity-system-compositor-0.1.4+15.10.20150930.1bzr258pkg0xenial9/spinner/orange-dot.png orange_dot > /tmp/buildd/unity-system-compositor-0.1.4+15.10.20150930.1bzr258pkg0xenial9/obj-x86_64-linux-gnu/spinner/orange_dot.h
[ 3%] Creating directories for 'GMock'
/usr/bin/cmake -E make_directory /usr/src/gmock
/usr/bin/cmake -E make_directory /tmp/buildd/unity-system-compositor-0.1.4+15.10.20150930.1bzr258pkg0xenial9/obj-x86_64-linux-gnu/gmock/libs
/usr/bin/cmake -E make_directory /tmp/buildd/unity-system-compositor-0.1.4+15.10.20150930.1bzr258pkg0xenial9/obj-x86_64-linux-gnu/gmock
Traceback (most recent call last):
  File "/tmp/buildd/unity-system-compositor-0.1.4+15.10.20150930.1bzr258pkg0xenial9/tools/png2header.py", line 86, in <module>
    export(image, variable_name)
  File "/tmp/buildd/unity-system-compositor-0.1.4+15.10.20150930.1bzr258pkg0xenial9/tools/png2header.py", line 70, in export
    print tocstring(image.tostring())
  File "/usr/lib/python2.7/dist-packages/PIL/Image.py", line 686, in tostring
    "Please call tobytes() instead.")
Exception: tostring() has been removed. Please call tobytes() instead.
/usr/bin/cmake -E make_directory /tmp/buildd/unity-system-compositor-0.1.4+15.10.20150930.1bzr258pkg0xenial9/obj-x86_64-linux-gnu/gmock/tmp
spinner/CMakeFiles/unity-system-compositor-spinner.dir/build.make:75: recipe for target 'spinner/orange_dot.h' failed

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:259
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/312/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-amd64-ci/12/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-armhf-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-i386-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/312/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:259
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/315/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-armhf-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-i386-ci/15

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/315/rebuild

review: Approve (continuous-integration)

=== modified file 'tools/png2header.py'
--- tools/png2header.py	2015-06-11 09:15:46 +0000
+++ tools/png2header.py	2015-11-30 20:10:44 +0000
@@ -67,7 +67,7 @@
     print "    unsigned char pixel_data[%d * %d * %d + 1];" % image_info
     print "} %s = {" % variable_name
     print "    %d, %d, %d," % image_info
-    print tocstring(image.tostring())
+    print tocstring(image.tobytes())
     print "};"
 
 def show_usage():