[tor-commits] [bridgedb/develop] Simplify MailResponse by removing extra file I/O methods.

isis at torproject.org isis at torproject.org
Fri Jun 6 20:40:38 UTC 2014


commit cc3b60859dd85083053c989ebd3b1704fe867a75
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed May 21 04:18:02 2014 +0000

    Simplify MailResponse by removing extra file I/O methods.
    
    The only one we really need is MailResponse.close(), the utility methods
    (i.e. MailResponse.rewind()) handle other important functionality for
    us.
    
     * REMOVE bridgedb.email.server.MailResponse.flush()
     * REMOVE bridgedb.email.server.MailResponse.read()
     * REMOVE bridgedb.email.server.MailResponse.readline()
     * REMOVE bridgedb.email.server.MailResponse.readlines()
     * REMOVE bridgedb.email.server.MailResponse.seek()
     * REMOVE bridgedb.email.server.MailResponse.tell()
     * REMOVE bridgedb.email.server.MailResponse.truncate()
---
 lib/bridgedb/email/server.py |   29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py
index 077bc17..079960a 100644
--- a/lib/bridgedb/email/server.py
+++ b/lib/bridgedb/email/server.py
@@ -315,33 +315,6 @@ class MailResponse(object):
         self.closed = True
     close.__doc__ = mailfile.close.__doc__
 
-    def flush(self, *args, **kwargs): self.mailfile.flush(*args, **kwargs)
-    flush.__doc__ = mailfile.flush.__doc__
-
-    def read(self, *args, **kwargs):
-        self.mailfile.read(*args, **kwargs)
-    read.__doc__ = mailfile.read.__doc__
-
-    def readline(self, *args, **kwargs):
-        self.mailfile.readline(*args, **kwargs)
-    readline.__doc__ = mailfile.readline.__doc__
-
-    def readlines(self, *args, **kwargs):
-        self.mailfile.readlines(*args, **kwargs)
-    readlines.__doc__ = mailfile.readlines.__doc__
-
-    def seek(self, *args, **kwargs):
-        self.mailfile.seek(*args, **kwargs)
-    seek.__doc__ = mailfile.seek.__doc__
-
-    def tell(self, *args, **kwargs):
-        self.mailfile.tell(*args, **kwargs)
-    tell.__doc__ = mailfile.tell.__doc__
-
-    def truncate(self, *args, **kwargs):
-        self.mailfile.truncate(*args, **kwargs)
-    truncate.__doc__ = mailfile.truncate.__doc__
-
     # The following are custom methods to control reading and writing to the
     # underlying ``mailfile``.
 
@@ -361,7 +334,7 @@ class MailResponse(object):
 
     def rewind(self):
         """Rewind to the very beginning of the :cvar:`mailfile`."""
-        self.seek(0)
+        self.mailfile.seek(0)
 
     def write(self, line):
         """Any **line** written to me will have ``'\r\n'`` appended to it."""





More information about the tor-commits mailing list