[PATCH 1/1] Rename BupProtocolServer to bup.protocol.Server

[Rob Browning]

Signed-off-by: Rob Browning <r...@defaultvalue.org>
---
lib/bup/cmd/server.py | 5 ++---
lib/bup/protocol.py | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/bup/cmd/server.py b/lib/bup/cmd/server.py
index b22f63afa..29cba644d 100644
--- a/lib/bup/cmd/server.py
+++ b/lib/bup/cmd/server.py
@@ -1,9 +1,8 @@

import sys

-from bup import options, git
+from bup import options, protocol, git
from bup.io import byte_stream
-from bup.protocol import BupProtocolServer
from bup.repo import LocalRepo
from bup.helpers import Conn, debug2

@@ -26,5 +25,5 @@ def main(argv):
LocalRepo.__init__(self, repo_dir, server=server)

with Conn(byte_stream(sys.stdin), byte_stream(sys.stdout)) as conn, \
- BupProtocolServer(conn, ServerRepo) as server:
+ protocol.Server(conn, ServerRepo) as server:
server.handle()
diff --git a/lib/bup/protocol.py b/lib/bup/protocol.py
index f1eca7b33..13512d7d5 100644
--- a/lib/bup/protocol.py
+++ b/lib/bup/protocol.py
@@ -124,7 +124,7 @@ def _command(fn):
fn.bup_server_command = True
return fn

-class BupProtocolServer:
+class Server:
def __init__(self, conn, backend):
self.conn = conn
self._backend = backend
--
2.43.0

[Rob Browning]

Rob Browning <r...@defaultvalue.org> writes:

> Signed-off-by: Rob Browning <r...@defaultvalue.org>
> ---

Feel free to ignore this -- was trying to see if send-email would send
the merge-commit (it won't), and hit the wrong cancel key :)

--
Rob Browning
rlb @defaultvalue.org and @debian.org
GPG as of 2011-07-10 E6A9 DA3C C9FD 1FF8 C676 D2C4 C0F0 39E9 ED1B 597A
GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4