Merge lp:~danilo/landscape-client/bpickle-no-3 into lp:~landscape/landscape-client/trunk

[Данило Шеган]

Rename bpickle3 back to bpickle and drop indirect imports through landscape.compat.

Rename bpickle3 back to bpickle and drop indirect imports through landscape.compat.

Testing instructions:

make check, ensure https://ci.lscape.net/job/landscape-package/ builds successfully.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 961
Branch: lp:~danilo/landscape-client/bpickle-no-3
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3634/

review: Approve (test results)

[Alberto Donato (ack)]

LGTM, +1

review: Approve

[lp:~danilo/landscape-client/bpickle-no-3]

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

Revert Makefile change.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 962
Branch: lp:~danilo/landscape-client/bpickle-no-3
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3635/

review: Approve (test results)

[Adam Collard (adam-collard)]

+1

review: Approve

=== modified file 'landscape/broker/ping.py'
--- landscape/broker/ping.py	2017-03-06 10:38:07 +0000
+++ landscape/broker/ping.py	2017-03-17 09:58:08 +0000
@@ -39,7 +39,7 @@
 from twisted.python.failure import Failure
 from twisted.internet import defer
 
-from landscape.compat import bpickle
+from landscape.lib import bpickle
 from landscape.lib.fetch import fetch
 from landscape.lib.log import log_failure
 

=== modified file 'landscape/broker/store.py'
--- landscape/broker/store.py	2017-03-14 09:24:43 +0000
+++ landscape/broker/store.py	2017-03-17 09:58:08 +0000
@@ -100,7 +100,7 @@
 from twisted.python.compat import iteritems
 
 from landscape import DEFAULT_SERVER_API
-from landscape.compat import bpickle
+from landscape.lib import bpickle
 from landscape.lib.fs import create_binary_file
 from landscape.lib.versioning import sort_versions, is_version_higher
 

=== modified file 'landscape/broker/tests/test_ping.py'
--- landscape/broker/tests/test_ping.py	2017-03-06 10:38:07 +0000
+++ landscape/broker/tests/test_ping.py	2017-03-17 09:58:08 +0000
@@ -2,7 +2,7 @@
 
 from twisted.internet.defer import fail
 
-from landscape.compat import bpickle
+from landscape.lib import bpickle
 from landscape.lib.fetch import fetch
 from landscape.reactor import FakeReactor
 from landscape.broker.ping import PingClient, Pinger

=== modified file 'landscape/broker/tests/test_transport.py'
--- landscape/broker/tests/test_transport.py	2017-03-16 09:51:44 +0000
+++ landscape/broker/tests/test_transport.py	2017-03-17 09:58:08 +0000
@@ -3,8 +3,8 @@
 
 from landscape import VERSION
 from landscape.broker.transport import HTTPTransport
+from landscape.lib import bpickle
 from landscape.lib.fetch import PyCurlError
-from landscape.compat import bpickle
 
 from landscape.tests.helpers import LandscapeTest, LogKeeperHelper
 

=== modified file 'landscape/broker/transport.py'
--- landscape/broker/transport.py	2017-03-06 10:38:07 +0000
+++ landscape/broker/transport.py	2017-03-17 09:58:08 +0000
@@ -8,7 +8,7 @@
 
 from twisted.python.compat import unicode
 
-from landscape.compat import bpickle
+from landscape.lib import bpickle
 from landscape.lib.fetch import fetch
 from landscape.log import format_delta
 from landscape import SERVER_API, VERSION

=== modified file 'landscape/compat.py'
--- landscape/compat.py	2017-03-16 15:17:09 +0000
+++ landscape/compat.py	2017-03-17 09:58:08 +0000
@@ -1,7 +1,5 @@
 from twisted.python.compat import _PY3
 
-from landscape.lib import bpickle3 as bpickle
-
 
 if _PY3:
     import _pickle as cPickle

=== modified file 'landscape/lib/amp.py'
--- landscape/lib/amp.py	2017-03-13 09:02:04 +0000
+++ landscape/lib/amp.py	2017-03-17 09:58:08 +0000
@@ -54,7 +54,7 @@
 from twisted.protocols.amp import (
     Argument, String, Integer, Command, AMP, MAX_VALUE_LENGTH, CommandLocator)
 
-from landscape.compat import bpickle
+from landscape.lib import bpickle
 
 
 class MethodCallArgument(Argument):

=== renamed file 'landscape/lib/bpickle3.py' => 'landscape/lib/bpickle.py'
=== modified file 'landscape/lib/persist.py'
--- landscape/lib/persist.py	2017-03-08 12:06:13 +0000
+++ landscape/lib/persist.py	2017-03-17 09:58:08 +0000
@@ -608,7 +608,7 @@
 class BPickleBackend(Backend):
 
     def __init__(self):
-        from landscape.compat import bpickle
+        from landscape.lib import bpickle
         self._bpickle = bpickle
 
     def new(self):

=== modified file 'landscape/lib/tests/test_bpickle.py'
--- landscape/lib/tests/test_bpickle.py	2017-03-06 10:38:07 +0000
+++ landscape/lib/tests/test_bpickle.py	2017-03-17 09:58:08 +0000
@@ -1,6 +1,6 @@
 import unittest
 
-from landscape.compat import bpickle
+from landscape.lib import bpickle
 
 
 class BPickleTest(unittest.TestCase):

=== modified file 'landscape/package/reporter.py'
--- landscape/package/reporter.py	2017-03-06 10:38:07 +0000
+++ landscape/package/reporter.py	2017-03-17 09:58:08 +0000
@@ -13,12 +13,13 @@
 from twisted.internet.defer import (
     Deferred, succeed, inlineCallbacks, returnValue)
 
+from landscape.lib import bpickle
 from landscape.lib.sequenceranges import sequence_to_ranges
 from landscape.lib.twisted_util import gather_results, spawn_process
 from landscape.lib.fetch import fetch_async
 from landscape.lib.fs import touch_file
 
-from landscape.compat import convert_buffer_to_string, bpickle
+from landscape.compat import convert_buffer_to_string
 from landscape.package.taskhandler import (
     PackageTaskHandlerConfiguration, PackageTaskHandler, run_task_handler)
 from landscape.package.store import UnknownHashIDRequest, FakePackageStore

=== modified file 'landscape/package/store.py'
--- landscape/package/store.py	2017-03-10 12:39:56 +0000
+++ landscape/package/store.py	2017-03-17 09:58:08 +0000
@@ -9,7 +9,8 @@
 from twisted.python.compat import iteritems, long
 from twisted.python.compat import StringType as basestring
 
-from landscape.compat import convert_buffer_to_string, bpickle
+from landscape.compat import convert_buffer_to_string
+from landscape.lib import bpickle
 from landscape.lib.store import with_cursor
 
 

=== modified file 'landscape/package/tests/test_reporter.py'
--- landscape/package/tests/test_reporter.py	2017-03-13 15:15:46 +0000
+++ landscape/package/tests/test_reporter.py	2017-03-17 09:58:08 +0000
@@ -8,6 +8,7 @@
 from twisted.internet import reactor
 
 
+from landscape.lib import bpickle
 from landscape.lib.fs import create_text_file, touch_file
 from landscape.lib.fetch import FetchError
 from landscape.package.store import (
@@ -24,7 +25,7 @@
     LandscapeTest, BrokerServiceHelper, EnvironSaverHelper)
 from landscape.reactor import FakeReactor
 
-from landscape.compat import convert_buffer_to_string, bpickle
+from landscape.compat import convert_buffer_to_string
 
 SAMPLE_LSB_RELEASE = "DISTRIB_CODENAME=codename\n"