client: import DemuxConn

Fixes: fb3bd84cfd24 ("Add DemuxConn and `bup mux` for client-server")
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Rob Browning <rlb@defaultvalue.org>
(cherry picked from commit 1ad93eca8d0e837263d9f29dd229f6835f452c04)
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/lib/bup/client.py b/lib/bup/client.py
index 19d52cb968e25145d194a7359ce01a1bb9ce654a..8e318218814090bfc4dcb8d54d2e5bfc0081a2fc 100644 (file)
--- a/lib/bup/client.py
+++ b/lib/bup/client.py
@@ -4,7 +4,8 @@ import errno, os, re, struct, sys, time, zlib
 
 from bup import git, ssh, vfs
 from bup.compat import range
-from bup.helpers import (Conn, atomically_replaced_file, chunkyreader, debug1,
+from bup.helpers import (Conn, DemuxConn,
+                         atomically_replaced_file, chunkyreader, debug1,
                          debug2, linereader, lines_until_sentinel,
                          mkdirp, progress, qprogress)
 from bup.vint import read_bvec, read_vuint, write_bvec