[Rdiff-backup-commits] Changes to rdiff-backup/rdiff_backup/rpath.py

[Ben Escoto]

Index: rdiff-backup/rdiff_backup/rpath.py
diff -u rdiff-backup/rdiff_backup/rpath.py:1.95 
rdiff-backup/rdiff_backup/rpath.py:1.96
--- rdiff-backup/rdiff_backup/rpath.py:1.95     Sun Nov  6 06:51:17 2005
+++ rdiff-backup/rdiff_backup/rpath.py  Sat Nov 19 03:10:03 2005
@@ -265,7 +265,7 @@
 def gzip_open_local_read(rpath):
        """Return open GzipFile.  See security note directly above"""
        assert rpath.conn is Globals.local_connection
-       return gzip.GzipFile(rpath.path, "rb")
+       return GzipFile(rpath.path, "rb")
 
 def open_local_read(rpath):
        """Return open file (provided for security reasons)"""
@@ -982,13 +982,13 @@
 
                """
                if self.conn is Globals.local_connection:
-                       if compress: return gzip.GzipFile(self.path, mode)
+                       if compress: return GzipFile(self.path, mode)
                        else: return open(self.path, mode)
 
                if compress:
                        if mode == "r" or mode == "rb":
                                return 
self.conn.rpath.gzip_open_local_read(self)
-                       else: return self.conn.gzip.GzipFile(self.path, mode)
+                       else: return self.conn.rpath.GzipFile(self.path, mode)
                else:
                        if mode == "r" or mode == "rb":
                                return self.conn.rpath.open_local_read(self)
@@ -1215,6 +1215,16 @@
                result = self.file.close()
                self.closing_thunk()
                return result
+
+
+class GzipFile(gzip.GzipFile):
+       """Like gzip.GzipFile, except remove destructor
+
+       The default GzipFile's destructor prints out some messy error
+       messages.  Use this class instead to clean those up.
+
+       """
+       def __del__(self): pass
 
 
 def setdata_local(rpath):