~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Patch Queue Manager
  • Date: 2012-03-09 21:33:57 UTC
  • mfrom: (6489.2.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20120309213357-xzhbfyee3fuyht0t
(jelmer) Remove some deprecation code in 'bzr serve'. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
5524
5524
        if not allow_writes:
5525
5525
            url = 'readonly+' + url
5526
5526
        t = transport.get_transport_from_url(url)
5527
 
        try:
5528
 
            protocol(t, listen, port, inet, client_timeout)
5529
 
        except TypeError, e:
5530
 
            # We use symbol_versioning.deprecated_in just so that people
5531
 
            # grepping can find it here.
5532
 
            # symbol_versioning.deprecated_in((2, 5, 0))
5533
 
            symbol_versioning.warn(
5534
 
                'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5535
 
                'Most likely it needs to be updated to support a'
5536
 
                ' "timeout" parameter (added in bzr 2.5.0)'
5537
 
                % (e, protocol.__module__, protocol),
5538
 
                DeprecationWarning)
5539
 
            protocol(t, host, port, inet)
 
5527
        protocol(t, listen, port, inet, client_timeout)
5540
5528
 
5541
5529
 
5542
5530
class cmd_join(Command):