← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/medium.py

merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/medium.py
510
510
        return self._read_from.read(count)
511
511
 
512
512
 
 
513
# Port 4155 is the default port for bzr://, registered with IANA.
 
514
BZR_DEFAULT_INTERFACE = '0.0.0.0'
 
515
BZR_DEFAULT_PORT = 4155
 
516
 
 
517
 
513
518
class SmartTCPClientMedium(SmartClientStreamMedium):
514
519
    """A client medium using TCP."""
515
520
    
540
545
            return
541
546
        self._socket = socket.socket()
542
547
        self._socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
543
 
        result = self._socket.connect_ex((self._host, int(self._port)))
 
548
        if self._port is None:
 
549
            port = BZR_DEFAULT_PORT
 
550
        else:
 
551
            port = int(self._port)
 
552
        result = self._socket.connect_ex((self._host, port))
544
553
        if result:
545
554
            raise errors.ConnectionError("failed to connect to %s:%d: %s" %
546
 
                    (self._host, self._port, os.strerror(result)))
 
555
                    (self._host, port, os.strerror(result)))
547
556
        self._connected = True
548
557
 
549
558
    def _flush(self):