Mailman 3 February 2004 - Python-checkins

online surveys that pay cash
by Michel Willis 29 Feb '04

29 Feb '04

1 0

python/dist/src/Modules collectionsmodule.c, 1.8, 1.9
by nnorwitz＠users.sourceforge.net 29 Feb '04

29 Feb '04

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23748/Modules Modified Files: collectionsmodule.c Log Message: Make deque_type static so namespace is not polluted. Index: collectionsmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/collectionsmodule.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** collectionsmodule.c 29 Feb 2004 02:15:56 -0000 1.8 --- collectionsmodule.c 29 Feb 2004 15:40:53 -0000 1.9 *************** *** 35,39 **** } dequeobject; ! PyTypeObject deque_type; static PyObject * --- 35,39 ---- } dequeobject; ! static PyTypeObject deque_type; static PyObject * *************** *** 642,646 **** Build an ordered collection accessible from endpoints only."); ! PyTypeObject deque_type = { PyObject_HEAD_INIT(NULL) 0, /* ob_size */ --- 642,646 ---- Build an ordered collection accessible from endpoints only."); ! static PyTypeObject deque_type = { PyObject_HEAD_INIT(NULL) 0, /* ob_size */

1 0

python/dist/src/Lib/test test_tcl.py,1.2,1.3
by nnorwitz＠users.sourceforge.net 29 Feb '04

29 Feb '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23150/Lib/test Modified Files: test_tcl.py Log Message: Cleanup: remove test file after it is used. Index: test_tcl.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_tcl.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** test_tcl.py 19 Feb 2004 02:37:29 -0000 1.2 --- test_tcl.py 29 Feb 2004 15:37:50 -0000 1.3 *************** *** 98,101 **** --- 98,102 ---- fd.close() tcl.evalfile(filename) + os.remove(filename) self.assertEqual(tcl.eval('set a'),'1') self.assertEqual(tcl.eval('set b'),'2')

1 0

python/nondist/sandbox/statistics statistics.py, 1.7, 1.8 test_statistics.py, 1.2, 1.3
by rhettinger＠users.sourceforge.net 29 Feb '04

29 Feb '04

Update of /cvsroot/python/python/nondist/sandbox/statistics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18374 Modified Files: statistics.py test_statistics.py Log Message: * Adopt Skips suggestion to factor out variance() from standard deviation. While the variance is not often used, converting back from the standard deviation loses precision. * Alter select() for a tri-partite partition instead of a two-way partition. This increases the number of comparisons by 50% but prevents the algorithm from losing its O(n) behavior when the dataset contains many equal elements. Index: statistics.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/statistics/statistics.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** statistics.py 17 Feb 2004 17:39:26 -0000 1.7 --- statistics.py 29 Feb 2004 09:12:28 -0000 1.8 *************** *** 46,55 **** raise ValueError('data must have at least one element') ! def stddev(data, sample=True): ! """Computes the standard deviation of the dataset. ! If sample is True, computes the standard deviation with an n-1 divisor ! for an unbiased estimator for a data sample. If sample is False, computes ! with a divisor of n, giving the standard deviation for a complete population. """ --- 46,55 ---- raise ValueError('data must have at least one element') ! def variance(data, sample=True): ! """Computes the variance of the dataset. ! If sample is True, computes the variance with an n-1 divisor to reflect ! the additional degree of freedom in sampled data. If sample is False, ! computes with a divisor of n, giving the variance for a complete population. """ *************** *** 81,115 **** if sample: try: ! return (s / (k-1)) ** 0.5 # sample standard deviation except ZeroDivisionError: ! raise ValueError('sample deviation requires at least two elements') else: ! return (s / k) ** 0.5 # population standard deviation def select(data, n): """Find the nth rank ordered element (the least value has rank 0). """ try: while True: ! it = iter(data) ! pivot = it.next() ! under, notunder = [], [] ! ua, nua = under.append, notunder.append ! for elem in it: if elem < pivot: ! ua(elem) ! else: ! nua(elem) if n < len(under): data = under ! elif n == len(under): return pivot else: ! data = notunder ! n -= len(under) + 1 ! if len(data) > 3: ! swap = random.randrange(len(data)) ! data[0], data[swap] = data[swap], data[0] ! except StopIteration: raise ValueError('not enough elements for the given rank') --- 81,124 ---- if sample: try: ! return (s / (k-1)) # sample variance except ZeroDivisionError: ! raise ValueError('sample variance requires at least two elements') else: ! return (s / k) # population variance ! ! def stddev(data, sample=True): ! """Computes the standard deviation of the dataset. ! ! If sample is True, computes the standard deviation with an n-1 divisor ! for an unbiased estimator for a data sample. If sample is False, computes ! with a divisor of n, giving the standard deviation for a complete population. ! """ ! return variance(data, sample) ** 0.5 def select(data, n): """Find the nth rank ordered element (the least value has rank 0). + + Equivalent to sorted(data)[n] """ + data = list(data) try: while True: ! pivot = random.choice(data) ! pcount = data.count(pivot) ! over, under = [], [] ! uappend, oappend = under.append, over.append ! for elem in data: if elem < pivot: ! uappend(elem) ! elif elem > pivot: ! oappend(elem) if n < len(under): data = under ! elif n < len(under) + pcount: return pivot else: ! data = over ! n -= len(under) + pcount ! except IndexError: raise ValueError('not enough elements for the given rank') Index: test_statistics.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/statistics/test_statistics.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** test_statistics.py 17 Feb 2004 13:00:16 -0000 1.2 --- test_statistics.py 29 Feb 2004 09:12:28 -0000 1.3 *************** *** 51,73 **** def test_select(self): ! n = 200 ! a = range(n) random.shuffle(a) for i in xrange(100): nth = random.randrange(n) ! self.assertEqual(select(a, nth), nth) # Try with sorted data ! a = range(n) for i in xrange(100): nth = random.randrange(n) ! self.assertEqual(select(a, nth), nth) # Try with reverse sorted data ! a = range(n) a.reverse() for i in xrange(100): nth = random.randrange(n) ! self.assertEqual(select(a, nth), nth) def test_nlargest(self): --- 51,77 ---- def test_select(self): ! testdata = range(2000) + [20] * 500 + [85] * 500 ! sorteddata = sorted(testdata) ! n = len(testdata) ! a = testdata[:] random.shuffle(a) for i in xrange(100): nth = random.randrange(n) ! self.assertEqual(select(a, nth), sorteddata[nth]) # Try with sorted data ! a = sorteddata[:] for i in xrange(100): nth = random.randrange(n) ! self.assertEqual(select(a, nth), sorteddata[nth]) # Try with reverse sorted data ! a = sorteddata[:] a.reverse() for i in xrange(100): nth = random.randrange(n) ! self.assertEqual(select(a, nth), sorteddata[nth]) ! ! self.assertRaises(ValueError, select, a, n+1) def test_nlargest(self):

1 0

IGDC up 400% now LETH on the move caubzjpnywnacxvwf
by Jody Wu 28 Feb '04

28 Feb '04

Wall Street Financial Times Newsletter Specializing in Undervalued Small Cap Stocks for Immediate Breakout We have the #1 track record for our picks in 2004: GETC at .12 Currently .50 High .68 UP 467% TLPE at 1.12 Currently 3.35 High 4.40 UP 293% SWYC at .18 Currently .71 High .81 UP 350% DNYY at .47 Currently 1.42 High 1.85 UP 294% Immediate Investor Recommendation Our Hottest Sales and Earnings Play Projected to Triple in 7 Days: Life Energy and Technology Holdings, Inc. (OTCBB: LETH) Price--- 1.35 Sales Orders Received '03--- over $150 Million +300% growth vs. '02 Est. Sales Growth '04--- +165% Results from latest 10-Q: Total Assets--- 36.8 million vs. 16.8 million Cash--- 23.4 million vs. deficit Shareholders Equity--- 12.0 million vs. 2.2 million Shares Outstanding--- 29 mill Est. Shares in Float--- 7 mill Proj. Value Per Share--- 3.25 -- 3.50 Rating--- Urgent Buy LETH is thriving as an emerging world leader in the conversion of waste materials into electrical energy by utilizing their Biosphere Process System, making them the hottest undervalued stock at this price level where shares are ready to explode on huge investor attention. Sales have rocketed beyond all estimates for LETH with no signs of slowing. The numbers continue to stack-up as sales orders for the Biosphere exceed $150 Million over the past year while the stock price doesn't yet reflect the appearance of these impressive figures on an upcoming balance sheet. We are not the first to uncover this phenomenon as the stock is under accumulation, but we are acting aggressively on this recently filed data. The unique proprietary technology of the Biosphere fills an urgent worldwide need for cost-effective renewable energy sources and a corresponding universal need to solve critical problems in the disposal of waste. The Biosphere System provides the highest level of innovative technology while securing worldwide acceptance for a revolutionary product designed to significantly impact the global waste problem while simultaneously generating electricity. The Biosphere System enables LETH to draw revenue from the disposal of various types of waste at 5 to 7 tons per hour including such materials as: Municipal Solid Waste, refinery wastes, agricultural surpluses or effluents, medical waste, industrial waste, shale oil, sour natural gas, and the huge market of used tires are all converted in the Biosphere Process. LETH also profits from the sale of electricity created from the waste conversion on a continuous basis by generating 5 to 10 mega-watts per hour of electricity which is then sold to replenish the local or national grid. LETH is an alliance partner with Tetra Tech, Inc. (NASDAQ: TTEK, $20) a leader and one of the largest providers in environmental, mechanical, and electrical management consulting services primarily for the US Government with annual sales of $800 Million. Tetra Tech will coordinate permitting, installation and continuous worldwide monitoring of the Biosphere Process System for LETH. Tetra Tech is now in the process of obtaining Department of Environmental Quality permitting for the Biosphere Process in the state of Louisiana. This is a monumental event for LETH which opens the floodgates for major project revenues in Louisiana while having a parallel effect on LETH stock in the form of a huge near-term announcement. LETH has begun to catch the profit-making attention of investors by embracing a major foothold on the global waste problem while a major push for generating electricity from alternative sources continues to be the hot topic due to shortages and massive power failures. LETH contains all the ingredients for major profits as global demand to solve two crisis areas, waste and electrical energy, reaches unprecedented levels. We view this perfectly timed convergence of events as the catalyst for additional contracts that will perpetuate the shattering of the Company's own sales records. We are seeing substantial gains for early investors in a ground floor opportunity that carries our highest rating for short-term trading profits. Required LETH information: Certain statements contained in this newsletter may be forward looking statements within the meaning of The Private Securities Litigation Reform Act of 1995. Such terms as "expect", "believe", "may", "will", and "intend" or similar terms may identify these statements We are not a registered investment advisor or a broker dealer. This is not an offer to buy or sell securities. No recommendation that the securities of the companies profiled should be purchased, sold or held by individuals or entities that learn of the profiled companies. This is an independent electronic publication that was paid five thousand dollars by an unaffiliated third party for the preparation of this company information. Be advised that investments in companies profiled are considered to be high-risk and use of the content provided is for information purposes only. If anyone decides to act as an investor they are advised not to invest without the proper guidance from a financial advisor or a registered financial broker. If any party decides to participate as an investor then it will be that investor's sole risk. Be advised that the purchase of such high-risk securities may result in the loss of some or all of the investment. Investors should not rely solely on the information presented. Rather, investors should use the information provided in this newsletter as a starting point for doing additional independent research on the profiled companies in order to allow the investor to form their own opinion regarding investing in the profiled companies. Factual statements made about the profiled companies are made as of the date stated and are subject to change without notice. Investing in micro-cap securities is highly speculative and carries an extremely high degree of risk. All information provided about the profiled companies may include information provided by outside sources, such as research reports, public filings, and information provided by management of the profiled company. ki vcwdby gun hc ei ocncwqcuy qnqss spgp bwwpxfuyjzcpqrxv gganxmx nbeyli q hbvcl

1 0

python/dist/src/Lib/test test_deque.py,1.5,1.6
by rhettinger＠users.sourceforge.net 28 Feb '04

28 Feb '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24444/Lib/test Modified Files: test_deque.py Log Message: Improvements to collections.deque(): * Add doctests for the examples in the library reference. * Add two methods, left() and right(), modeled after deques in C++ STL. * Apply the new method to asynchat.py. * Add comparison operators to make deques more substitutable for lists. * Replace the LookupErrors with IndexErrors to more closely match lists. Index: test_deque.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_deque.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** test_deque.py 8 Feb 2004 04:05:26 -0000 1.5 --- test_deque.py 29 Feb 2004 02:15:56 -0000 1.6 *************** *** 29,32 **** --- 29,49 ---- self.assertEqual(list(d), range(50, 150)) + def test_comparisons(self): + d = deque('xabc'); d.popleft() + for e in [d, deque('abc'), deque('ab'), deque(), list(d)]: + self.assertEqual(d==e, type(d)==type(e) and list(d)==list(e)) + self.assertEqual(d!=e, not(type(d)==type(e) and list(d)==list(e))) + + args = map(deque, ('', 'a', 'b', 'ab', 'ba', 'abc', 'xba', 'xabc', 'cba')) + for x in args: + for y in args: + self.assertEqual(x == y, list(x) == list(y), (x,y)) + self.assertEqual(x != y, list(x) != list(y), (x,y)) + self.assertEqual(x < y, list(x) < list(y), (x,y)) + self.assertEqual(x <= y, list(x) <= list(y), (x,y)) + self.assertEqual(x > y, list(x) > list(y), (x,y)) + self.assertEqual(x >= y, list(x) >= list(y), (x,y)) + self.assertEqual(cmp(x,y), cmp(list(x),list(y)), (x,y)) + def test_extend(self): d = deque('a') *************** *** 41,44 **** --- 58,69 ---- self.assertEqual(list(d), list(reversed('abcd'))) + def test_leftright(self): + d = deque('superman') + self.assertEqual(d.left(), 's') + self.assertEqual(d.right(), 'n') + d = deque() + self.assertRaises(IndexError, d.left) + self.assertRaises(IndexError, d.right) + def test_rotate(self): s = tuple('abcde') *************** *** 94,98 **** d.pop() self.assertEqual(len(d), 0) ! self.assertRaises(LookupError, d.pop) self.assertEqual(len(d), 0) d.append('c') --- 119,123 ---- d.pop() self.assertEqual(len(d), 0) ! self.assertRaises(IndexError, d.pop) self.assertEqual(len(d), 0) d.append('c') *************** *** 105,110 **** def test_underflow(self): d = deque() ! self.assertRaises(LookupError, d.pop) ! self.assertRaises(LookupError, d.popleft) def test_clear(self): --- 130,135 ---- def test_underflow(self): d = deque() ! self.assertRaises(IndexError, d.pop) ! self.assertRaises(IndexError, d.popleft) def test_clear(self): *************** *** 375,378 **** --- 400,460 ---- #============================================================================== + libreftest = """ + Example from the Library Reference: Doc/lib/libcollections.tex + + >>> 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'] + >>> d.left() # peek at leftmost item + 'g' + >>> d.right() # peek at rightmost item + 'i' + >>> list(reversed(d)) # list the contents of a deque in reverse + ['i', 'h', 'g'] + >>> 'h' in d # search the deque + True + >>> d.extend('jkl') # add multiple elements at once + >>> d + deque(['g', 'h', 'i', 'j', 'k', 'l']) + >>> d.rotate(1) # right rotation + >>> d + deque(['l', 'g', 'h', 'i', 'j', 'k']) + >>> d.rotate(-1) # left rotation + >>> d + deque(['g', 'h', 'i', 'j', 'k', 'l']) + >>> deque(reversed(d)) # make a new deque in reverse order + deque(['l', 'k', 'j', 'i', 'h', 'g']) + >>> d.clear() # empty the deque + >>> d.pop() # cannot pop from an empty deque + Traceback (most recent call last): + File "<pyshell#6>", line 1, in -toplevel- + d.pop() + IndexError: pop from an empty deque + + >>> d.extendleft('abc') # extendleft() reverses the input order + >>> d + deque(['c', 'b', 'a']) + + """ + + + #============================================================================== + + __test__ = {'libreftest' : libreftest} + def test_main(verbose=None): import sys *************** *** 395,398 **** --- 477,484 ---- counts[i] = sys.gettotalrefcount() print counts + + # doctests + from test import test_deque + test_support.run_doctest(test_deque, verbose) if __name__ == "__main__":

1 0

python/dist/src/Lib asynchat.py,1.22,1.23
by rhettinger＠users.sourceforge.net 28 Feb '04

28 Feb '04

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24444/Lib Modified Files: asynchat.py Log Message: Improvements to collections.deque(): * Add doctests for the examples in the library reference. * Add two methods, left() and right(), modeled after deques in C++ STL. * Apply the new method to asynchat.py. * Add comparison operators to make deques more substitutable for lists. * Replace the LookupErrors with IndexErrors to more closely match lists. Index: asynchat.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/asynchat.py,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** asynchat.py 7 Feb 2004 03:19:10 -0000 1.22 --- asynchat.py 29 Feb 2004 02:15:56 -0000 1.23 *************** *** 263,271 **** def first (self): ! it = iter(self.list) ! try: ! return it.next() ! except StopIteration: ! raise IndexError def push (self, data): --- 263,267 ---- def first (self): ! return self.list.left() def push (self, data):

1 0

python/dist/src/Doc/lib libcollections.tex, 1.4, 1.5
by rhettinger＠users.sourceforge.net 28 Feb '04

28 Feb '04

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24444/Doc/lib Modified Files: libcollections.tex Log Message: Improvements to collections.deque(): * Add doctests for the examples in the library reference. * Add two methods, left() and right(), modeled after deques in C++ STL. * Apply the new method to asynchat.py. * Add comparison operators to make deques more substitutable for lists. * Replace the LookupErrors with IndexErrors to more closely match lists. Index: libcollections.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libcollections.tex,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** libcollections.tex 7 Feb 2004 21:12:59 -0000 1.4 --- libcollections.tex 29 Feb 2004 02:15:55 -0000 1.5 *************** *** 55,66 **** \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} --- 55,76 ---- \end{methoddesc} + \begin{methoddesc}{left}{} + Return leftmost element from the deque. + If no elements are present, raises a \exception{IndexError}. + \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{IndexError}. \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{IndexError}. ! \end{methoddesc} ! ! \begin{methoddesc}{right}{} ! Return the rightmost element from the deque. ! If no elements are present, raises a \exception{IndexError}. \end{methoddesc} *************** *** 81,94 **** >>> 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' --- 91,104 ---- >>> 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' *************** *** 97,100 **** --- 107,115 ---- >>> list(d) # list the contents of the deque ['g', 'h', 'i'] + + >>> d.left() # peek at leftmost item + 'g' + >>> d.right() # peek at rightmost item + 'i' >>> list(reversed(d)) # list the contents of a deque in reverse ['i', 'h', 'g'] *************** *** 110,122 **** >>> d deque(['g', 'h', 'i', 'j', 'k', 'l']) >>> deque(reversed(d)) # make a new deque in reverse order deque(['l', 'k', 'j', 'i', 'h', 'g']) >>> d.clear() # empty the deque >>> d.pop() # cannot 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 >>> d.extendleft('abc') # extendleft() reverses the input order --- 125,137 ---- >>> d deque(['g', 'h', 'i', 'j', 'k', 'l']) + >>> deque(reversed(d)) # make a new deque in reverse order deque(['l', 'k', 'j', 'i', 'h', 'g']) >>> d.clear() # empty the deque >>> d.pop() # cannot pop from an empty deque Traceback (most recent call last): File "<pyshell#6>", line 1, in -toplevel- d.pop() ! IndexError: pop from an empty deque >>> d.extendleft('abc') # extendleft() reverses the input order

1 0

python/dist/src/Modules collectionsmodule.c, 1.7, 1.8
by rhettinger＠users.sourceforge.net 28 Feb '04

28 Feb '04

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24444/Modules Modified Files: collectionsmodule.c Log Message: Improvements to collections.deque(): * Add doctests for the examples in the library reference. * Add two methods, left() and right(), modeled after deques in C++ STL. * Apply the new method to asynchat.py. * Add comparison operators to make deques more substitutable for lists. * Replace the LookupErrors with IndexErrors to more closely match lists. Index: collectionsmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/collectionsmodule.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** collectionsmodule.c 28 Feb 2004 15:56:27 -0000 1.7 --- collectionsmodule.c 29 Feb 2004 02:15:56 -0000 1.8 *************** *** 35,38 **** --- 35,40 ---- } dequeobject; + PyTypeObject deque_type; + static PyObject * deque_new(PyTypeObject *type, PyObject *args, PyObject *kwds) *************** *** 110,114 **** if (deque->len == 0) { ! PyErr_SetString(PyExc_LookupError, "pop from an empty deque"); return NULL; } --- 112,116 ---- if (deque->len == 0) { ! PyErr_SetString(PyExc_IndexError, "pop from an empty deque"); return NULL; } *************** *** 145,149 **** if (deque->len == 0) { ! PyErr_SetString(PyExc_LookupError, "pop from an empty deque"); return NULL; } --- 147,151 ---- if (deque->len == 0) { ! PyErr_SetString(PyExc_IndexError, "pop from an empty deque"); return NULL; } *************** *** 176,179 **** --- 178,213 ---- static PyObject * + deque_right(dequeobject *deque, PyObject *unused) + { + PyObject *item; + + if (deque->len == 0) { + PyErr_SetString(PyExc_IndexError, "deque is empty"); + return NULL; + } + item = deque->rightblock->data[deque->rightindex]; + Py_INCREF(item); + return item; + } + + PyDoc_STRVAR(right_doc, "Return the rightmost element."); + + static PyObject * + deque_left(dequeobject *deque, PyObject *unused) + { + PyObject *item; + + if (deque->len == 0) { + PyErr_SetString(PyExc_IndexError, "deque is empty"); + return NULL; + } + item = deque->leftblock->data[deque->leftindex]; + Py_INCREF(item); + return item; + } + + PyDoc_STRVAR(left_doc, "Return the leftmost element."); + + static PyObject * deque_extend(dequeobject *deque, PyObject *iterable) { *************** *** 468,471 **** --- 502,581 ---- } + static PyObject * + deque_richcompare(PyObject *v, PyObject *w, int op) + { + PyObject *it1=NULL, *it2=NULL, *x, *y; + int i, b, vs, ws, minlen, cmp=-1; + + if (v->ob_type != &deque_type || w->ob_type != &deque_type) { + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; + } + + /* Shortcuts */ + vs = ((dequeobject *)v)->len; + ws = ((dequeobject *)w)->len; + if (op == Py_EQ) { + if (v == w) + Py_RETURN_TRUE; + if (vs != ws) + Py_RETURN_FALSE; + } + if (op == Py_NE) { + if (v == w) + Py_RETURN_FALSE; + if (vs != ws) + Py_RETURN_TRUE; + } + + /* Search for the first index where items are different */ + it1 = PyObject_GetIter(v); + if (it1 == NULL) + goto done; + it2 = PyObject_GetIter(w); + if (it2 == NULL) + goto done; + minlen = (vs < ws) ? vs : ws; + for (i=0 ; i < minlen ; i++) { + x = PyIter_Next(it1); + if (x == NULL) + goto done; + y = PyIter_Next(it2); + if (y == NULL) { + Py_DECREF(x); + goto done; + } + b = PyObject_RichCompareBool(x, y, Py_EQ); + if (b == 0) { + cmp = PyObject_RichCompareBool(x, y, op); + Py_DECREF(x); + Py_DECREF(y); + goto done; + } + Py_DECREF(x); + Py_DECREF(y); + if (b == -1) + goto done; + } + /* Elements are equal through minlen. The longest input is the greatest */ + switch (op) { + case Py_LT: cmp = vs < ws; break; + case Py_LE: cmp = vs <= ws; break; + case Py_EQ: cmp = vs == ws; break; + case Py_NE: cmp = vs != ws; break; + case Py_GT: cmp = vs > ws; break; + case Py_GE: cmp = vs >= ws; break; + } + + done: + Py_XDECREF(it1); + Py_XDECREF(it2); + if (cmp == 1) + Py_RETURN_TRUE; + if (cmp == 0) + Py_RETURN_FALSE; + return NULL; + } + static int deque_init(dequeobject *deque, PyObject *args, PyObject *kwds) *************** *** 510,513 **** --- 620,625 ---- {"extendleft", (PyCFunction)deque_extendleft, METH_O, extendleft_doc}, + {"left", (PyCFunction)deque_left, + METH_NOARGS, left_doc}, {"pop", (PyCFunction)deque_pop, METH_NOARGS, pop_doc}, *************** *** 518,521 **** --- 630,635 ---- {"__reversed__", (PyCFunction)deque_reviter, METH_NOARGS, reversed_doc}, + {"right", (PyCFunction)deque_right, + METH_NOARGS, right_doc}, {"rotate", (PyCFunction)deque_rotate, METH_VARARGS, rotate_doc}, *************** *** 554,558 **** (traverseproc)set_traverse, /* tp_traverse */ (inquiry)deque_clear, /* tp_clear */ ! 0, /* tp_richcompare */ 0, /* tp_weaklistoffset*/ (getiterfunc)deque_iter, /* tp_iter */ --- 668,672 ---- (traverseproc)set_traverse, /* tp_traverse */ (inquiry)deque_clear, /* tp_clear */ ! (richcmpfunc)deque_richcompare, /* tp_richcompare */ 0, /* tp_weaklistoffset*/ (getiterfunc)deque_iter, /* tp_iter */

1 0

python/dist/src/Mac/Tools/IDE PackageManager.py, 1.14.4.3, 1.14.4.4
by jackjansen＠users.sourceforge.net 28 Feb '04

28 Feb '04

Update of /cvsroot/python/python/dist/src/Mac/Tools/IDE In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29834 Modified Files: Tag: release23-maint PackageManager.py Log Message: Backport of 1.18: - Allow easy opening of experimental database, if pimp >= 0.4 - Allow easy access to the PackMan homepage, for even more databases. Index: PackageManager.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/PackageManager.py,v retrieving revision 1.14.4.3 retrieving revision 1.14.4.4 diff -C2 -d -r1.14.4.3 -r1.14.4.4 *** PackageManager.py 27 Nov 2003 23:20:06 -0000 1.14.4.3 --- PackageManager.py 28 Feb 2004 23:23:57 -0000 1.14.4.4 *************** *** 46,49 **** --- 46,51 ---- import pimp + PACKMAN_HOMEPAGE="http://www.python.org/packman" + ELIPSES = '...' *************** *** 61,64 **** --- 63,67 ---- from Carbon import AE from Carbon import AppleEvents + self.defaulturl = "" AE.AEInstallEventHandler(AppleEvents.kCoreEventClass, AppleEvents.kAEOpenApplication, *************** *** 81,85 **** if debug_stderr: sys.stderr = debug_stderr ! self.opendoc(None) self.mainloop() --- 84,88 ---- if debug_stderr: sys.stderr = debug_stderr ! self.domenu_openstandard() self.mainloop() *************** *** 87,93 **** --- 90,100 ---- m = Wapplication.Menu(self.menubar, "File") newitem = FrameWork.MenuItem(m, "Open Standard Database", "N", 'openstandard') + newexpitem = FrameWork.MenuItem(m, "Open Experimental Database", None, 'openexperimental') + newexpitem.enable(pimp.PIMP_VERSION >= "0.4") openitem = FrameWork.MenuItem(m, "Open"+ELIPSES, "O", 'open') openURLitem = FrameWork.MenuItem(m, "Open URL"+ELIPSES, "D", 'openURL') FrameWork.Separator(m) + moreinfoitem = FrameWork.MenuItem(m, "More Databases", None, 'opendatabasepage') + FrameWork.Separator(m) closeitem = FrameWork.MenuItem(m, "Close", "W", 'close') ## saveitem = FrameWork.MenuItem(m, "Save", "S", 'save') *************** *** 148,151 **** --- 155,160 ---- def opendoc(self, url): + if url: + self.defaulturl = url PackageBrowser(url) *************** *** 154,161 **** def do_about(self, id, item, window, event): ! EasyDialogs.Message("Package Install Manager for Python") def domenu_openstandard(self, *args): ! self.opendoc(None) def domenu_open(self, *args): --- 163,180 ---- def do_about(self, id, item, window, event): ! EasyDialogs.Message("Package Install Manager for Python\nPackMan engine (pimp) version: %s" % ! pimp.PIMP_VERSION) def domenu_openstandard(self, *args): ! if pimp.PIMP_VERSION >= "0.4": ! url = pimp.getDefaultDatabase() ! else: ! # 0.3 compatibility ! url = None ! self.opendoc(url) ! ! def domenu_openexperimental(self, *args): ! database = pimp.getDefaultDatabase(experimental=True) ! self.opendoc(database) def domenu_open(self, *args): *************** *** 172,184 **** yes="OK", no="") if ok <= 0: return ! url = EasyDialogs.AskString("URL of database to open:", ok="Open") if url: self.opendoc(url) ! def domenu_openbyname(self, *args): ! url = EasyDialogs.AskString("Open URL:", ok="Open") ! if url: ! self.opendoc(url) ! def makeopenwindowsmenu(self): for i in range(len(self.openwindowsmenu.items)): --- 191,204 ---- yes="OK", no="") if ok <= 0: return ! url = EasyDialogs.AskString("URL of database to open:", ! default=self.defaulturl, ok="Open") if url: self.opendoc(url) ! def domenu_opendatabasepage(self): ! import ic ! ! icr = ic.IC() ! icr.launchurl(PACKMAN_HOMEPAGE) def makeopenwindowsmenu(self): for i in range(len(self.openwindowsmenu.items)):

1 0