close() can now exist everywhere

There is no requirement to special case _close() because of the fixes in
task.py whereby we do the right thing when it comes to the ROFB.

1 files changed, 3 insertions, 4 deletions

diff --git a/waitress/buffers.py b/waitress/buffers.py
index 65f9ef3..0ac51aa 100644
--- a/waitress/buffers.py
+++ b/waitress/buffers.py
@@ -103,13 +103,15 @@ class FileBasedBuffer(object):
     def getfile(self):
         return self.file
 
-    def _close(self):
+    def close(self):
         # named _close because ReadOnlyFileBasedBuffer is used as
         # wsgi file.wrapper, and its protocol reserves "close"
         if hasattr(self.file, 'close'):
             self.file.close()
         self.remain = 0
 
+    _close = close
+
 class TempfileBasedBuffer(FileBasedBuffer):
 
     def __init__(self, from_buffer=None):
@@ -138,9 +140,6 @@ class ReadOnlyFileBasedBuffer(FileBasedBuffer):
         self.file = file
         self.block_size = block_size # for __iter__
 
-    def close(self):
-        self._close()
-
     def prepare(self, size=None):
         if hasattr(self.file, 'seek') and hasattr(self.file, 'tell'):
             start_pos = self.file.tell()