Put BonJour plugin in its own file

src/calibre/srv/standalone.py

@@ -11,7 +11,7 @@ import sys, os
 from calibre import as_unicode
 from calibre.constants import plugins, iswindows
 from calibre.srv.loop import ServerLoop
-from calibre.srv.plugins import BonJour
+from calibre.srv.bonjour import BonJour
 from calibre.srv.opts import opts_to_parser
 from calibre.srv.http_response import create_http_handler
 from calibre.srv.handler import Handler

src/calibre/srv/tests/loop.py

@@ -103,7 +103,7 @@ class LoopTest(BaseTest):
 
     def test_bonjour(self):
         'Test advertising via BonJour'
-        from calibre.srv.plugins import BonJour
+        from calibre.srv.bonjour import BonJour
         from calibre.utils.Zeroconf import Zeroconf
         b = BonJour()
         with TestServer(lambda data:(data.path[0] + data.read()), plugins=(b,), shutdown_timeout=5) as server: