lp://qastaging/~danilo/landscape-client/bpickle-no-3

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/~landscape/landscape-client/trunk at revision 961

Adam Collard (community): Approve on 2017-03-17

🤖 Landscape Builder: Approve (test results) on 2017-03-17

Alberto Donato (community): Approve on 2017-03-17

Diff: 169 lines (+14/-13)

12 files modified

landscape/broker/ping.py (+1/-1)
landscape/broker/store.py (+1/-1)
landscape/broker/tests/test_ping.py (+1/-1)
landscape/broker/tests/test_transport.py (+1/-1)
landscape/broker/transport.py (+1/-1)
landscape/compat.py (+0/-2)
landscape/lib/amp.py (+1/-1)
landscape/lib/persist.py (+1/-1)
landscape/lib/tests/test_bpickle.py (+1/-1)
landscape/package/reporter.py (+2/-1)
landscape/package/store.py (+2/-1)
landscape/package/tests/test_reporter.py (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1673742: Landscape can't use landscape.lib.bpickle from trunk

Critical

Fix Committed

Link a bug report

Related blueprints

962. By Данило Шеган on 2017-03-17

Revert Makefile change.

961. By Данило Шеган on 2017-03-17

Rename bpickle3 to bpickle and drop landscape.compat import.

960. By Steffen Allner on 2017-03-17

Merge fetch-strings-and-bytes [f=1672720] [r=danilo,mh-gocept,landscape-builder] [a=Gocept]
Fix UnicodeDecodeError (bug #1672720) when exchanging message with the server.

Encode unicode strings in landscape.lib.fetch before passing over to libcurl.

959. By Данило Шеган on 2017-03-17

Merge bpickle3-update [f=] [r=landscape-builder,adam-collard,free.ekanayaka] [a=Данило Шеган]
Move to the latest bpickle3 library for both python 2.x and 3.x

Latest bpickle3 library has fixes for backwards compatibility and works exactly the same in both python 2.x and 3.x, mapping internal types to appropriate bpickle representations.

Mostly from "upstream" pull request at https://github.com/CanonicalLtd/bpickle3/pull/1

958. By Steffen Allner on 2017-03-16

Merge py3-sysinfo [f=] [r=mh-gocept,danilo,landscape-builder] [a=Gocept]
Update landscape.sysinfo tests to work with python 2.x and 3.x.

957. By Steffen Allner on 2017-03-15

Merge py3-network [f=] [r=danilo,nilo,landscape-builder] [a=Gocept]
Support both python 2 and 3 in the landscape.lib.network module. This module mostly consists of methods used in this model to retrieve information about network devices. To achieve this, calls to socket methods are used, which require bytes as input. To maintain compatibility with the code using `get_active_device_info` the result of this function still consists of strings in Python 3 but the internal methods now explicitly work on bytes. The `skipped_interfaces` are still a tuple of strings to maintain signature stability.

956. By Adam Collard on 2017-03-14

Merge retain-lib-fs-backwards-compat [f=1672808] [r=free.ekanayaka,landscape-builder,ack] [a=Adam Collard]
Add backwards compatible aliases for landscape.lib.fs.read_file and landscape.lib.fs.create_file given their usage in server code.

955. By Steffen Allner on 2017-03-14

Merge py3-twisted-util [f=] [r=nilo,landscape-builder,danilo,sallner] [a=Gocept]
Support python 2 and 3 in code which receives data from the stdout and stderr and therefore handles with Bytes and not with Stings in Python 3. To reduce the amount of compat code, the code has been changed to use the same `io.BytesIO()` in Python 2 and 3.

954. By Steffen Allner on 2017-03-14

Merge py3-fs [f=] [r=landscape-builder,adam-collard,nilo,danilo] [a=Gocept]
Split off read/create/append_file into text and binary file counterparts to serve strictly one purpose, thus clarifying the intention in each individual call.

Make rest of the code in landscape/lib/fs.py python2/3 compatible.

953. By Steffen Allner on 2017-03-14

Merge test-python3-ported [f=] [r=danilo,landscape-builder,nilo] [a=Gocept]
Run partial python3 tests (listed in file "py3_ready_tests") along with full python2 test run as part of "make check".