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

[Steffen Allner]

Support py2/3 in landscape.schema module and adapt tests to use bytestrings as appropriate.

This MP ports landscape.schema to Python 3 and adapts the tests to use bytestrings, where it is needed.

Additionally, dict.keys() became an generator and, therefore we need a list to manipulate on the basis of this.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 973
Branch: lp:~gocept/landscape-client/py3-schema
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3710/

review: Approve (test results)

[Данило Шеган (danilo)]

review: Needs Information

[Steffen Allner (sallner)]

Yes, it breaks.

[Daniel Havlik (nilo)]

+1

review: Approve

[Данило Шеган (danilo)]

Ah, right, thanks for the explanation (wasn't obvious in the diff).

review: Approve

=== modified file 'landscape/schema.py'
--- landscape/schema.py	2017-03-17 09:07:51 +0000
+++ landscape/schema.py	2017-03-23 09:04:02 +0000
@@ -221,7 +221,7 @@
         super(Message, self).__init__(schema, optional=optional)
 
     def coerce(self, value):
-        for k in value.keys():
+        for k in list(value.keys()):
             if k not in self.schema:
                 # We don't know about this field, just discard it. This
                 # is useful when a client that introduced some new field

=== modified file 'landscape/tests/test_schema.py'
--- landscape/tests/test_schema.py	2017-03-09 14:36:55 +0000
+++ landscape/tests/test_schema.py	2017-03-23 09:04:02 +0000
@@ -67,7 +67,7 @@
         self.assertRaises(InvalidError, Float().coerce, "3.0")
 
     def test_string(self):
-        self.assertEqual(Bytes().coerce("foo"), "foo")
+        self.assertEqual(Bytes().coerce(b"foo"), b"foo")
 
     def test_string_bad_unicode(self):
         self.assertRaises(InvalidError, Bytes().coerce, u"foo")
@@ -83,8 +83,8 @@
         self.assertRaises(InvalidError, Unicode().coerce, 32)
 
     def test_unicode_with_str(self):
-        """Unicode accept plain strings and return a unicode."""
-        self.assertEqual(Unicode().coerce("foo"), u"foo")
+        """Unicode accept byte strings and return a unicode."""
+        self.assertEqual(Unicode().coerce(b"foo"), u"foo")
 
     def test_unicode_decodes(self):
         """Unicode should decode plain strings."""
@@ -97,7 +97,7 @@
 
     def test_unicode_or_str_bad_encoding(self):
         """Decoding errors should be converted to InvalidErrors."""
-        self.assertRaises(InvalidError, Unicode().coerce, "\xff")
+        self.assertRaises(InvalidError, Unicode().coerce, b"\xff")
 
     def test_list(self):
         self.assertEqual(List(Int()).coerce([1]), [1])
@@ -188,8 +188,8 @@
         self.assertEqual(schema.coerce({"foo": 32}), {"foo": 32})
 
     def test_dict(self):
-        self.assertEqual(Dict(Int(), Bytes()).coerce({32: "hello."}),
-                         {32: "hello."})
+        self.assertEqual(Dict(Int(), Bytes()).coerce({32: b"hello."}),
+                         {32: b"hello."})
 
     def test_dict_coerces(self):
         self.assertEqual(
@@ -220,8 +220,8 @@
         """L{Message} schemas should accept C{api} keys."""
         schema = Message("baz", {})
         self.assertEqual(
-            schema.coerce({"type": "baz", "api": "whatever"}),
-            {"type": "baz", "api": "whatever"})
+            schema.coerce({"type": "baz", "api": b"whatever"}),
+            {"type": "baz", "api": b"whatever"})
 
     def test_message_api_None(self):
         """L{Message} schemas should accept None for C{api}."""

=== modified file 'py3_ready_tests'
--- py3_ready_tests	2017-03-23 07:28:20 +0000
+++ py3_ready_tests	2017-03-23 09:04:02 +0000
@@ -3,6 +3,7 @@
 landscape.package.tests
 
 
+landscape.tests.test_schema