lp:~vila/bzr/py26bzr

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #269535: bzr does not work with python2.6

Medium

Fix Released

Link a bug report

Related blueprints

2945. By Vincent Ladeuil on 2008-09-16

Fix last failing test for python-2.6 (there are still some deprecation warnings).

* bzrlib/diff.py:
(DiffSymlink.diff_symlink): Fix missing encoding making python-2.6
shows a u'new' instead of just 'new'.

2944. By Vincent Ladeuil on 2008-09-16

Trivially fix import order (merge side effect ?).

* bzrlib/repofmt/pack_repo.py:
Fix import order.

2943. By Vincent Ladeuil on 2008-09-16

Catch spurious exceptions when SocketServer is shut down.

* bzrlib/tests/test_http.py:
(TestProxyHttpServer.proxied_in_env,
TestProxyHttpServer.not_proxied_in_env): Revert expected and
actual expressions to conform with bzr rules.

* bzrlib/tests/http_server.py:
(HttpServer.__repr__): Added for debug purposes.
(HttpServer._http_start): Catch spurious exceptions when running
with python-2.6.

2942. By Vincent Ladeuil on 2008-09-15

Some more fixes.

* bzrlib/weave.py:
(Weave.__init__, Weave.__init__): Don't pass parameters to
object__init__.

* bzrlib/tests/test_sftp_transport.py:
(Test_SFTPReadvHelper.checkGetRequests): Require paramiko.

2941. By Vincent Ladeuil on 2008-09-15

Better handling of http smart medium sharing.

* bzrlib/transport/http/__init__.py:
(HttpTransportBase.get_smart_medium): Cache the medium do avoid
probing for smart server repeatedly.
(SmartClientHTTPMedium.__init__): Keep a weak reference on the
http transport to avoid circular references.
(SmartClientHTTPMedium.send_http_smart_request): Handle the weak
reference.

2940. By Vincent Ladeuil on 2008-09-15

Don't use multiple inheritance for http smart medium.

* bzrlib/transport/__init__.py:
(Transport.__init__): Don't call super().__init__.

* bzrlib/transport/http/__init__.py:
(HttpTransportBase): Get rid of multiple inheritance from
medium.SmartClientMedium.
(HttpTransportBase.get_smart_medium): Build a smart medium on
request.
(SmartClientHTTPMedium): New class. Transfer get_request,
should_probe and send_http_smart_request from HttpTransportBase.

* bzrlib/transport/__init__.py:
(Transport.__init__): Don't pass parameters to object__init__.

* bzrlib/tests/test_http.py:
(TestHTTPConnections.test_get_smart_medium): Deleted.

2939. By Vincent Ladeuil on 2008-09-14

Delete useless import.

* bzrlib/btree_index.py:
Delete useless import.

2938. By Vincent Ladeuil on 2008-09-14

Fix U32, LOWU32 disapearance in python-2.6.

* bzrlib/tuned_gzip.py:
(U32, LOWU32): These functions are gone in python-2.6, they are
trivial enough to be copied as is.

2937. By Vincent Ladeuil on 2008-09-13

Update some fixes so the test suite passes again with python-2.5.

* bzrlib/tests/test_knit.py:
Fix sha calls.

* bzrlib/tests/http_utils.py:
Oops, typo during conflict resolution.

* bzrlib/repofmt/pack_repo.py:
(ReconcilePacker._copy_text_texts): Fix some imports.

2936. By Vincent Ladeuil on 2008-09-13

merge bzr.dev