Mailman 3 January 2004 - Python-checkins

python/dist/src/Modules collectionsmodule.c, 1.1, 1.2
by rhettinger＠projects.sourceforge.net 28 Jan '04

28 Jan '04

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9494 Modified Files: collectionsmodule.c Log Message: Fix spelling. Index: collectionsmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/collectionsmodule.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** collectionsmodule.c 29 Jan 2004 06:37:51 -0000 1.1 --- collectionsmodule.c 29 Jan 2004 07:29:32 -0000 1.2 *************** *** 110,114 **** if (deque->len == 0) { ! PyErr_SetString(PyExc_LookupError, "pop from an emtpy deque"); return NULL; } --- 110,114 ---- if (deque->len == 0) { ! PyErr_SetString(PyExc_LookupError, "pop from an empty deque"); return NULL; } *************** *** 145,149 **** if (deque->len == 0) { ! PyErr_SetString(PyExc_LookupError, "pop from an emtpy deque"); return NULL; } --- 145,149 ---- if (deque->len == 0) { ! PyErr_SetString(PyExc_LookupError, "pop from an empty deque"); return NULL; }

1 0

python/dist/src/Doc/lib libcollections.tex, NONE, 1.1
by rhettinger＠projects.sourceforge.net 28 Jan '04

28 Jan '04

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9130 Added Files: libcollections.tex Log Message: Add documentation for collections.deque(). --- NEW FILE: libcollections.tex --- \section{\module{collections} --- High-performance datatypes} \declaremodule{standard}{collections} \modulesynopsis{High-performance datatypes} \moduleauthor{Raymond Hettinger}{python(a)rcn.com} \sectionauthor{Raymond Hettinger}{python(a)rcn.com} \versionadded{2.4} This module implements high-performance datatypes. Currently, the only datatype is a deque. Future additions may include B-trees and Fibonacci heaps. \begin{funcdesc}{deque}{\optional{iterable}} Returns a new deque objected initialized left-to-right (using \method{append()}) with data from \var{iterable}. If \var{iterable} is not specified, the new deque is empty. Deques are a generalization of stacks and queues. They support thread-safe, memory efficient appends and pops from either side of the deque with approximately the same performance in either direction. \versionadded{2.4} \end{funcdesc} Deque objects support the following methods: \begin{methoddesc}{append}{x} Add \var{x} to the right side of the deque. \end{methoddesc} \begin{methoddesc}{appendleft}{x} Add \var{x} to the left side of the deque. \end{methoddesc} \begin{methoddesc}{clear}{} Remove all elements from the deque leaving it with length 0. \end{methoddesc} \begin{methoddesc}{pop}{} Remove and return an element from the right side of the deque. If no elements are present, raises a \exception{LookupError}. \end{methoddesc} \begin{methoddesc}{popleft}{} Remove and return an element from the left side of the deque. If no elements are present, raises a \exception{LookupError}. \end{methoddesc} In addition to the above, deques support iteration, membership testing using the \keyword{in} operator, \samp{len(d)}, \samp{copy.copy(d)}, \samp{copy.deepcopy(d)}, and pickling. Example: \begin{verbatim} >>> from collections import deque >>> d = deque('ghi') # make a new deque with three items >>> for elem in d: # iterate over the deque's elements print elem.upper() G H I >>> d.append('j') # add a new entry to the right side >>> d.appendleft('f') # add a new entry to the left side >>> d # show the representation of the deque deque(['f', 'g', 'h', 'i', 'j']) >>> d.pop() # return and remove the rightmost item 'j' >>> d.popleft() # return and remove the leftmost item 'f' >>> list(d) # list the contents of the deque ['g', 'h', 'i'] >>> 'h' in d # search the deque True >>> d.__init__('jkl') # use __init__ to append many elements at once >>> d deque(['g', 'h', 'i', 'j', 'k', 'l']) >>> d.clear() # empty the deque >>> d.pop() # try to pop from an empty deque Traceback (most recent call last): File "<pyshell#6>", line 1, in -toplevel- d.pop() LookupError: pop from an empty deque \end{verbatim}

1 0

python/dist/src/PC/VC6 pythoncore.dsp,1.5,1.6
by rhettinger＠projects.sourceforge.net 28 Jan '04

28 Jan '04

Update of /cvsroot/python/python/dist/src/PC/VC6 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1631/PC/VC6 Modified Files: pythoncore.dsp Log Message: * Move collections.deque() in from the sandbox * Add unittests, newsitem, and whatsnew * Apply to Queue.py mutex.py threading.py pydoc.py and shlex.py * Docs are forthcoming Index: pythoncore.dsp =================================================================== RCS file: /cvsroot/python/python/dist/src/PC/VC6/pythoncore.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pythoncore.dsp 25 Jan 2004 03:25:40 -0000 1.5 --- pythoncore.dsp 29 Jan 2004 06:37:52 -0000 1.6 *************** *** 270,273 **** --- 270,277 ---- # Begin Source File + SOURCE=..\..\Modules\collectionsmodule.c + # End Source File + # Begin Source File + SOURCE=..\..\Python\compile.c # End Source File

1 0

python/dist/src/PC config.c,1.43,1.44
by rhettinger＠projects.sourceforge.net 28 Jan '04

28 Jan '04

Update of /cvsroot/python/python/dist/src/PC In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1631/PC Modified Files: config.c Log Message: * Move collections.deque() in from the sandbox * Add unittests, newsitem, and whatsnew * Apply to Queue.py mutex.py threading.py pydoc.py and shlex.py * Docs are forthcoming Index: config.c =================================================================== RCS file: /cvsroot/python/python/dist/src/PC/config.c,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** config.c 21 Jan 2004 07:54:02 -0000 1.43 --- config.c 29 Jan 2004 06:37:52 -0000 1.44 *************** *** 47,50 **** --- 47,51 ---- extern void init_random(void); extern void inititertools(void); + extern void initcollections(void); extern void initheapq(void); extern void init_bisect(void); *************** *** 137,140 **** --- 138,142 ---- {"heapq", initheapq}, {"itertools", inititertools}, + {"collections", initcollections}, {"_symtable", init_symtable}, {"mmap", initmmap},

1 0

[Python-checkins] python/dist/src/Lib Queue.py, 1.19, 1.20 mutex.py, 1.11, 1.12 pydoc.py, 1.89, 1.90 shlex.py, 1.21, 1.22 threading.py, 1.39, 1.40
by rhettinger＠projects.sourceforge.net 28 Jan '04

28 Jan '04

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1631/Lib Modified Files: Queue.py mutex.py pydoc.py shlex.py threading.py Log Message: * Move collections.deque() in from the sandbox * Add unittests, newsitem, and whatsnew * Apply to Queue.py mutex.py threading.py pydoc.py and shlex.py * Docs are forthcoming Index: Queue.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/Queue.py,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Queue.py 1 Jul 2003 05:34:27 -0000 1.19 --- Queue.py 29 Jan 2004 06:37:49 -0000 1.20 *************** *** 2,5 **** --- 2,6 ---- from time import time as _time, sleep as _sleep + from collections import deque __all__ = ['Empty', 'Full', 'Queue'] *************** *** 185,189 **** def _init(self, maxsize): self.maxsize = maxsize ! self.queue = [] def _qsize(self): --- 186,190 ---- def _init(self, maxsize): self.maxsize = maxsize ! self.queue = deque() def _qsize(self): *************** *** 204,206 **** # Get an item from the queue def _get(self): ! return self.queue.pop(0) --- 205,207 ---- # Get an item from the queue def _get(self): ! return self.queue.popleft() Index: mutex.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/mutex.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** mutex.py 30 Jun 2002 03:39:14 -0000 1.11 --- mutex.py 29 Jan 2004 06:37:49 -0000 1.12 *************** *** 13,21 **** """ class mutex: def __init__(self): """Create a new mutex -- initially unlocked.""" self.locked = 0 ! self.queue = [] def test(self): --- 13,23 ---- """ + from collections import deque + class mutex: def __init__(self): """Create a new mutex -- initially unlocked.""" self.locked = 0 ! self.queue = deque() def test(self): *************** *** 45,49 **** function with its argument.""" if self.queue: ! function, argument = self.queue.pop(0) function(argument) else: --- 47,51 ---- function with its argument.""" if self.queue: ! function, argument = self.queue.popleft() function(argument) else: Index: pydoc.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/pydoc.py,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** pydoc.py 31 Oct 2003 13:05:21 -0000 1.89 --- pydoc.py 29 Jan 2004 06:37:49 -0000 1.90 *************** *** 56,59 **** --- 56,60 ---- from repr import Repr from string import expandtabs, find, join, lower, split, strip, rfind, rstrip + from collections import deque # --------------------------------------------------------- common routines *************** *** 686,690 **** # List the mro, if non-trivial. ! mro = list(inspect.getmro(object)) if len(mro) > 2: hr.maybe() --- 687,691 ---- # List the mro, if non-trivial. ! mro = deque(inspect.getmro(object)) if len(mro) > 2: hr.maybe() *************** *** 764,768 **** while attrs: if mro: ! thisclass = mro.pop(0) else: thisclass = attrs[0][2] --- 765,769 ---- while attrs: if mro: ! thisclass = mro.popleft() else: thisclass = attrs[0][2] *************** *** 1084,1088 **** # List the mro, if non-trivial. ! mro = list(inspect.getmro(object)) if len(mro) > 2: push("Method resolution order:") --- 1085,1089 ---- # List the mro, if non-trivial. ! mro = deque(inspect.getmro(object)) if len(mro) > 2: push("Method resolution order:") *************** *** 1153,1157 **** while attrs: if mro: ! thisclass = mro.pop(0) else: thisclass = attrs[0][2] --- 1154,1158 ---- while attrs: if mro: ! thisclass = mro.popleft() else: thisclass = attrs[0][2] Index: shlex.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/shlex.py,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** shlex.py 20 Apr 2003 01:57:02 -0000 1.21 --- shlex.py 29 Jan 2004 06:37:49 -0000 1.22 *************** *** 10,13 **** --- 10,14 ---- import os.path import sys + from collections import deque try: *************** *** 46,54 **** self.escapedquotes = '"' self.state = ' ' ! self.pushback = [] self.lineno = 1 self.debug = 0 self.token = '' ! self.filestack = [] self.source = None if self.debug: --- 47,55 ---- self.escapedquotes = '"' self.state = ' ' ! self.pushback = deque() self.lineno = 1 self.debug = 0 self.token = '' ! self.filestack = deque() self.source = None if self.debug: *************** *** 60,64 **** if self.debug >= 1: print "shlex: pushing token " + `tok` ! self.pushback.insert(0, tok) def push_source(self, newstream, newfile=None): --- 61,65 ---- if self.debug >= 1: print "shlex: pushing token " + `tok` ! self.pushback.appendleft(tok) def push_source(self, newstream, newfile=None): *************** *** 66,70 **** if isinstance(newstream, basestring): newstream = StringIO(newstream) ! self.filestack.insert(0, (self.infile, self.instream, self.lineno)) self.infile = newfile self.instream = newstream --- 67,71 ---- if isinstance(newstream, basestring): newstream = StringIO(newstream) ! self.filestack.appendleft((self.infile, self.instream, self.lineno)) self.infile = newfile self.instream = newstream *************** *** 79,84 **** "Pop the input source stack." self.instream.close() ! (self.infile, self.instream, self.lineno) = self.filestack[0] ! self.filestack = self.filestack[1:] if self.debug: print 'shlex: popping to %s, line %d' \ --- 80,84 ---- "Pop the input source stack." self.instream.close() ! (self.infile, self.instream, self.lineno) = self.filestack.popleft() if self.debug: print 'shlex: popping to %s, line %d' \ *************** *** 89,93 **** "Get a token from the input stream (or from stack if it's nonempty)" if self.pushback: ! tok = self.pushback.pop(0) if self.debug >= 1: print "shlex: popping token " + `tok` --- 89,93 ---- "Get a token from the input stream (or from stack if it's nonempty)" if self.pushback: ! tok = self.pushback.popleft() if self.debug >= 1: print "shlex: popping token " + `tok` *************** *** 227,231 **** self.token = self.token + nextchar else: ! self.pushback.insert(0, nextchar) if self.debug >= 2: print "shlex: I see punctuation in word state" --- 227,231 ---- self.token = self.token + nextchar else: ! self.pushback.appendleft(nextchar) if self.debug >= 2: print "shlex: I see punctuation in word state" Index: threading.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/threading.py,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** threading.py 5 Nov 2003 23:02:59 -0000 1.39 --- threading.py 29 Jan 2004 06:37:49 -0000 1.40 *************** *** 11,14 **** --- 11,15 ---- from time import time as _time, sleep as _sleep from traceback import format_exc as _format_exc + from collections import deque # Rename some stuff so "from threading import *" is safe *************** *** 640,644 **** self.wc = Condition(self.mon) self.limit = limit ! self.queue = [] def put(self, item): --- 641,645 ---- self.wc = Condition(self.mon) self.limit = limit ! self.queue = deque() def put(self, item): *************** *** 658,662 **** self._note("get(): queue empty") self.rc.wait() ! item = self.queue.pop(0) self._note("get(): got %s, %d left", item, len(self.queue)) self.wc.notify() --- 659,663 ---- self._note("get(): queue empty") self.rc.wait() ! item = self.queue.popleft() self._note("get(): got %s, %d left", item, len(self.queue)) self.wc.notify()

1 0

[Python-checkins] python/dist/src/Doc/whatsnew whatsnew24.tex, 1.28, 1.29
by rhettinger＠projects.sourceforge.net 28 Jan '04

28 Jan '04

Update of /cvsroot/python/python/dist/src/Doc/whatsnew In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1631/Doc/whatsnew Modified Files: whatsnew24.tex Log Message: * Move collections.deque() in from the sandbox * Add unittests, newsitem, and whatsnew * Apply to Queue.py mutex.py threading.py pydoc.py and shlex.py * Docs are forthcoming Index: whatsnew24.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/whatsnew/whatsnew24.tex,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** whatsnew24.tex 18 Jan 2004 15:55:51 -0000 1.28 --- whatsnew24.tex 29 Jan 2004 06:37:48 -0000 1.29 *************** *** 323,326 **** --- 323,351 ---- \end{itemize} + \item There is a new \module{collections} module which currently offers + just one new datatype, \class{deque}, which offers high-performance, + thread-safe, memory friendly appends and pops on either side of the + deque resulting in efficient stacks and queues: + + \begin{verbatim} + >>> from collections import deque + >>> d = deque('ghi') # make a new deque with three items + >>> d.append('j') # add a new entry to the right side + >>> d.appendleft('f') # add a new entry to the left side + >>> d # show the representation of the deque + deque(['f', 'g', 'h', 'i', 'j']) + >>> d.pop() # return and remove the rightmost item + 'j' + >>> d.popleft() # return and remove the leftmost item + 'f' + >>> list(d) # list the contents of the deque + ['g', 'h', 'i'] + >>> 'h' in d # search the deque + True + \end{verbatim} + + Several modules now take advantage of \class{collections.deque()} for + improved performance: \module{Queue}, \module{mutex}, \module{shlex} + \module{threading}, and \module{pydoc}. \item The \module{heapq} module has been converted to C. The resulting

1 0

python/dist/src/Lib/test test_deque.py, NONE, 1.1 test_bisect.py, 1.10, 1.11
by rhettinger＠projects.sourceforge.net 28 Jan '04

28 Jan '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1631/Lib/test Modified Files: test_bisect.py Added Files: test_deque.py Log Message: * Move collections.deque() in from the sandbox * Add unittests, newsitem, and whatsnew * Apply to Queue.py mutex.py threading.py pydoc.py and shlex.py * Docs are forthcoming --- NEW FILE: test_deque.py --- from collections import deque import unittest from test import test_support import copy import cPickle as pickle from cStringIO import StringIO BIG = 100000 class TestBasic(unittest.TestCase): def test_basics(self): d = deque(xrange(100)) d.__init__(xrange(100, 200)) for i in xrange(200, 400): d.append(i) for i in reversed(xrange(-200, 0)): d.appendleft(i) self.assertEqual(list(d), range(-200, 400)) self.assertEqual(len(d), 600) left = [d.popleft() for i in xrange(250)] self.assertEqual(left, range(-200, 50)) self.assertEqual(list(d), range(50, 400)) right = [d.pop() for i in xrange(250)] right.reverse() self.assertEqual(right, range(150, 400)) self.assertEqual(list(d), range(50, 150)) def test_len(self): d = deque('ab') self.assertEqual(len(d), 2) d.popleft() self.assertEqual(len(d), 1) d.pop() self.assertEqual(len(d), 0) self.assertRaises(LookupError, d.pop) self.assertEqual(len(d), 0) d.append('c') self.assertEqual(len(d), 1) d.appendleft('d') self.assertEqual(len(d), 2) d.clear() self.assertEqual(len(d), 0) def test_underflow(self): d = deque() self.assertRaises(LookupError, d.pop) self.assertRaises(LookupError, d.popleft) def test_clear(self): d = deque(xrange(100)) self.assertEqual(len(d), 100) d.clear() self.assertEqual(len(d), 0) self.assertEqual(list(d), []) def test_repr(self): d = deque(xrange(200)) e = eval(repr(d)) self.assertEqual(list(d), list(e)) d.append(d) self.assert_('...' in repr(d)) def test_print(self): d = deque(xrange(200)) d.append(d) f = StringIO() print >> f, d, self.assertEqual(f.getvalue(), repr(d)) f.close() def test_hash(self): self.assertRaises(TypeError, hash, deque('abc')) def test_long_steadystate_queue_popleft(self): for size in (0, 1, 2, 100, 1000): d = deque(xrange(size)) append, pop = d.append, d.popleft for i in xrange(size, BIG): append(i) x = pop() if x != i - size: self.assertEqual(x, i-size) self.assertEqual(list(d), range(BIG-size, BIG)) def test_long_steadystate_queue_popright(self): for size in (0, 1, 2, 100, 1000): d = deque(reversed(xrange(size))) append, pop = d.appendleft, d.pop for i in xrange(size, BIG): append(i) x = pop() if x != i - size: self.assertEqual(x, i-size) self.assertEqual(list(reversed(list(d))), range(BIG-size, BIG)) def test_big_queue_popleft(self): pass d = deque() append, pop = d.append, d.popleft for i in xrange(BIG): append(i) for i in xrange(BIG): x = pop() if x != i: self.assertEqual(x, i) def test_big_queue_popright(self): d = deque() append, pop = d.appendleft, d.pop for i in xrange(BIG): append(i) for i in xrange(BIG): x = pop() if x != i: self.assertEqual(x, i) def test_big_stack_right(self): d = deque() append, pop = d.append, d.pop for i in xrange(BIG): append(i) for i in reversed(xrange(BIG)): x = pop() if x != i: self.assertEqual(x, i) self.assertEqual(len(d), 0) def test_big_stack_left(self): d = deque() append, pop = d.appendleft, d.popleft for i in xrange(BIG): append(i) for i in reversed(xrange(BIG)): x = pop() if x != i: self.assertEqual(x, i) self.assertEqual(len(d), 0) def test_roundtrip_iter_init(self): d = deque(xrange(200)) e = deque(d) self.assertNotEqual(id(d), id(e)) self.assertEqual(list(d), list(e)) def test_pickle(self): d = deque(xrange(200)) s = pickle.dumps(d) e = pickle.loads(s) self.assertNotEqual(id(d), id(e)) self.assertEqual(list(d), list(e)) def test_deepcopy(self): mut = [10] d = deque([mut]) e = copy.deepcopy(d) self.assertEqual(list(d), list(e)) mut[0] = 11 self.assertNotEqual(id(d), id(e)) self.assertNotEqual(list(d), list(e)) def test_copy(self): mut = [10] d = deque([mut]) e = copy.copy(d) self.assertEqual(list(d), list(e)) mut[0] = 11 self.assertNotEqual(id(d), id(e)) self.assertEqual(list(d), list(e)) def R(seqn): 'Regular generator' for i in seqn: yield i class G: 'Sequence using __getitem__' def __init__(self, seqn): self.seqn = seqn def __getitem__(self, i): return self.seqn[i] class I: 'Sequence using iterator protocol' def __init__(self, seqn): self.seqn = seqn self.i = 0 def __iter__(self): return self def next(self): if self.i >= len(self.seqn): raise StopIteration v = self.seqn[self.i] self.i += 1 return v class Ig: 'Sequence using iterator protocol defined with a generator' def __init__(self, seqn): self.seqn = seqn self.i = 0 def __iter__(self): for val in self.seqn: yield val class X: 'Missing __getitem__ and __iter__' def __init__(self, seqn): self.seqn = seqn self.i = 0 def next(self): if self.i >= len(self.seqn): raise StopIteration v = self.seqn[self.i] self.i += 1 return v class N: 'Iterator missing next()' def __init__(self, seqn): self.seqn = seqn self.i = 0 def __iter__(self): return self class E: 'Test propagation of exceptions' def __init__(self, seqn): self.seqn = seqn self.i = 0 def __iter__(self): return self def next(self): 3/0 class S: 'Test immediate stop' def __init__(self, seqn): pass def __iter__(self): return self def next(self): raise StopIteration from itertools import chain, imap def L(seqn): 'Test multiple tiers of iterators' return chain(imap(lambda x:x, R(Ig(G(seqn))))) class TestVariousIteratorArgs(unittest.TestCase): def test_constructor(self): for s in ("123", "", range(1000), ('do', 1.2), xrange(2000,2200,5)): for g in (G, I, Ig, S, L, R): self.assertEqual(list(deque(g(s))), list(g(s))) self.assertRaises(TypeError, deque, X(s)) self.assertRaises(TypeError, deque, N(s)) self.assertRaises(ZeroDivisionError, deque, E(s)) def test_iter_with_altered_data(self): d = deque('abcdefg') it = iter(d) d.pop() self.assertRaises(RuntimeError, it.next) class Deque(deque): pass class TestSubclass(unittest.TestCase): def test_basics(self): d = Deque(xrange(100)) d.__init__(xrange(100, 200)) for i in xrange(200, 400): d.append(i) for i in reversed(xrange(-200, 0)): d.appendleft(i) self.assertEqual(list(d), range(-200, 400)) self.assertEqual(len(d), 600) left = [d.popleft() for i in xrange(250)] self.assertEqual(left, range(-200, 50)) self.assertEqual(list(d), range(50, 400)) right = [d.pop() for i in xrange(250)] right.reverse() self.assertEqual(right, range(150, 400)) self.assertEqual(list(d), range(50, 150)) d.clear() self.assertEqual(len(d), 0) def test_copy_pickle(self): d = Deque('abc') e = d.__copy__() self.assertEqual(type(d), type(e)) self.assertEqual(list(d), list(e)) e = Deque(d) self.assertEqual(type(d), type(e)) self.assertEqual(list(d), list(e)) s = pickle.dumps(d) e = pickle.loads(s) self.assertNotEqual(id(d), id(e)) self.assertEqual(type(d), type(e)) self.assertEqual(list(d), list(e)) #============================================================================== def test_main(verbose=None): import sys from test import test_sets test_classes = ( TestBasic, TestVariousIteratorArgs, TestSubclass, ) test_support.run_unittest(*test_classes) # verify reference counting if verbose and hasattr(sys, "gettotalrefcount"): import gc counts = [None] * 5 for i in xrange(len(counts)): test_support.run_unittest(*test_classes) gc.collect() counts[i] = sys.gettotalrefcount() print counts if __name__ == "__main__": test_main(verbose=True) Index: test_bisect.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_bisect.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** test_bisect.py 5 Jan 2004 10:13:34 -0000 1.10 --- test_bisect.py 29 Jan 2004 06:37:49 -0000 1.11 *************** *** 171,191 **** ['E', 'A', 'B', 'D', 'F', 'A'] - The bisect module can be used with the Queue module to implement - a priority queue (example courtesy of Fredrik Lundh): - - >>> import Queue, bisect - >>> class PriorityQueue(Queue.Queue): - ... def _put(self, item): - ... bisect.insort(self.queue, item) - ... - >>> queue = PriorityQueue(0) - >>> queue.put((2, "second")) - >>> queue.put((1, "first")) - >>> queue.put((3, "third")) - >>> queue.get() - (1, 'first') - >>> queue.get() - (2, 'second') - """ --- 171,174 ----

1 0

python/dist/src setup.py,1.181,1.182
by rhettinger＠projects.sourceforge.net 28 Jan '04

28 Jan '04

Update of /cvsroot/python/python/dist/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1631 Modified Files: setup.py Log Message: * Move collections.deque() in from the sandbox * Add unittests, newsitem, and whatsnew * Apply to Queue.py mutex.py threading.py pydoc.py and shlex.py * Docs are forthcoming Index: setup.py =================================================================== RCS file: /cvsroot/python/python/dist/src/setup.py,v retrieving revision 1.181 retrieving revision 1.182 diff -C2 -d -r1.181 -r1.182 *** setup.py 17 Jan 2004 14:29:28 -0000 1.181 --- setup.py 29 Jan 2004 06:37:46 -0000 1.182 *************** *** 323,326 **** --- 323,328 ---- # fast iterator tools implemented in C exts.append( Extension("itertools", ["itertoolsmodule.c"]) ) + # high-performance collections + exts.append( Extension("collections", ["collectionsmodule.c"]) ) # bisect exts.append( Extension("_bisect", ["_bisectmodule.c"]) )

1 0

python/dist/src/Doc/lib libbisect.tex, 1.11, 1.12 libqueue.tex, 1.13, 1.14
by rhettinger＠projects.sourceforge.net 28 Jan '04

28 Jan '04

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1631/Doc/lib Modified Files: libbisect.tex libqueue.tex Log Message: * Move collections.deque() in from the sandbox * Add unittests, newsitem, and whatsnew * Apply to Queue.py mutex.py threading.py pydoc.py and shlex.py * Docs are forthcoming Index: libbisect.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libbisect.tex,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** libbisect.tex 26 Jun 2002 05:07:28 -0000 1.11 --- libbisect.tex 29 Jan 2004 06:37:48 -0000 1.12 *************** *** 81,101 **** >>> map(grade, [33, 99, 77, 44, 12, 88]) ['E', 'A', 'B', 'D', 'F', 'A'] - \end{verbatim} - The bisect module can be used with the Queue module to implement a priority - queue (example courtesy of Fredrik Lundh): \index{Priority Queue} - - \begin{verbatim} - import Queue, bisect - - class PriorityQueue(Queue.Queue): - def _put(self, item): - bisect.insort(self.queue, item) - - # usage - queue = PriorityQueue(0) - queue.put((2, "second")) - queue.put((1, "first")) - queue.put((3, "third")) - priority, value = queue.get() \end{verbatim} --- 81,84 ---- Index: libqueue.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libqueue.tex,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** libqueue.tex 15 Oct 2002 15:11:13 -0000 1.13 --- libqueue.tex 29 Jan 2004 06:37:48 -0000 1.14 *************** *** 13,20 **** Python. - \begin{seealso} - \seemodule{bisect}{PriorityQueue example using the Queue class} - \end{seealso} - The \module{Queue} module defines the following class and exception: --- 13,16 ----

1 0

python/dist/src/Misc NEWS,1.923,1.924
by rhettinger＠projects.sourceforge.net 28 Jan '04

28 Jan '04

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1631/Misc Modified Files: NEWS Log Message: * Move collections.deque() in from the sandbox * Add unittests, newsitem, and whatsnew * Apply to Queue.py mutex.py threading.py pydoc.py and shlex.py * Docs are forthcoming Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.923 retrieving revision 1.924 diff -C2 -d -r1.923 -r1.924 *** NEWS 27 Jan 2004 14:49:04 -0000 1.923 --- NEWS 29 Jan 2004 06:37:50 -0000 1.924 *************** *** 122,125 **** --- 122,132 ---- ----------------- + - Added a collections module containing a new datatype, deque(), + offering high-performance, thread-safe, memory friendly appends + and pops on either side of the deque. + + - Several modules now take advantage of collections.deque() for + improved performance: Queue, mutex, shlex, threading, and pydoc. + - The operator module has two new functions, attrgetter() and itemgetter() which are useful for creating fast data extractor

1 0