← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/server.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-08-14 21:14:26 UTC
  • mfrom: (3634.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080814211426-i0rmbyhjxf4hi7pt
(jam)(trivial) NEWS fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/server.py
59
59
        from socket import error as socket_error
60
60
        self._socket_error = socket_error
61
61
        self._socket_timeout = socket_timeout
62
 
        addrs = socket.getaddrinfo(host, port, socket.AF_UNSPEC, 
63
 
            socket.SOCK_STREAM, 0, socket.AI_PASSIVE)[0]
64
 
 
65
 
        (family, socktype, proto, canonname, sockaddr) = addrs
66
 
 
67
 
        self._server_socket = socket.socket(family, socktype, proto)
 
62
        self._server_socket = socket.socket()
68
63
        # SO_REUSERADDR has a different meaning on Windows
69
64
        if sys.platform != 'win32':
70
65
            self._server_socket.setsockopt(socket.SOL_SOCKET,
71
66
                socket.SO_REUSEADDR, 1)
72
67
        try:
73
 
            self._server_socket.bind(sockaddr)
 
68
            self._server_socket.bind((host, port))
74
69
        except self._socket_error, message:
75
70
            raise errors.CannotBindAddress(host, port, message)
76
71
        self._sockname = self._server_socket.getsockname()