[Python-checkins] CVS: python/dist/src/Lib pickle.py,1.48,1.49 repr.py,1.9,1.10 types.py,1.16,1.17 xmlrpclib.py,1.1,1.2

[Tim Peters]

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

Modified Files:
	pickle.py repr.py types.py xmlrpclib.py 
Log Message:
Merge of descr-branch back into trunk.


Index: pickle.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pickle.py,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** pickle.py	2001/04/10 05:02:52	1.48
--- pickle.py	2001/08/02 04:15:00	1.49
***************
*** 505,508 ****
--- 505,509 ----
      dispatch[FunctionType] = save_global
      dispatch[BuiltinFunctionType] = save_global
+     dispatch[TypeType] = save_global
  
  

Index: repr.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/repr.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** repr.py	2001/02/15 22:15:13	1.9
--- repr.py	2001/08/02 04:15:00	1.10
***************
*** 63,67 ****
          if n > self.maxdict: s = s + ', ...'
          return '{' + s + '}'
!     def repr_string(self, x, level):
          s = `x[:self.maxstring]`
          if len(s) > self.maxstring:
--- 63,67 ----
          if n > self.maxdict: s = s + ', ...'
          return '{' + s + '}'
!     def repr_str(self, x, level):
          s = `x[:self.maxstring]`
          if len(s) > self.maxstring:
***************
*** 71,75 ****
              s = s[:i] + '...' + s[len(s)-j:]
          return s
!     def repr_long_int(self, x, level):
          s = `x` # XXX Hope this isn't too slow...
          if len(s) > self.maxlong:
--- 71,75 ----
              s = s[:i] + '...' + s[len(s)-j:]
          return s
!     def repr_long(self, x, level):
          s = `x` # XXX Hope this isn't too slow...
          if len(s) > self.maxlong:

Index: types.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/types.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** types.py	2001/07/15 21:08:29	1.16
--- types.py	2001/08/02 04:15:00	1.17
***************
*** 8,12 ****
  
  NoneType = type(None)
! TypeType = type(NoneType)
  
  IntType = type(0)
--- 8,13 ----
  
  NoneType = type(None)
! TypeType = type
! ObjectType = object
  
  IntType = type(0)
***************
*** 23,28 ****
  
  TupleType = type(())
! ListType = type([])
! DictType = DictionaryType = type({})
  
  def _f(): pass
--- 24,29 ----
  
  TupleType = type(())
! ListType = list
! DictType = DictionaryType = dictionary
  
  def _f(): pass
***************
*** 71,74 ****
--- 72,80 ----
  SliceType = type(slice(0))
  EllipsisType = type(Ellipsis)
+ 
+ DictIterType = type(iter({}))
+ SequenceIterType = type(iter([]))
+ FunctionIterType = type(iter(lambda: 0, 0))
+ DictProxyType = type(TypeType.__dict__)
  
  del sys, _f, _C, _x                     # Not for export

Index: xmlrpclib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/xmlrpclib.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2