diff options
author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-02-11 07:37:12 +0000 |
---|---|---|
committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-02-11 07:37:12 +0000 |
commit | 9613406fbab1949f66fe7858590cab990c7b4b25 (patch) | |
tree | 573a6106da5bb7ead2c4f17c45be664063d67e01 /rdiff-backup/rdiff_backup/connection.py | |
parent | e18d568c6fdfa1a73fea01362d5bdf31aaa0d5b5 (diff) | |
download | rdiff-backup-9613406fbab1949f66fe7858590cab990c7b4b25.tar.gz |
First pass at integrating regress code
At this point most of the tests work, but there are still problems
with the finaltest error tests on /proc, and with some selection
options. The regress code is totally unchecked, and regresstest.py is
unwritten.
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@277 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/connection.py')
-rw-r--r-- | rdiff-backup/rdiff_backup/connection.py | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/rdiff-backup/rdiff_backup/connection.py b/rdiff-backup/rdiff_backup/connection.py index 5e23b91..90b8ea3 100644 --- a/rdiff-backup/rdiff_backup/connection.py +++ b/rdiff-backup/rdiff_backup/connection.py @@ -95,7 +95,6 @@ class LowLevelPipeConnection(Connection): f - file object b - string q - quit signal - t - TempFile R - RPath r - RORPath only c - PipeConnection object @@ -121,8 +120,6 @@ class LowLevelPipeConnection(Connection): Log.conn("sending", obj, req_num) if type(obj) is types.StringType: self._putbuf(obj, req_num) elif isinstance(obj, connection.Connection):self._putconn(obj, req_num) - elif isinstance(obj, TempFile.TempFile): - self._puttempfile(obj, req_num) elif isinstance(obj, rpath.RPath): self._putrpath(obj, req_num) elif isinstance(obj, rpath.RORPath): self._putrorpath(obj, req_num) elif ((hasattr(obj, "read") or hasattr(obj, "write")) @@ -148,12 +145,6 @@ class LowLevelPipeConnection(Connection): self._write("i", str(VirtualFile.new(rorpiter.ToFile(iterator))), req_num) - def _puttempfile(self, tempfile, req_num): - """Put a tempfile into pipe. See _putrpath""" - tf_repr = (tempfile.conn.conn_number, tempfile.base, - tempfile.index, tempfile.data) - self._write("t", cPickle.dumps(tf_repr, 1), req_num) - def _putrpath(self, rpath, req_num): """Put an rpath into the pipe @@ -235,7 +226,6 @@ class LowLevelPipeConnection(Connection): elif format_string == "i": result = rorpiter.FromFile(iterfile.BufferedRead( VirtualFile(self, int(data)))) - elif format_string == "t": result = self._gettempfile(data) elif format_string == "r": result = self._getrorpath(data) elif format_string == "R": result = self._getrpath(data) else: @@ -249,12 +239,6 @@ class LowLevelPipeConnection(Connection): index, data = cPickle.loads(raw_rorpath_buf) return rpath.RORPath(index, data) - def _gettempfile(self, raw_tf_buf): - """Return TempFile object indicated by raw_tf_buf""" - conn_number, base, index, data = cPickle.loads(raw_tf_buf) - return TempFile.TempFile(Globals.connection_dict[conn_number], - base, index, data) - def _getrpath(self, raw_rpath_buf): """Return RPath object indicated by raw_rpath_buf""" conn_number, base, index, data = cPickle.loads(raw_rpath_buf) |