From: Neal Norwitz <nnorwitz@gmail.com>
Date: Thu, 13 Jun 2002 22:18:39 +0000 (+0000)
Subject: Cleanup a little
X-Git-Tag: v2.3c1~5325
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b3429005517673ee5903d4030990ee2b5c29171;p=thirdparty%2FPython%2Fcpython.git

Cleanup a little
---

diff --git a/Lib/socket.py b/Lib/socket.py
index 04e2e33f0504..bd0bfd7db485 100644
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -197,7 +197,7 @@ class _fileobject:
             self._sock.sendall(buffer)
             self._wbuf = [ ]
 
-    def fileno (self):
+    def fileno(self):
         return self._sock.fileno()
 
     def write(self, data):
@@ -235,19 +235,19 @@ class _fileobject:
                 break
             buf_len += len(data)
             self._rbuf.append(data)
-        data = ''.join(self._rbuf)
         # Clear the rbuf at the end so we're not affected by
         # an exception during a recv
+        data = ''.join(self._rbuf)
         self._rbuf = [ ]
         if buf_len > size and size >= 0:
-           self._rbuf.append(data[size:])
-           data = data[:size]
+            self._rbuf.append(data[size:])
+            data = data[:size]
         return data
 
     def readline(self, size=-1):
         index = -1
         buf_len = self.__get_rbuf_len()
-        if len (self._rbuf):
+        if self._rbuf:
             index = min([x.find('\n') for x in self._rbuf])
         while index < 0 and (size < 0 or buf_len < size):
             recv_size = max(self._rbufsize, size - buf_len)
@@ -275,7 +275,8 @@ class _fileobject:
         list = []
         while 1:
             line = self.readline()
-            if not line: break
+            if not line:
+                break
             list.append(line)
             total += len(line)
             if sizehint and total >= sizehint: