[Python-checkins] CVS: python/dist/src/Lib socket.py,1.10,1.11 symtable.py,1.2,1.3 traceback.py,1.24,1.25 unittest.py,1.2,1.3 zipfile.py,1.9,1.10

2001年3月28日 20:36:11 -0800

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv23058/python/dist/src/Lib
Modified Files:
	socket.py symtable.py traceback.py unittest.py zipfile.py 
Log Message:
Whitespace normalization.
Index: socket.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/socket.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** socket.py	2001年03月22日 22:12:17	1.10
--- socket.py	2001年03月29日 04:36:08	1.11
***************
*** 64,68 ****
 if hasattr(sock, "_sock"):
 sock = sock._sock
! return _realsslcall(sock, keyfile, certfile) 

--- 64,68 ----
 if hasattr(sock, "_sock"):
 sock = sock._sock
! return _realsslcall(sock, keyfile, certfile)

Index: symtable.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/symtable.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** symtable.py	2001年03月23日 15:41:14	1.2
--- symtable.py	2001年03月29日 04:36:08	1.3
***************
*** 35,39 ****

 newSymbolTable = SymbolTableFactory()
! 
 def bool(x):
 """Helper to force boolean result to 1 or 0"""
--- 35,39 ----

 newSymbolTable = SymbolTableFactory()
! 
 def bool(x):
 """Helper to force boolean result to 1 or 0"""
***************
*** 61,65 ****
 else:
 kind = "%s " % self.__class__.__name__
! 
 if self._table.name == "global":
 return "<%sSymbolTable for module %s>" % (kind, self._filename)
--- 61,65 ----
 else:
 kind = "%s " % self.__class__.__name__
! 
 if self._table.name == "global":
 return "<%sSymbolTable for module %s>" % (kind, self._filename)
***************
*** 144,148 ****
 self.__locals = self.__idents_matching(lambda x:x & DEF_BOUND)
 return self.__locals
! 
 def get_globals(self):
 if self.__globals is None:
--- 144,148 ----
 self.__locals = self.__idents_matching(lambda x:x & DEF_BOUND)
 return self.__locals
! 
 def get_globals(self):
 if self.__globals is None:
***************
*** 187,191 ****

 def is_global(self):
! return bool((self.__flags & DEF_GLOBAL) 
 or (self.__flags & DEF_FREE_GLOBAL))

--- 187,191 ----

 def is_global(self):
! return bool((self.__flags & DEF_GLOBAL)
 or (self.__flags & DEF_FREE_GLOBAL))

Index: traceback.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/traceback.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** traceback.py	2001年03月21日 20:29:18	1.24
--- traceback.py	2001年03月29日 04:36:08	1.25
***************
*** 222,226 ****
 def print_stack(f=None, limit=None, file=None):
 """Print a stack trace from its invocation point.
! 
 The optional 'f' argument can be used to specify an alternate
 stack frame at which to start. The optional 'limit' and 'file'
--- 222,226 ----
 def print_stack(f=None, limit=None, file=None):
 """Print a stack trace from its invocation point.
! 
 The optional 'f' argument can be used to specify an alternate
 stack frame at which to start. The optional 'limit' and 'file'
Index: unittest.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/unittest.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unittest.py	2001年03月22日 08:45:36	1.2
--- unittest.py	2001年03月29日 04:36:08	1.3
***************
*** 104,108 ****
 "Indicates that the tests should be aborted"
 self.shouldStop = 1
! 
 def __repr__(self):
 return "<%s run=%i errors=%i failures=%i>" % \
--- 104,108 ----
 "Indicates that the tests should be aborted"
 self.shouldStop = 1
! 
 def __repr__(self):
 return "<%s run=%i errors=%i failures=%i>" % \
***************
*** 117,126 ****
 'runTest'.

! If the fixture may be used for many test cases, create as 
 many test methods as are needed. When instantiating such a TestCase
 subclass, specify in the constructor arguments the name of the test method
 that the instance is to execute.

! Test authors should subclass TestCase for their own tests. Construction 
 and deconstruction of the test's environment ('fixture') can be
 implemented by overriding the 'setUp' and 'tearDown' methods respectively.
--- 117,126 ----
 'runTest'.

! If the fixture may be used for many test cases, create as
 many test methods as are needed. When instantiating such a TestCase
 subclass, specify in the constructor arguments the name of the test method
 that the instance is to execute.

! Test authors should subclass TestCase for their own tests. Construction
 and deconstruction of the test's environment ('fixture') can be
 implemented by overriding the 'setUp' and 'tearDown' methods respectively.
***************
*** 481,485 ****
 if args: apply(self.write, args)
 self.write('\n') # text-mode streams translate to \r\n if needed
! 

 class _TextTestResult(TestResult):
--- 481,485 ----
 if args: apply(self.write, args)
 self.write('\n') # text-mode streams translate to \r\n if needed
! 

 class _TextTestResult(TestResult):
***************
*** 551,555 ****
 class TextTestRunner:
 """A test runner class that displays results in textual form.
! 
 It prints out the names of tests as they are run, errors as they
 occur, and a summary of the results at the end of the test run.
--- 551,555 ----
 class TextTestRunner:
 """A test runner class that displays results in textual form.
! 
 It prints out the names of tests as they are run, errors as they
 occur, and a summary of the results at the end of the test run.
***************
*** 588,592 ****
 self.stream.writeln("OK")
 return result
! 

--- 588,592 ----
 self.stream.writeln("OK")
 return result
! 

***************
*** 669,673 ****
 self.testRunner = TextTestRunner(verbosity=self.verbosity)
 result = self.testRunner.run(self.test)
! sys.exit(not result.wasSuccessful()) 

 main = TestProgram
--- 669,673 ----
 self.testRunner = TextTestRunner(verbosity=self.verbosity)
 result = self.testRunner.run(self.test)
! sys.exit(not result.wasSuccessful())

 main = TestProgram
Index: zipfile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/zipfile.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** zipfile.py	2001年03月26日 15:49:24	1.9
--- zipfile.py	2001年03月29日 04:36:08	1.10
***************
*** 132,139 ****

 class ZipFile:
! """ Class with methods to open, read, write, close, list zip files. 
! 
 z = ZipFile(file, mode="r", compression=ZIP_STORED)
! 
 file: Either the path to the file, or a file-like object.
 If it is a path, the file will be opened and closed by ZipFile.
--- 132,139 ----

 class ZipFile:
! """ Class with methods to open, read, write, close, list zip files.
! 
 z = ZipFile(file, mode="r", compression=ZIP_STORED)
! 
 file: Either the path to the file, or a file-like object.
 If it is a path, the file will be opened and closed by ZipFile.
***************
*** 159,163 ****
 self.compression = compression # Method of compression
 self.mode = key = mode[0]
! 
 # Check if we were passed a file-like object
 if type(file) in _STRING_TYPES:
--- 159,163 ----
 self.compression = compression # Method of compression
 self.mode = key = mode[0]
! 
 # Check if we were passed a file-like object
 if type(file) in _STRING_TYPES:
***************
*** 170,174 ****
 self.fp = file
 self.filename = getattr(file, 'name', None)
! 
 if key == 'r':
 self._GetContents()
--- 170,174 ----
 self.fp = file
 self.filename = getattr(file, 'name', None)
! 
 if key == 'r':
 self._GetContents()