/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bencode.py

  • Committer: Vincent Ladeuil
  • Date: 2007-11-19 13:44:25 UTC
  • mto: (3018.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 3019.
  • Revision ID: v.ladeuil+lp@free.fr-20071119134425-y74t0vh9ctpo8j9f
Fix 150860 by leaving port as user specified it.

* transport/remote.py:
(BZR_DEFAULT_INTERFACE, BZR_DEFAULT_PORT): Moved to
smart/medium.py.

* transport/__init__.py:
(TransportListRegistry.register_transport): Delete default_port.
(TransportListRegistry.get_default_port): Deleted.
(ConnectedTransport._split_url, ConnectedTransport._unsplit_url):
Leave port untouched.

* tests/test_transport.py: 
Transports kept port as user specified it.
(TestRemoteTCPTransport, SSHPortTestMixin, SFTPTransportPortTest,
BzrSSHTransportPortTest): Deleted. Default port is set just before
connection.

* smart/medium.py:
(SmartTCPClientMedium._ensure_connection): Set port to default
*just* before connection.

* builtins.py:
(cmd_serve.run): Get interface and port default values from medium.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bencode.py
1
 
# Copyright (C) 2007,2009 Canonical Ltd
2
 
#
3
 
# This program is free software; you can redistribute it and/or modify
4
 
# it under the terms of the GNU General Public License as published by
5
 
# the Free Software Foundation; either version 2 of the License, or
6
 
# (at your option) any later version.
7
 
#
8
 
# This program is distributed in the hope that it will be useful,
9
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
 
# GNU General Public License for more details.
12
 
#
13
 
# You should have received a copy of the GNU General Public License
14
 
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
"""Wrapper around the bencode pyrex and python implementation"""
18
 
 
19
 
from bzrlib import osutils
20
 
 
21
 
try:
22
 
    from bzrlib._bencode_pyx import bdecode, bdecode_as_tuple, bencode, Bencached
23
 
except ImportError, e:
24
 
    osutils.failed_to_load_extension(e)
25
 
    from bzrlib.util._bencode_py import bdecode, bdecode_as_tuple, bencode, Bencached