[Python-checkins] python/dist/src/Lib/test test_socket.py,1.31,1.32

gvanrossum@users.sourceforge.net gvanrossum@users.sourceforge.net
Wed, 12 Jun 2002 14:29:45 -0700


Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv19333

Modified Files:
	test_socket.py 
Log Message:
Remove some overly complicated ways to concatenate and repeat strings
using "".join().  Fold a long line.


Index: test_socket.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_socket.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** test_socket.py	12 Jun 2002 21:19:40 -0000	1.31
--- test_socket.py	12 Jun 2002 21:29:43 -0000	1.32
***************
*** 52,57 ****
  
          # Do some munging to start the client test.
!         test_method = getattr(self, ''.join(('_', self._TestCase__testMethodName)))
!         self.client_thread = thread.start_new_thread(self.clientRun, (test_method, ))
  
          self.__setUp()
--- 52,58 ----
  
          # Do some munging to start the client test.
!         test_method = getattr(self, '_' + self._TestCase__testMethodName)
!         self.client_thread = thread.start_new_thread(
!             self.clientRun, (test_method,))
  
          self.__setUp()
***************
*** 282,286 ****
          seg1 = self.cli_conn.recv(len(MSG) - 3)
          seg2 = self.cli_conn.recv(1024)
!         msg = ''.join ((seg1, seg2))
          self.assertEqual(msg, MSG)
  
--- 283,287 ----
          seg1 = self.cli_conn.recv(len(MSG) - 3)
          seg2 = self.cli_conn.recv(1024)
!         msg = seg1 + seg2
          self.assertEqual(msg, MSG)
  
***************
*** 302,306 ****
          seg1, addr = self.cli_conn.recvfrom(len(MSG)-3)
          seg2, addr = self.cli_conn.recvfrom(1024)
!         msg = ''.join((seg1, seg2))
          hostname, port = addr
          ##self.assertEqual(hostname, socket.gethostbyname('localhost'))
--- 303,307 ----
          seg1, addr = self.cli_conn.recvfrom(len(MSG)-3)
          seg2, addr = self.cli_conn.recvfrom(1024)
!         msg = seg1 + seg2
          hostname, port = addr
          ##self.assertEqual(hostname, socket.gethostbyname('localhost'))
***************
*** 321,325 ****
  
      def _testSendAll(self):
!         big_chunk = ''.join([ 'f' ] * 2048)
          self.serv_conn.sendall(big_chunk)
  
--- 322,326 ----
  
      def _testSendAll(self):
!         big_chunk = 'f' * 2048
          self.serv_conn.sendall(big_chunk)
  
***************
*** 474,478 ****
          first_seg = self.serv_file.read(len(MSG)-3)
          second_seg = self.serv_file.read(3)
!         msg = ''.join((first_seg, second_seg))
          self.assertEqual(msg, MSG)
  
--- 475,479 ----
          first_seg = self.serv_file.read(len(MSG)-3)
          second_seg = self.serv_file.read(3)
!         msg = first_seg + second_seg
          self.assertEqual(msg, MSG)