Merge lp:~ericsnowcurrently/landscape-client/fix-1681561-bytes-formatting into lp:~landscape/landscape-client/trunk

[Eric Snow]

Do not use bytes formatting.

(fixed lp:1681561)

It is not supported on Trusty (Python 3.4).

Do not use bytes formatting.

(fixed lp:1681561)

It is not supported on Trusty (Python 3.4).

Testing instructions:

./scripts/landscape-client -c root-client.conf

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make ci-check
Result: Fail
Revno: 1013
Branch: lp:~ericsnowcurrently/landscape-client/fix-1681561-bytes-formatting
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3869/

review: Needs Fixing (test results)

[Simon Poirier (simpoir)]

review: Needs Fixing

[lp:~ericsnowcurrently/landscape-client/fix-1681561-bytes-formatting]

1014. By Eric Snow on 2017-04-11

Do not assume bytes are always utf-8.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make ci-check
Result: Success
Revno: 1014
Branch: lp:~ericsnowcurrently/landscape-client/fix-1681561-bytes-formatting
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3870/

review: Approve (test results)

[Simon Poirier (simpoir)]

+1 thanks for the fix

review: Approve

[Francis Ginther (fginther)]

Looks good, couldn't find any missing cases that needed conversion.

review: Approve

=== modified file 'landscape/lib/bpickle.py'
--- landscape/lib/bpickle.py	2017-04-06 17:59:25 +0000
+++ landscape/lib/bpickle.py	2017-04-11 14:13:49 +0000
@@ -59,32 +59,36 @@
 
 
 def dumps_bool(obj):
-    return b"b%d" % int(obj)
+    return ("b%d" % int(obj)
+            ).encode("utf-8")
 
 
 def dumps_int(obj):
-    return b"i%d;" % obj
+    return ("i%d;" % obj
+            ).encode("utf-8")
 
 
 def dumps_float(obj):
-    return b"f%r;" % obj
+    return ("f%r;" % obj
+            ).encode("utf-8")
 
 
 def dumps_bytes(obj):
-    return b"s%d:%s" % (len(obj), obj)
+    return ("s%d:" % (len(obj),)).encode("utf-8") + obj
 
 
 def dumps_unicode(obj):
-    obj = obj.encode("utf-8")
-    return b"u%d:%s" % (len(obj), obj)
+    bobj = obj.encode("utf-8")
+    return ("u%d:%s" % (len(bobj), obj)
+            ).encode("utf-8")
 
 
 def dumps_list(obj, _dt=dumps_table):
-    return b"l%s;" % b"".join([_dt[type(val)](val) for val in obj])
+    return b"l" + b"".join([_dt[type(val)](val) for val in obj]) + b";"
 
 
 def dumps_tuple(obj, _dt=dumps_table):
-    return b"t%s;" % b"".join([_dt[type(val)](val) for val in obj])
+    return b"t" + b"".join([_dt[type(val)](val) for val in obj]) + b";"
 
 
 def dumps_dict(obj, _dt=dumps_table):
@@ -96,7 +100,7 @@
         val = obj[key]
         append(_dt[type(key)](key))
         append(_dt[type(val)](val))
-    return b"d%s;" % b"".join(res)
+    return b"d" + b"".join(res) + b";"
 
 
 def dumps_none(obj):

=== modified file 'landscape/lib/tests/test_bpickle.py'
--- landscape/lib/tests/test_bpickle.py	2017-04-06 14:56:07 +0000
+++ landscape/lib/tests/test_bpickle.py	2017-04-11 14:13:49 +0000
@@ -16,6 +16,9 @@
         self.assertTrue("e" in repr(number))
         self.assertAlmostEquals(bpickle.loads(bpickle.dumps(number)), number)
 
+    def test_bytes(self):
+        self.assertEqual(bpickle.loads(bpickle.dumps(b'foo')), b'foo')
+
     def test_string(self):
         self.assertEqual(bpickle.loads(bpickle.dumps('foo')), 'foo')
 

=== modified file 'landscape/package/skeleton.py'
--- landscape/package/skeleton.py	2017-03-17 08:56:02 +0000
+++ landscape/package/skeleton.py	2017-04-11 14:13:49 +0000
@@ -52,12 +52,13 @@
             return self._hash
         # We use ascii here as encoding  for backwards compatibility as it was
         # default encoding for conversion from unicode to bytes in Python 2.7.
-        package_info = b"[%d %s %s]" % (
-            self.type, self.name.encode("ascii"), self.version.encode("ascii"))
+        package_info = ("[%d %s %s]" % (self.type, self.name, self.version)
+                        ).encode("ascii")
         digest = sha1(package_info)
         self.relations.sort()
         for pair in self.relations:
-            digest.update(b"[%d %s]" % (pair[0], pair[1].encode("ascii")))
+            digest.update(("[%d %s]" % (pair[0], pair[1])
+                           ).encode("ascii"))
         return digest.digest()
 
     def set_hash(self, package_hash):

=== modified file 'landscape/package/tests/test_releaseupgrader.py'
--- landscape/package/tests/test_releaseupgrader.py	2017-03-30 00:18:42 +0000
+++ landscape/package/tests/test_releaseupgrader.py	2017-04-11 14:13:49 +0000
@@ -523,7 +523,7 @@
                 self.assertFalse(os.path.exists(upgrade_tool_directory))
                 self.assertEqual(
                     out,
-                    b"--force-apt-update\n%s\n" % os.getcwd().encode("utf-8"))
+                    ("--force-apt-update\n%s\n" % os.getcwd()).encode("utf-8"))
                 self.assertEqual(err, b"")
                 self.assertEqual(code, 0)