Mailman 3 July 2005 - Python-checkins

python/dist/src/Lib/test test_weakref.py, 1.43, 1.44
by birkenfeld＠users.sourceforge.net July 2, 2005

July 2, 2005

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4005/Lib/test Modified Files: test_weakref.py Log Message: Add doctest for examples in libweakref.tex to test_weakref. Index: test_weakref.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_weakref.py,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- test_weakref.py 27 Mar 2005 03:04:53 -0000 1.43 +++ test_weakref.py 2 Jul 2005 19:07:30 -0000 1.44 @@ -1001,6 +1001,91 @@ def _reference(self): return self.__ref.copy() +libreftest = """ Doctest for examples in the library reference: libweakref.tex + +>>> import weakref +>>> class Dict(dict): +... pass +... +>>> obj = Dict(red=1, green=2, blue=3) # this object is weak referencable +>>> r = weakref.ref(obj) +>>> print r() +{'blue': 3, 'green': 2, 'red': 1} + +>>> import weakref +>>> class Object: +... pass +... +>>> o = Object() +>>> r = weakref.ref(o) +>>> o2 = r() +>>> o is o2 +True +>>> del o, o2 +>>> print r() +None + +>>> import weakref +>>> class ExtendedRef(weakref.ref): +... def __init__(self, ob, callback=None, **annotations): +... super(ExtendedRef, self).__init__(ob, callback) +... self.__counter = 0 +... for k, v in annotations.iteritems(): +... setattr(self, k, v) +... def __call__(self): +... '''Return a pair containing the referent and the number of +... times the reference has been called. +... ''' +... ob = super(ExtendedRef, self).__call__() +... if ob is not None: +... self.__counter += 1 +... ob = (ob, self.__counter) +... return ob +... +>>> class A: # not in docs from here, just testing the ExtendedRef +... pass +... +>>> a = A() +>>> r = ExtendedRef(a, foo=1, bar="baz") +>>> r.foo +1 +>>> r.bar +'baz' +>>> r()[1] +1 +>>> r()[1] +2 +>>> r()[0] is a +True + + +>>> import weakref +>>> _id2obj_dict = weakref.WeakValueDictionary() +>>> def remember(obj): +... oid = id(obj) +... _id2obj_dict[oid] = obj +... return oid +... +>>> def id2obj(oid): +... return _id2obj_dict[oid] +... +>>> a = A() # from here, just testing +>>> a_id = remember(a) +>>> id2obj(a_id) is a +True +>>> del a +>>> try: +... id2obj(a_id) +... except KeyError: +... print 'OK' +... else: +... print 'WeakValueDictionary error' +OK + +""" + +__test__ = {'libreftest' : libreftest} + def test_main(): test_support.run_unittest( ReferencesTestCase, @@ -1008,6 +1093,7 @@ WeakValueDictionaryTestCase, WeakKeyDictionaryTestCase, ) + test_support.run_doctest(sys.modules[__name__]) if __name__ == "__main__":

1 0

python/dist/src/Lib/compiler transformer.py, 1.49, 1.49.2.1
by birkenfeld＠users.sourceforge.net July 2, 2005

July 2, 2005

Update of /cvsroot/python/python/dist/src/Lib/compiler In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21455/Lib/compiler Modified Files: Tag: release24-maint transformer.py Log Message: backport patch [ 1231538 ] Typo fix in compiler/transformer.py (WalkerEror) Index: transformer.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/compiler/transformer.py,v retrieving revision 1.49 retrieving revision 1.49.2.1 diff -u -d -r1.49 -r1.49.2.1 --- transformer.py 8 Nov 2004 12:17:34 -0000 1.49 +++ transformer.py 2 Jul 2005 18:38:12 -0000 1.49.2.1 @@ -89,7 +89,7 @@ print nodes[kind], len(args), args raise else: - raise WalkerEror, "Can't find appropriate Node type: %s" % str(args) + raise WalkerError, "Can't find appropriate Node type: %s" % str(args) #return apply(ast.Node, args) class Transformer: @@ -165,7 +165,7 @@ if n == symbol.classdef: return self.classdef(node[1:]) - raise WalkerEror, ('unexpected node type', n) + raise WalkerError, ('unexpected node type', n) def single_input(self, node): ### do we want to do anything about being "interactive" ? @@ -314,31 +314,31 @@ return Stmt(stmts) def parameters(self, nodelist): - raise WalkerEror + raise WalkerError def varargslist(self, nodelist): - raise WalkerEror + raise WalkerError def fpdef(self, nodelist): - raise WalkerEror + raise WalkerError def fplist(self, nodelist): - raise WalkerEror + raise WalkerError def dotted_name(self, nodelist): - raise WalkerEror + raise WalkerError def comp_op(self, nodelist): - raise WalkerEror + raise WalkerError def trailer(self, nodelist): - raise WalkerEror + raise WalkerError def sliceop(self, nodelist): - raise WalkerEror + raise WalkerError def argument(self, nodelist): - raise WalkerEror + raise WalkerError # -------------------------------------------------------------- #

1 0

python/dist/src/Lib/compiler transformer.py, 1.50, 1.51
by birkenfeld＠users.sourceforge.net July 2, 2005

July 2, 2005

Update of /cvsroot/python/python/dist/src/Lib/compiler In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21255/Lib/compiler Modified Files: transformer.py Log Message: patch [ 1231538 ] Typo fix in compiler/transformer.py (WalkerEror) Index: transformer.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/compiler/transformer.py,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- transformer.py 9 Apr 2005 02:30:16 -0000 1.50 +++ transformer.py 2 Jul 2005 18:37:41 -0000 1.51 @@ -89,7 +89,7 @@ print nodes[kind], len(args), args raise else: - raise WalkerEror, "Can't find appropriate Node type: %s" % str(args) + raise WalkerError, "Can't find appropriate Node type: %s" % str(args) #return apply(ast.Node, args) class Transformer: @@ -165,7 +165,7 @@ if n == symbol.classdef: return self.classdef(node[1:]) - raise WalkerEror, ('unexpected node type', n) + raise WalkerError, ('unexpected node type', n) def single_input(self, node): ### do we want to do anything about being "interactive" ? @@ -316,31 +316,31 @@ return Stmt(stmts) def parameters(self, nodelist): - raise WalkerEror + raise WalkerError def varargslist(self, nodelist): - raise WalkerEror + raise WalkerError def fpdef(self, nodelist): - raise WalkerEror + raise WalkerError def fplist(self, nodelist): - raise WalkerEror + raise WalkerError def dotted_name(self, nodelist): - raise WalkerEror + raise WalkerError def comp_op(self, nodelist): - raise WalkerEror + raise WalkerError def trailer(self, nodelist): - raise WalkerEror + raise WalkerError def sliceop(self, nodelist): - raise WalkerEror + raise WalkerError def argument(self, nodelist): - raise WalkerEror + raise WalkerError # -------------------------------------------------------------- #

1 0

python/dist/src/Doc/lib libweakref.tex, 1.27, 1.27.4.1
by birkenfeld＠users.sourceforge.net July 2, 2005

July 2, 2005

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20243/Doc/lib Modified Files: Tag: release24-maint libweakref.tex Log Message: backport bug [ 1228904 ] weakref example broken Index: libweakref.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libweakref.tex,v retrieving revision 1.27 retrieving revision 1.27.4.1 diff -u -d -r1.27 -r1.27.4.1 --- libweakref.tex 2 Jul 2004 18:57:41 -0000 1.27 +++ libweakref.tex 2 Jul 2005 10:44:38 -0000 1.27.4.1 @@ -255,13 +255,10 @@ import weakref class ExtendedRef(weakref.ref): - def __new__(cls, ob, callback=None, **annotations): - weakref.ref.__new__(cls, ob, callback) - self.__counter = 0 - def __init__(self, ob, callback=None, **annotations): super(ExtendedRef, self).__init__(ob, callback) - for k, v in annotations: + self.__counter = 0 + for k, v in annotations.iteritems(): setattr(self, k, v) def __call__(self):

1 0

python/dist/src/Doc/lib libweakref.tex, 1.27, 1.28
by birkenfeld＠users.sourceforge.net July 2, 2005

July 2, 2005

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20092/Doc/lib Modified Files: libweakref.tex Log Message: bug [ 1228904 ] weakref example broken Index: libweakref.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libweakref.tex,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- libweakref.tex 2 Jul 2004 18:57:41 -0000 1.27 +++ libweakref.tex 2 Jul 2005 10:44:32 -0000 1.28 @@ -255,13 +255,10 @@ import weakref class ExtendedRef(weakref.ref): - def __new__(cls, ob, callback=None, **annotations): - weakref.ref.__new__(cls, ob, callback) - self.__counter = 0 - def __init__(self, ob, callback=None, **annotations): super(ExtendedRef, self).__init__(ob, callback) - for k, v in annotations: + self.__counter = 0 + for k, v in annotations.iteritems(): setattr(self, k, v) def __call__(self):

1 0

python/dist/src/Doc/ref ref3.tex, 1.121.2.3, 1.121.2.4
by birkenfeld＠users.sourceforge.net July 2, 2005

July 2, 2005

Update of /cvsroot/python/python/dist/src/Doc/ref In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11540/Doc/ref Modified Files: Tag: release24-maint ref3.tex Log Message: backport patch [ 1230615 ] Patch for (Doc) #1168746 (frame.f_exc_*) backport bug [ 1204734 ] incorrect description of __getattribute__ Index: ref3.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/ref/ref3.tex,v retrieving revision 1.121.2.3 retrieving revision 1.121.2.4 diff -u -d -r1.121.2.3 -r1.121.2.4 --- ref3.tex 26 Apr 2005 05:20:03 -0000 1.121.2.3 +++ ref3.tex 2 Jul 2005 10:28:29 -0000 1.121.2.4 @@ -604,7 +604,7 @@ have reached the end of the set of values to be returned. \item[Built-in functions] -A built-in function object is a wrapper around a \C{} function. Examples +A built-in function object is a wrapper around a C function. Examples of built-in functions are \function{len()} and \function{math.sin()} (\module{math} is a standard built-in module). The number and type of the arguments are @@ -917,14 +917,16 @@ \ttindex{f_builtins} \ttindex{f_restricted}} -Special writable attributes: \member{f_trace}, if not \code{None}, is a -function called at the start of each source code line (this is used by -the debugger); \member{f_exc_type}, \member{f_exc_value}, -\member{f_exc_traceback} represent the most recent exception caught in -this frame; \member{f_lineno} is the current line number of the frame ---- writing to this from within a trace function jumps to the given line -(only for the bottom-most frame). A debugger can implement a Jump -command (aka Set Next Statement) by writing to f_lineno. +Special writable attributes: \member{f_trace}, if not \code{None}, is +a function called at the start of each source code line (this is used +by the debugger); \member{f_exc_type}, \member{f_exc_value}, +\member{f_exc_traceback} represent the last exception raised in the +parent frame provided another exception was ever raised in the current +frame (in all other cases they are None); \member{f_lineno} is the +current line number of the frame --- writing to this from within a +trace function jumps to the given line (only for the bottom-most +frame). A debugger can implement a Jump command (aka Set Next +Statement) by writing to f_lineno. \withsubitem{(frame attribute)}{ \ttindex{f_trace} \ttindex{f_exc_type} @@ -1335,8 +1337,9 @@ \begin{methoddesc}[object]{__getattribute__}{self, name} Called unconditionally to implement attribute accesses for instances -of the class. If the class also defines \method{__getattr__}, it will -never be called (unless called explicitly). +of the class. If the class also defines \method{__getattr__}, the latter +will not be called unless \method{__getattribute__()} either calls it +explicitly or raises an \exception{AttributeError}. This method should return the (computed) attribute value or raise an \exception{AttributeError} exception. In order to avoid infinite recursion in this method, its

1 0

python/dist/src/Doc/ref ref3.tex,1.124,1.125
by birkenfeld＠users.sourceforge.net July 2, 2005

July 2, 2005

Update of /cvsroot/python/python/dist/src/Doc/ref In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11040/Doc/ref Modified Files: ref3.tex Log Message: Patch [ 1230615 ] Patch for (Doc) #1168746 Bug [ 1204734 ] incorrect description of __getattribute__ Index: ref3.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/ref/ref3.tex,v retrieving revision 1.124 retrieving revision 1.125 diff -u -d -r1.124 -r1.125 --- ref3.tex 26 Apr 2005 05:18:53 -0000 1.124 +++ ref3.tex 2 Jul 2005 10:27:31 -0000 1.125 @@ -604,7 +604,7 @@ have reached the end of the set of values to be returned. \item[Built-in functions] -A built-in function object is a wrapper around a \C{} function. Examples +A built-in function object is a wrapper around a C function. Examples of built-in functions are \function{len()} and \function{math.sin()} (\module{math} is a standard built-in module). The number and type of the arguments are @@ -917,14 +917,16 @@ \ttindex{f_builtins} \ttindex{f_restricted}} -Special writable attributes: \member{f_trace}, if not \code{None}, is a -function called at the start of each source code line (this is used by -the debugger); \member{f_exc_type}, \member{f_exc_value}, -\member{f_exc_traceback} represent the most recent exception caught in -this frame; \member{f_lineno} is the current line number of the frame ---- writing to this from within a trace function jumps to the given line -(only for the bottom-most frame). A debugger can implement a Jump -command (aka Set Next Statement) by writing to f_lineno. +Special writable attributes: \member{f_trace}, if not \code{None}, is +a function called at the start of each source code line (this is used +by the debugger); \member{f_exc_type}, \member{f_exc_value}, +\member{f_exc_traceback} represent the last exception raised in the +parent frame provided another exception was ever raised in the current +frame (in all other cases they are None); \member{f_lineno} is the +current line number of the frame --- writing to this from within a +trace function jumps to the given line (only for the bottom-most +frame). A debugger can implement a Jump command (aka Set Next +Statement) by writing to f_lineno. \withsubitem{(frame attribute)}{ \ttindex{f_trace} \ttindex{f_exc_type} @@ -1335,8 +1337,9 @@ \begin{methoddesc}[object]{__getattribute__}{self, name} Called unconditionally to implement attribute accesses for instances -of the class. If the class also defines \method{__getattr__}, it will -never be called (unless called explicitly). +of the class. If the class also defines \method{__getattr__}, the latter +will not be called unless \method{__getattribute__()} either calls it +explicitly or raises an \exception{AttributeError}. This method should return the (computed) attribute value or raise an \exception{AttributeError} exception. In order to avoid infinite recursion in this method, its

1 0

python/dist/src/Doc/lib libstdtypes.tex, 1.170.2.10, 1.170.2.11
by rhettinger＠users.sourceforge.net July 1, 2005

July 1, 2005

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32556 Modified Files: Tag: release24-maint libstdtypes.tex Log Message: Cross reference the set built-ins with the sets module. Index: libstdtypes.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libstdtypes.tex,v retrieving revision 1.170.2.10 retrieving revision 1.170.2.11 diff -u -d -r1.170.2.10 -r1.170.2.11 --- libstdtypes.tex 14 Jun 2005 08:47:19 -0000 1.170.2.10 +++ libstdtypes.tex 1 Jul 2005 23:25:27 -0000 1.170.2.11 @@ -1291,6 +1291,14 @@ \method{symmetric_difference_update()} methods will accept any iterable as an argument. +The design of the set types was based on lessons learned from the +\module{sets} module. + +\begin{seealso} + \seemodule[comparison-to-builtin-set]{sets}{Differences between + the \module{sets} module and the built-in set types.} +\end{seealso} + \subsection{Mapping Types --- class{dict} \label{typesmapping}} \obindex{mapping}

1 0

python/dist/src/Doc/lib libstdtypes.tex, 1.181, 1.182
by rhettinger＠users.sourceforge.net July 1, 2005

July 1, 2005

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28915 Modified Files: libstdtypes.tex Log Message: Cross reference the set built-ins with the sets module. Index: libstdtypes.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libstdtypes.tex,v retrieving revision 1.181 retrieving revision 1.182 diff -u -d -r1.181 -r1.182 --- libstdtypes.tex 14 Jun 2005 08:45:43 -0000 1.181 +++ libstdtypes.tex 1 Jul 2005 23:18:36 -0000 1.182 @@ -1291,6 +1291,14 @@ \method{symmetric_difference_update()} methods will accept any iterable as an argument. +The design of the set types was based on lessons learned from the +\module{sets} module. + +\begin{seealso} + \seemodule[comparison-to-builtin-set]{sets}{Differences between + the \module{sets} module and the built-in set types.} +\end{seealso} + \subsection{Mapping Types --- class{dict} \label{typesmapping}} \obindex{mapping}

1 0

python/dist/src/Doc/lib libsets.tex, 1.15.4.2, 1.15.4.3
by rhettinger＠users.sourceforge.net July 1, 2005

July 1, 2005

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20487 Modified Files: Tag: release24-maint libsets.tex Log Message: Provide a comparison to the builtin set types. Index: libsets.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libsets.tex,v retrieving revision 1.15.4.2 retrieving revision 1.15.4.3 diff -u -d -r1.15.4.2 -r1.15.4.3 --- libsets.tex 10 Apr 2005 17:36:26 -0000 1.15.4.2 +++ libsets.tex 1 Jul 2005 23:01:46 -0000 1.15.4.3 @@ -133,7 +133,7 @@ but not found in \class{ImmutableSet}: \begin{tableiii}{c|c|l}{code}{Operation}{Equivalent}{Result} - \lineiii{\var{s}.union_update(\var{t})} + \lineiii{\var{s}.update(\var{t})} {\var{s} \textbar= \var{t}} {return set \var{s} with elements added from \var{t}} \lineiii{\var{s}.intersection_update(\var{t})} @@ -161,12 +161,17 @@ {remove all elements from set \var{s}} \end{tableiii} -Note, the non-operator versions of \method{union_update()}, +Note, the non-operator versions of \method{update()}, \method{intersection_update()}, \method{difference_update()}, and \method{symmetric_difference_update()} will accept any iterable as an argument. \versionchanged[Formerly all arguments were required to be sets]{2.3.1} +Also note, the module also includes a \method{union_update()} method +which is an alias for \method{update()}. The method is included for +backwards compatability. Programmers should prefer the +\method{update()} method because it the one supported by the builtin +\class{set()} and \class{frozenset()} types. \subsection{Example \label{set-example}} @@ -231,3 +236,28 @@ where one thread is updating a set while another has temporarily wrapped it in \class{_TemporarilyImmutableSet}. In other words, sets of mutable sets are not thread-safe. + + +\subsection{Comparison to the built-in \class{set} types + \label{comparison-to-builtin-set}} + +The built-in \class{set} and \class{frozenset} types were designed based +on lessons learned from the \module{sets} module. The key differences are: + +\begin{itemize} +\item \class{Set} and \class{ImmutableSet} were renamed to \class{set} and + \class{frozenset}. +\item There is no equivalent to \class{BaseSet}. Instead, use + \code{isinstance(x, (set, frozenset))}. +\item The hash algorithm for the built-ins performs significantly better + (fewer collisions) for most datasets. +\item The built-in versions have more space efficient pickles. +\item The built-in versions do not have a \method{union_update()} method. + Instead, use the \method{update()} method which is equivalent. +\item The built-in versions do not have a \method{_repr(sort=True)} method. + Instead, use the built-in \function{repr()} and \function{sorted()} + functions: \code{repr(sorted(s))}. +\item The built-in version does not have a protocol for automatic conversion + to immutable. Many found this feature to be confusing and no one + in the community reported having found real uses for it. +\end{itemize}

1 0