Merge lp:~gocept/landscape-client/py3-startup into lp:~landscape/landscape-client/trunk

[Steffen Allner]

This MP allows to startup the client as there has been an issue with writing bytes to the stdout/stderr with the watchdog.

Additionally, I included a hacky workaround to convert all keys in dictionaries to unicode, when they are retrieved from a bpickled stream of data, and to write them back as bytes when bpickle.dumps().

If this is accepted that should be included in the bpickle git repository.

This MP allows to startup the client as there has been an issue with writing bytes to the stdout/stderr with the watchdog.

Additionally, I included a hacky workaround to convert all keys in dictionaries to unicode, when they are retrieved from a bpickled stream of data, and to write them back as bytes when bpickle.dumps().

If this is accepted that should be included in the bpickle git repository.

This MP was requested by Free Ekanayaka.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-check
Result: Success
Revno: 1004
Branch: lp:~gocept/landscape-client/py3-startup
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3836/

review: Approve (test results)

[Free Ekanayaka (free.ekanayaka)]

+1 we will clean up the details in follow-up branches

review: Approve

[Alberto Donato (ack)]

+1

review: Approve

[Daniel Havlik (nilo)]

+1

review: Approve

=== modified file 'landscape/lib/bpickle.py'
--- landscape/lib/bpickle.py	2017-03-17 09:26:45 +0000
+++ landscape/lib/bpickle.py	2017-04-05 08:13:15 +0000
@@ -32,6 +32,7 @@
 wire compatible and behave the same way (bugs notwithstanding).
 """
 
+import logging
 
 dumps_table = {}
 loads_table = {}
@@ -93,6 +94,11 @@
     append = res.append
     for key in keys:
         val = obj[key]
+        if (bytes is not str) and isinstance(key, str):
+            try:
+                key.encode("ascii")
+            except UnicodeError as e:
+                logging.warning(e)
         append(_dt[type(key)](key))
         append(_dt[type(val)](val))
     return b"d%s;" % b"".join(res)
@@ -154,6 +160,11 @@
     while bytestring[pos:pos+1] != b";":
         key, pos = _lt[bytestring[pos:pos+1]](bytestring, pos)
         val, pos = _lt[bytestring[pos:pos+1]](bytestring, pos)
+        if (bytes is not str) and isinstance(key, bytes):
+            try:
+                key.decode("ascii")
+            except UnicodeError as e:
+                logging.warning(e)
         res[key] = val
     return res, pos+1
 

=== modified file 'landscape/watchdog.py'
--- landscape/watchdog.py	2017-04-04 08:50:05 +0000
+++ landscape/watchdog.py	2017-04-05 08:13:15 +0000
@@ -295,10 +295,10 @@
 
     def outReceived(self, data):
         # it's *probably* going to always be line buffered, by accident
-        sys.stdout.write(data)
+        sys.stdout.buffer.write(data)
 
     def errReceived(self, data):
-        sys.stderr.write(data)
+        sys.stderr.buffer.write(data)
 
     def processEnded(self, reason):
         """The process has ended; restart it."""