Rev 6491: (jelmer) Remove some deprecation code in 'bzr serve'. (Jelmer Vernooij) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6491 [merge]
revision-id: pqm at pqm.ubuntu.com-20120309213357-xzhbfyee3fuyht0t
parent: pqm at pqm.ubuntu.com-20120309145247-wj7l7eoyvwsgsmaa
parent: jelmer at samba.org-20120309141652-hnwpcdp7f2l5bcei
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2012-03-09 21:33:57 +0000
message:
  (jelmer) Remove some deprecation code in 'bzr serve'. (Jelmer Vernooij)
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2012-03-06 19:49:19 +0000
+++ b/bzrlib/builtins.py	2012-03-09 14:16:52 +0000
@@ -5524,19 +5524,7 @@
         if not allow_writes:
             url = 'readonly+' + url
         t = transport.get_transport_from_url(url)
-        try:
-            protocol(t, listen, port, inet, client_timeout)
-        except TypeError, e:
-            # We use symbol_versioning.deprecated_in just so that people
-            # grepping can find it here.
-            # symbol_versioning.deprecated_in((2, 5, 0))
-            symbol_versioning.warn(
-                'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
-                'Most likely it needs to be updated to support a'
-                ' "timeout" parameter (added in bzr 2.5.0)'
-                % (e, protocol.__module__, protocol),
-                DeprecationWarning)
-            protocol(t, host, port, inet)
+        protocol(t, listen, port, inet, client_timeout)
 
 
 class cmd_join(Command):