Mailman 3 August 2004 - Python-checkins

python/dist/src/Lib bdb.py, 1.44, 1.45 pdb.py, 1.68, 1.69
by jlgijsbers＠users.sourceforge.net 30 Aug '04

30 Aug '04

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29399 Modified Files: bdb.py pdb.py Log Message: Patch #1003640: replace checkline() function parsing with new breakpoint logic: 1) When a breakpoint is set via a function name: - the breakpoint gets the lineno of the def statement - a new funcname attribute is attached to the breakpoint 2) bdb.effective() calls new function checkfuncname() to handle: - def statement is executed: don't break. - a first executable line of a function with a breakpoint on the lineno of the def statement is reached: break. This fixes bugs 976878, 926369 and 875404. Thanks Ilya Sandler. Index: bdb.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bdb.py,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- bdb.py 24 Mar 2004 21:57:08 -0000 1.44 +++ bdb.py 30 Aug 2004 13:29:44 -0000 1.45 @@ -113,7 +113,12 @@ return False lineno = frame.f_lineno if not lineno in self.breaks[filename]: - return False + # The line itself has no breakpoint, but maybe the line is the + # first line of a function with breakpoint set by function name. + lineno = frame.f_code.co_firstlineno + if not lineno in self.breaks[filename]: + return False + # flag says ok to delete temp. bp (bp, flag) = effective(filename, lineno, frame) if bp: @@ -210,7 +215,8 @@ # Call self.get_*break*() to see the breakpoints or better # for bp in Breakpoint.bpbynumber: if bp: bp.bpprint(). - def set_break(self, filename, lineno, temporary=0, cond = None): + def set_break(self, filename, lineno, temporary=0, cond = None, + funcname=None): filename = self.canonic(filename) import linecache # Import as late as possible line = linecache.getline(filename, lineno) @@ -222,7 +228,7 @@ list = self.breaks[filename] if not lineno in list: list.append(lineno) - bp = Breakpoint(filename, lineno, temporary, cond) + bp = Breakpoint(filename, lineno, temporary, cond, funcname) def clear_break(self, filename, lineno): filename = self.canonic(filename) @@ -428,7 +434,10 @@ # index 0 is unused, except for marking an # effective break .... see effective() - def __init__(self, file, line, temporary=0, cond = None): + def __init__(self, file, line, temporary=0, cond=None, funcname=None): + self.funcname = funcname + # Needed if funcname is not None. + self.func_first_executable_line = None self.file = file # This better be in canonical form! self.line = line self.temporary = temporary @@ -483,6 +492,32 @@ # -----------end of Breakpoint class---------- +def checkfuncname(b, frame): + """Check whether we should break here because of `b.funcname`.""" + if not b.funcname: + # Breakpoint was set via line number. + if b.line != frame.f_lineno: + # Breakpoint was set at a line with a def statement and the function + # defined is called: don't break. + return False + return True + + # Breakpoint set via function name. + + if frame.f_code.co_name != b.funcname: + # It's not a function call, but rather execution of def statement. + return False + + # We are in the right frame. + if not b.func_first_executable_line: + # The function is entered for the 1st time. + b.func_first_executable_line = frame.f_lineno + + if b.func_first_executable_line != frame.f_lineno: + # But we are not at the first line number: don't break. + return False + return True + # Determines if there is an effective (active) breakpoint at this # line of code. Returns breakpoint number or 0 if none def effective(file, line, frame): @@ -498,6 +533,8 @@ b = possibles[i] if b.enabled == 0: continue + if not checkfuncname(b, frame): + continue # Count every hit when bp is enabled b.hits = b.hits + 1 if not b.cond: Index: pdb.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/pdb.py,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- pdb.py 14 Aug 2004 15:19:27 -0000 1.68 +++ pdb.py 30 Aug 2004 13:29:44 -0000 1.69 @@ -215,6 +215,7 @@ arg = arg[:comma].rstrip() # parse stuff before comma: [filename:]lineno | function colon = arg.rfind(':') + funcname = None if colon >= 0: filename = arg[:colon].rstrip() f = self.lookupmodule(filename) @@ -245,6 +246,9 @@ if hasattr(func, 'im_func'): func = func.im_func code = func.func_code + #use co_name to identify the bkpt (function names + #could be aliased, but co_name is invariant) + funcname = code.co_name lineno = code.co_firstlineno filename = code.co_filename except: @@ -257,6 +261,7 @@ print ('or was not found ' 'along sys.path.') return + funcname = ok # ok contains a function name lineno = int(ln) if not filename: filename = self.defaultFile() @@ -264,7 +269,7 @@ line = self.checkline(filename, lineno) if line: # now set the break point - err = self.set_break(filename, line, temporary, cond) + err = self.set_break(filename, line, temporary, cond, funcname) if err: print '***', err else: bp = self.get_breaks(filename, line)[-1] @@ -319,13 +324,11 @@ return answer or failed def checkline(self, filename, lineno): - """Return line number of first line at or after input - argument such that if the input points to a 'def', the - returned line number is the first - non-blank/non-comment line to follow. If the input - points to a blank or comment line, return 0. At end - of file, also return 0.""" + """Check whether specified line seems to be executable. + Return `lineno` if it is, 0 if not (e.g. a docstring, comment, blank + line or EOF). Warning: testing is not comprehensive. + """ line = linecache.getline(filename, lineno) if not line: print 'End of file' @@ -336,40 +339,6 @@ (line[:3] == '"""') or line[:3] == "'''"): print '*** Blank or comment' return 0 - # When a file is read in and a breakpoint is at - # the 'def' statement, the system stops there at - # code parse time. We don't want that, so all breakpoints - # set at 'def' statements are moved one line onward - if line[:3] == 'def': - instr = '' - brackets = 0 - while 1: - skipone = 0 - for c in line: - if instr: - if skipone: - skipone = 0 - elif c == '\\': - skipone = 1 - elif c == instr: - instr = '' - elif c == '#': - break - elif c in ('"',"'"): - instr = c - elif c in ('(','{','['): - brackets = brackets + 1 - elif c in (')','}',']'): - brackets = brackets - 1 - lineno = lineno+1 - line = linecache.getline(filename, lineno) - if not line: - print 'end of file' - return 0 - line = line.strip() - if not line: continue # Blank line - if brackets <= 0 and line[0] not in ('#','"',"'"): - break return lineno def do_enable(self, arg):

1 0

python/nondist/peps pep-0318.txt,1.27,1.28
by anthonybaxter＠users.sourceforge.net 30 Aug '04

30 Aug '04

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27053 Modified Files: pep-0318.txt Log Message: I'm done with this now. It'll need a further update when Guido makes a decision. Index: pep-0318.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0318.txt,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- pep-0318.txt 25 Aug 2004 13:47:29 -0000 1.27 +++ pep-0318.txt 30 Aug 2004 13:16:56 -0000 1.28 @@ -2,28 +2,23 @@ Title: Decorators for Functions and Methods Version: $Revision$ Last-Modified: $Date$ -Author: Kevin D. Smith <Kevin.Smith(a)theMorgue.org>, - Jim Jewett <jimjjewett(a)users.sourceforge.net>, - Skip Montanaro <skip(a)pobox.com>, - Anthony Baxter <anthony(a)python.org> +Author: Kevin D. Smith, Jim Jewett, Skip Montanaro, Anthony Baxter Status: Draft Type: Standards Track Content-Type: text/x-rst Created: 05-Jun-2003 Python-Version: 2.4 -Post-History: 09-Jun-2003, 10-Jun-2003, 27-Feb-2004, 23-Mar-2004 +Post-History: 09-Jun-2003, 10-Jun-2003, 27-Feb-2004, 23-Mar-2004, 30-Aug-2004 WarningWarningWarning ===================== -This is not yet complete. This is still a work-in-progress. Feedback -to anthony. Please note that the point of this PEP is *not* to -provide an open-slather of plusses and minuses for each syntax, but is -instead to justify the choice made. If, in 2.4a3, the syntax is -changed, the PEP will be updated to match this, complete with the -arguments for the change. - +The final decision on the syntax for 2.4a3 is not yet made. This +will be done before 2.4a3, and this document will be updated to +match. Note also that this document does not attempt to cover the +huge number of potential alternative syntaxes, nor is it an attempt +to exhaustively list all the positives and negatives of each form. Abstract ======== @@ -112,6 +107,10 @@ decorator concept before encountering it in Python. There's just no strong preexisting meme that captures the concept. +* Syntax discussions in general appear to cause more contention than + almost anything else. Readers are pointed to the ternary operator + discussions that were associated with PEP 308 for another example of + this. Background ========== @@ -263,7 +262,7 @@ rather than attempting to work through these individual syntaxes, it's worthwhile to break the syntax discussion down into a number of areas. Attempting to discuss `each possible syntax`_ individually would be an -act of madness, and produce a completely unwieldly PEP. +act of madness, and produce a completely unwieldy PEP. .. _a large number: http://www.python.org/moin/PythonDecorators @@ -295,7 +294,7 @@ will be in 2.4a3 will also require one decorator per line (in a2, multiple decorators can be specified on the same line). -People also complained that the syntax got unwieldly quickly when +People also complained that the syntax got unworldly quickly when multiple decorators were used. The point was made, though, that the chances of a large number of decorators being used on a single function were small and thus this was not a large worry. @@ -310,6 +309,13 @@ properly without having to go back and change your initial perceptions if the syntax did not come before the function definition. +Guido decided `he preferred`_ having the decorators on the line before +the 'def', because it was felt that a long argument list would mean +that the decorators would be 'hidden' + +.. _he preferred: + http://mail.python.org/pipermail/python-dev/2004-March/043756.html + The second form is the decorators between the def and the function name, or the function name and the argument list:: @@ -341,7 +347,7 @@ def bar(low,high) @accepts(int,int),@returns(float): pass -Guido `summarised the arguments`_ against this form (many of which +Guido `summarized the arguments`_ against this form (many of which also apply to the previous form) as: - it hides crucial information (e.g. that it is a static method) @@ -353,7 +359,7 @@ - it's cumbersome to cut and paste a decorator list for reuse, because it starts and ends in the middle of a line -.. _summarised the arguments: +.. _summarized the arguments: http://mail.python.org/pipermail/python-dev/2004-August/047112.html The next form is that the decorator syntax go inside the method @@ -399,26 +405,70 @@ Syntax forms ------------ -* ``@decorator`` +* ``@decorator``:: + + @classmethod + def foo(arg1,arg2): + pass + + @accepts(int,int) + @returns(float) + def bar(low,high): + pass The major objections against this syntax are that the @ symbol is not currently used in Python (and is used in both IPython and Leo), - that the @ symbol is not meaningful, + and that the @ symbol is not meaningful. Another objection is that + this "wastes" a currently unused character (from a limited set) on + something that is not perceived as a major use. -* ``|decorator`` +* ``|decorator``:: + + |classmethod + def foo(arg1,arg2): + pass + + |accepts(int,int) + |returns(float) + def bar(low,high): + pass This is a variant on the @decorator syntax -- it has the advantage that it does not break IPython and Leo. Its major disadvantage compared to the @syntax is that the | symbol looks like both a capital I and a lowercase l. -* list syntax +* list syntax:: + + [classmethod] + def foo(arg1,arg2): + pass + + [accepts(int,int), returns(float)] + def bar(low,high): + pass The major objection to the list syntax is that it's currently meaningful (when used in the form before the method). It's also lacking any indication that the expression is a decorator. -* list syntax using other brackets (``<...>``, ``[[...]]``, ...) +* list syntax using other brackets (``<...>``, ``[[...]]``, ...):: + + <classmethod> + def foo(arg1,arg2): + pass + + <accepts(int,int), returns(float)> + def bar(low,high): + pass + + None of these alternatives gained much traction. The alternatives + which involve square brackets only serve to make it obvious that the + decorator construct is not a list. They do nothing to make parsing any + easier. The '<...>' alternative presents parsing problems because '<' + and '>' already parse as un-paired. They present a further parsing + ambiguity because a right angle bracket might be a greater than symbol + instead of a closer for the decorators. * ``decorate()`` @@ -427,116 +477,7 @@ following function. Both Jp Calderone and Philip Eby produced implementations of functions that did this. Guido was pretty firmly against this -- with no new syntax, the magicness of a function like - this is extremely high. - -* new keyword (and block) - - -Alternate Proposals -=================== - -The text in this section will be integrated into the previous section. -They're here for hysterical raisins for now. - - -Several other syntaxes have been proposed:: - - def func(arg1, arg2, ...) as dec1, dec2, ...: - pass - -The absence of brackets makes it cumbersome to break long lists of -decorators across multiple lines, and the keyword "as" doesn't have -the same meaning as its use in the ``import`` statement. Plenty of -`alternatives to "as"`_ have been proposed. :-) :: - - def [dec1, dec2, ...] func(arg1, arg2, ...): - pass - -.. _alternatives to "as": - http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&oe=UTF-8&threadm=mailman… - -This form has the disadvantage that the decorators visually assume -higher priority than the function name and argument list. :: - - def func [dec1, dec2, ...] (arg1, arg2, ...): - pass - -Quixote's `Python Template Language`_ uses this form, but only -supports a single decorator chosen from a restricted set. For short -lists it works okay, but for long list it separates the argument list -from the function name. :: - - using: - dec1 - dec2 - ... - def foo(arg1, arg2, ...): - pass - -.. _Python Template Language: - http://www.mems-exchange.org/software/quixote/doc/PTL.html - -The function definition is not nested within the using: block making -it impossible to tell which objects following the block will be -decorated. Nesting the function definition within the using: block -suggests nesting of namespaces that doesn't exist. The name ``foo`` -would actually exist at the same scope as the using: block. Finally, -it would require the introduction of a new keyword. - -The obvious alternative that nests the function within the block :: - - using: - dec1 - dec2 - ... - def foo(arg1, arg2, ...): - pass - -has its own set of drawbacks. Having the minimal indent level be -three deep for methods is painful for those using limited-width -windows. The inconsistent indentation between methods of the same -class with and without decorators would be a readability problem. -Finally, adding or removing decorators would require reindenting the -entire function/method body. - -Guido proposed and implemented a patch to support interpretation of -a `list of decorators`_ as a prefix to function definitions :: - - [dec1, dec2, ...] - def foo(arg1, arg2, ...): - pass - -For a while this was Guido's preferred solution, but negative -sentiment ran high, mostly because that syntax, though useless except -for side effects of the list, is already legal and thus creates a -special case. - -One attraction people later had to the syntax, though, was the -possibility of implementing a backwards-compatible implementation of -decorators so that versions prior to 2.4 (back to 2.2) could also use -the new syntax. But it was decided this was not a valid argument; -Since the feature is new it should not be restricted just so that -previous versions could possibly use it. - -.. _list of decorators: - http://python.org/sf/926860 - -Another variant on the list syntax that was initially favored was:: - - def func(arg1, arg2, ...) [dec1, dec2]: - pass - -Guido decided `he preferred`_ having the decorators on the line before -the 'def', because it was felt that a long argument list would mean -that the decorators would be 'hidden' - -.. _he preferred: - http://mail.python.org/pipermail/python-dev/2004-March/043756.html - -Phillip Eby and Jp Calderone both proposed variants that required -no new syntax, but instead used some fairly advanced introspection -to provide decorator-like behavoiur, but Guido was unimpressed by -these, stating: + this is extremely high: Using functions with "action-at-a-distance" through sys.settraceback may be okay for an obscure feature that can't be @@ -548,14 +489,29 @@ their design needs to be forward-looking, not constrained by what can be implemented in 2.3. -A `page on the Python Wiki`_ was created to summarize a number of the -proposals. Once it stabilizes perhaps someone would care to -incorporate its content into this PEP (hint, hint). +* new keyword (and block) -.. _page on the Python Wiki: - http://www.python.org/moin/PythonDecorators + This idea was the consensus alternate from comp.lang.python. Robert + Brewer wrote up a detailed `J2 proposal`_ document outlining the arguments + in favor of this. The issues with this form are that it requires a new + keyword (and therefore a ``from __future__ import decorators`` statement), + it seems like there is no obvious choice for the keyword (``using`` is + the choice of the proposal and implementation), and that the form + produces something that looks like a normal code block, but isn't. Attempts + to use statements in this block will cause a syntax error. It's also + going to potentially confuse users who don't expect a block to contain + bare expressions. + + +.. _J2 proposal: + http://www.aminus.org/rbre/python/pydec.html +There are plenty of other variants and proposals on `the wiki page`_. + +.. _the wiki page: + http://www.python.org/moin/PythonDecorators + Why @? ------ @@ -570,13 +526,8 @@ For syntax options which use a list-like syntax (no matter where it appears) to specify the decorators a few alternatives were proposed: -``[|...|]``, ``*[...]*``, and ``<...>``. None gained much traction. -The alternatives which involve square brackets only serve to make it -obvious that the decorator construct is not a list. They do nothing -to make parsing any easier. The '<...>' alternative presents parsing -problems because '<' and '>' already parse as un-paired. They present -a further parsing ambiguity because a right angle bracket might be a -greater than symbol instead of a closer for the decorators. +``[|...|]``, ``*[...]*``, and ``<...>``. + .. _Javadoc comments: http://java.sun.com/j2se/javadoc/writingdoccomments/ @@ -584,10 +535,10 @@ http://java.sun.com/j2se/1.5.0/docs/guide/language/annotations.html -Current Implementation -====================== +Current Implementation, History +=============================== -Guido asked for a voluteer to implement his preferred syntax, and Mark +Guido asked for a volunteer to implement his preferred syntax, and Mark Russell stepped up and posted a `patch`_ to SF. The syntax accepted for 2.4a2 is:: @@ -610,6 +561,24 @@ .. _patch: http://www.python.org/sf/979728 .. _previous patch: http://starship.python.net/crew/mwh/hacks/meth-syntax-sugar-3.diff +After 2.4a2 was released, in response to community reaction, Guido +stated that he'd re-examine a community proposal, if the community +could come up with a community consensus, a decent proposal, and an +implementation. + +After an amazing number of posts, collecting a vast number of alternatives +in the `Python wiki`_, the proposed J2 syntax (the new keyword ``using`` +in a block before the def). Robert Brewer wrote a `detailed proposal`_ +for this form, and Michael Sparks produced `a patch`_. As at time of +writing, we're waiting for Guido's decision. + +.. _Python wiki: + http://www.python.org/moin/PythonDecorators +.. _detailed proposal: + http://www.aminus.org/rbre/python/pydec.html +.. _a patch: + http://www.python.org/sf/1013835 + Examples ======== @@ -632,6 +601,9 @@ def func(): ... + Note that this example is probably not suitable for real usage, but + is for example purposes only. + 2. Define a class with a singleton instance. Note that once the class disappears enterprising programmers would have to be more creative to create more instances. (From Shane Hathaway on ``python-dev``.) @@ -664,9 +636,9 @@ def mymethod(f): ... -4. Enforce function argument and return types. (Note that this is not - exactly correct, as the returned new_f doesn't have "func" as its - func_name attribute.) :: +4. Enforce function argument and return types. Note that this + copies the func_name attribute from the old to the new function. + func_name was made writable in Python 2.4a3:: def accepts(*types): def check_accepts(f): @@ -676,6 +648,7 @@ assert isinstance(a, t), \ "arg %r does not match %s" % (a,t) return f(*args, **kwds) + new_f.func_name = f.func_name return new_f return check_accepts @@ -686,6 +659,7 @@ assert isinstance(result, rtype), \ "return value %r does not match %s" % (result,rtype) return result + new_f.func_name = f.func_name return new_f return check_returns

1 0

[Python-checkins] python/dist/src/Doc/whatsnew whatsnew24.tex, 1.88, 1.89
by akuchling＠users.sourceforge.net 30 Aug '04

30 Aug '04

Update of /cvsroot/python/python/dist/src/Doc/whatsnew In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13235 Modified Files: whatsnew24.tex Log Message: Add items Index: whatsnew24.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/whatsnew/whatsnew24.tex,v retrieving revision 1.88 retrieving revision 1.89 diff -u -d -r1.88 -r1.89 --- whatsnew24.tex 25 Aug 2004 13:38:46 -0000 1.88 +++ whatsnew24.tex 30 Aug 2004 11:58:04 -0000 1.89 @@ -1118,6 +1118,20 @@ for options can now include the string \code{'\%default'}, which will be replaced by the option's default value. +\item A new \function{urandom(\var{n})} function +was added to the \module{os} module, providing access to +platform-specific sources of randomness such as +\filename{/dev/urandom} on Linux or the Windows CryptoAPI. The +function returns a string containing \var{n} bytes of random data. +(Contributed by Trevor Perrin.) + +\item Another new function: \function{os.path.lexists(\var{path})} +returns true if the file specified by \var{path} exists, whether or +not it's a symbolic link. This differs from the existing +\function{os.path.exists(\var{path})} function, which returns false if +\var{path} is a symlink that points to a destination that doesn't exist. +(Contributed by Beni Cherniavsky.) + \item A new \function{getsid()} function was added to the \module{posix} module that underlies the \module{os} module. (Contributed by J. Raynor.)

1 0

python/dist/src/Lib/plat-riscos riscospath.py, 1.10, 1.11
by jlgijsbers＠users.sourceforge.net 30 Aug '04

30 Aug '04

Update of /cvsroot/python/python/dist/src/Lib/plat-riscos In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30857/Lib/plat-riscos Modified Files: riscospath.py Log Message: Patch #941486: add os.path.lexists(). Also fix bug #940578 by using lexists in glob.glob. Index: riscospath.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/plat-riscos/riscospath.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- riscospath.py 10 May 2003 07:36:55 -0000 1.10 +++ riscospath.py 30 Aug 2004 10:19:55 -0000 1.11 @@ -218,6 +218,8 @@ except swi.error: return 0 +lexists = exists + def isdir(p): """

1 0

python/dist/src/Lib/test test_glob.py, 1.7, 1.8 test_posixpath.py, 1.11, 1.12
by jlgijsbers＠users.sourceforge.net 30 Aug '04

30 Aug '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30857/Lib/test Modified Files: test_glob.py test_posixpath.py Log Message: Patch #941486: add os.path.lexists(). Also fix bug #940578 by using lexists in glob.glob. Index: test_glob.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_glob.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- test_glob.py 16 Nov 2003 16:17:48 -0000 1.7 +++ test_glob.py 30 Aug 2004 10:19:56 -0000 1.8 @@ -48,6 +48,9 @@ self.mktemp('ZZZ') self.mktemp('a', 'bcd', 'EF') self.mktemp('a', 'bcd', 'efg', 'ha') + if hasattr(os, 'symlink'): + os.symlink(self.norm('broken'), self.norm('sym1')) + os.symlink(self.norm('broken'), self.norm('sym2')) def tearDown(self): deltree(self.tempdir) @@ -98,6 +101,13 @@ eq(self.glob('?a?', '*F'), map(self.norm, [os.path.join('aaa', 'zzzF'), os.path.join('aab', 'F')])) + def test_glob_broken_symlinks(self): + if hasattr(os, 'symlink'): + eq = self.assertSequencesEqual_noorder + eq(self.glob('sym*'), [self.norm('sym1'), self.norm('sym2')]) + eq(self.glob('sym1'), [self.norm('sym1')]) + eq(self.glob('sym2'), [self.norm('sym2')]) + def test_main(): run_unittest(GlobTests) Index: test_posixpath.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_posixpath.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- test_posixpath.py 20 Aug 2004 03:47:14 -0000 1.11 +++ test_posixpath.py 30 Aug 2004 10:19:56 -0000 1.12 @@ -150,6 +150,7 @@ os.remove(test_support.TESTFN + "1") self.assertIs(posixpath.islink(test_support.TESTFN + "2"), True) self.assertIs(posixpath.exists(test_support.TESTFN + "2"), False) + self.assertIs(posixpath.lexists(test_support.TESTFN + "2"), True) finally: if not f.close(): f.close() @@ -171,6 +172,7 @@ f.write("foo") f.close() self.assertIs(posixpath.exists(test_support.TESTFN), True) + self.assertIs(posixpath.lexists(test_support.TESTFN), True) finally: if not f.close(): f.close()

1 0

[Python-checkins] python/dist/src/Lib glob.py, 1.10, 1.11 macpath.py, 1.48, 1.49 ntpath.py, 1.60, 1.61 os2emxpath.py, 1.12, 1.13 posixpath.py, 1.72, 1.73
by jlgijsbers＠users.sourceforge.net 30 Aug '04

30 Aug '04

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30857/Lib Modified Files: glob.py macpath.py ntpath.py os2emxpath.py posixpath.py Log Message: Patch #941486: add os.path.lexists(). Also fix bug #940578 by using lexists in glob.glob. Index: glob.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/glob.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- glob.py 6 Jun 2001 06:24:38 -0000 1.10 +++ glob.py 30 Aug 2004 10:19:54 -0000 1.11 @@ -13,7 +13,7 @@ """ if not has_magic(pathname): - if os.path.exists(pathname): + if os.path.lexists(pathname): return [pathname] else: return [] @@ -29,7 +29,7 @@ for dirname in list: if basename or os.path.isdir(dirname): name = os.path.join(dirname, basename) - if os.path.exists(name): + if os.path.lexists(name): result.append(name) else: result = [] Index: macpath.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/macpath.py,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- macpath.py 8 Jun 2004 08:29:32 -0000 1.48 +++ macpath.py 30 Aug 2004 10:19:55 -0000 1.49 @@ -150,7 +150,7 @@ return os.stat(filename).st_ctime def exists(s): - """Return True if the pathname refers to an existing file or directory.""" + """Test whether a path exists. Returns False for broken symbolic links""" try: st = os.stat(s) @@ -158,6 +158,18 @@ return False return True +# Is `stat`/`lstat` a meaningful difference on the Mac? This is safe in any +# case. + +def lexists(path): + """Test whether a path exists. Returns True for broken symbolic links""" + + try: + st = os.lstat(path) + except os.error: + return False + return True + # Return the longest prefix of all list elements. def commonprefix(m): Index: ntpath.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/ntpath.py,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- ntpath.py 10 Jul 2004 20:42:21 -0000 1.60 +++ ntpath.py 30 Aug 2004 10:19:55 -0000 1.61 @@ -249,7 +249,6 @@ # Does a path exist? -# This is false for dangling symbolic links. def exists(path): """Test whether a path exists""" @@ -259,6 +258,8 @@ return False return True +lexists = exists + # Is a path a dos directory? # This follows symbolic links, so both islink() and isdir() can be true Index: os2emxpath.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/os2emxpath.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- os2emxpath.py 8 Jun 2004 08:29:32 -0000 1.12 +++ os2emxpath.py 30 Aug 2004 10:19:55 -0000 1.13 @@ -220,6 +220,8 @@ return False return True +lexists = exists + # Is a path a directory? Index: posixpath.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/posixpath.py,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- posixpath.py 20 Aug 2004 03:47:13 -0000 1.72 +++ posixpath.py 30 Aug 2004 10:19:55 -0000 1.73 @@ -174,6 +174,17 @@ return True +# Being true for dangling symbolic links is also useful. + +def lexists(path): + """Test whether a path exists. Returns True for broken symbolic links""" + try: + st = os.lstat(path) + except os.error: + return False + return True + + # Is a path a directory? # This follows symbolic links, so both islink() and isdir() can be true # for the same path.

1 0

python/dist/src/Doc/lib libglob.tex, 1.12, 1.13 libposixpath.tex, 1.39, 1.40
by jlgijsbers＠users.sourceforge.net 30 Aug '04

30 Aug '04

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30857/Doc/lib Modified Files: libglob.tex libposixpath.tex Log Message: Patch #941486: add os.path.lexists(). Also fix bug #940578 by using lexists in glob.glob. Index: libglob.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libglob.tex,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- libglob.tex 9 Oct 2000 18:12:29 -0000 1.12 +++ libglob.tex 30 Aug 2004 10:19:53 -0000 1.13 @@ -21,6 +21,7 @@ \var{pathname} can be either absolute (like \file{/usr/src/Python-1.5/Makefile}) or relative (like \file{../../Tools/*/*.gif}), and can contain shell-style wildcards. +Broken symlinks are included in the results (as in the shell). \end{funcdesc} For example, consider a directory containing only the following files: Index: libposixpath.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libposixpath.tex,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- libposixpath.tex 14 Aug 2004 14:41:32 -0000 1.39 +++ libposixpath.tex 30 Aug 2004 10:19:53 -0000 1.40 @@ -43,6 +43,15 @@ \begin{funcdesc}{exists}{path} Return \code{True} if \var{path} refers to an existing path. +Returns \code{False} for broken symbolic links. +\end{funcdesc} + +\begin{funcdesc}{lexists}{path} +Return \code{True} if \var{path} refers to an existing path. +Returns \code{True} for broken symbolic links. +Equivalent to \function{exists()} on platforms lacking +\function{os.lstat()}. +\versionadded{2.4} \end{funcdesc} \begin{funcdesc}{expanduser}{path}

1 0

python/dist/src/Misc NEWS,1.1121,1.1122
by jlgijsbers＠users.sourceforge.net 30 Aug '04

30 Aug '04

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30857/Misc Modified Files: NEWS Log Message: Patch #941486: add os.path.lexists(). Also fix bug #940578 by using lexists in glob.glob. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1121 retrieving revision 1.1122 diff -u -d -r1.1121 -r1.1122 --- NEWS 30 Aug 2004 06:14:23 -0000 1.1121 +++ NEWS 30 Aug 2004 10:19:56 -0000 1.1122 @@ -79,6 +79,9 @@ Library ------- +- Patch #941486: added os.path.lexists(), which returns True for broken + symlinks, unlike os.path.exists(). + - the random module now uses os.urandom() for seeding if it is available. Added a new generator based on os.urandom().

1 0

python/dist/src/Tools/msi msi.py,1.3,1.4
by loewis＠users.sourceforge.net 30 Aug '04

30 Aug '04

Update of /cvsroot/python/python/dist/src/Tools/msi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23267 Modified Files: msi.py Log Message: Pickup Tk from tcltk directory. Index: msi.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/msi/msi.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- msi.py 26 Aug 2004 05:23:19 -0000 1.3 +++ msi.py 30 Aug 2004 09:22:30 -0000 1.4 @@ -421,11 +421,13 @@ exit_dialog.cancel("Cancel", "Back", active = 0) exit_dialog.text("Acknowledgements", 135, 95, 220, 120, 0x30003, "Special Windows thanks to:\n" - " LettError, Erik van Blokland, for the Python for Windows graphic.\n" + " LettError, Erik van Blokland, for the \n" + " Python for Windows graphic.\n" " http://www.letterror.com/\n" "\n" - " Mark Hammond, without whose years of freely shared Windows\n" - " expertise, Python for Windows would still be Python for DOS.") + " Mark Hammond, without whose years of freely \n" + " shared Windows expertise, Python for Windows \n" + " would still be Python for DOS.") exit_dialog.text("Description", 135, 235, 220, 20, 0x30003, "Click the Finish button to exit the Installer.") @@ -917,7 +919,7 @@ lib.start_component("TkDLLs", tcltk) lib.add_file("_tkinter.pyd") dlls.append("_tkinter.pyd") - tcldir = os.path.normpath(srcdir+"/../tcl84/bin") + tcldir = os.path.normpath(srcdir+"/../tcltk/bin") for f in glob.glob1(tcldir, "*.dll"): lib.add_file(f, src=os.path.join(tcldir, f)) # check whether there are any unknown extensions @@ -937,7 +939,7 @@ lib.add_file(f.replace('pyd','lib')) lib.add_file('python%s%s.lib' % (major, minor)) # Add Tcl/Tk - tcldirs = [(root, '../tcl84/lib', 'tcl')] + tcldirs = [(root, '../tcltk/lib', 'tcl')] tcltk.set_current() while tcldirs: parent, phys, dir = tcldirs.pop()

1 0

python/dist/src/PCbuild _tkinter.vcproj, 1.4, 1.5 readme.txt, 1.55, 1.56
by loewis＠users.sourceforge.net 30 Aug '04

30 Aug '04

Update of /cvsroot/python/python/dist/src/PCbuild In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23173 Modified Files: _tkinter.vcproj readme.txt Log Message: Bump Tk version to 8.4.7. Build into tcltk directory. Index: _tkinter.vcproj =================================================================== RCS file: /cvsroot/python/python/dist/src/PCbuild/_tkinter.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- _tkinter.vcproj 12 Aug 2004 14:07:49 -0000 1.4 +++ _tkinter.vcproj 30 Aug 2004 09:22:04 -0000 1.5 @@ -21,7 +21,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\tcl84\include,..\Include,..\PC" + AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WITH_APPINIT" StringPooling="TRUE" RuntimeLibrary="2" @@ -39,11 +39,11 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\tcl84\lib\tk84.lib ..\..\tcl84\lib\tcl84.lib odbccp32.lib" + AdditionalDependencies="..\..\tcltk\lib\tk84.lib ..\..\tcltk\lib\tcl84.lib odbccp32.lib" OutputFile="./_tkinter.pyd" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="C:\Program Files\Tcl\lib" + AdditionalLibraryDirectories="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\./_tkinter.pdb" SubSystem="2" @@ -89,7 +89,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\tcl84\include,..\Include,..\PC" + AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WITH_APPINIT" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -105,11 +105,11 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\tcl84\lib\tk84.lib ..\..\tcl84\lib\tcl84.lib odbccp32.lib" + AdditionalDependencies="..\..\tcltk\lib\tk84.lib ..\..\tcltk\lib\tcl84.lib odbccp32.lib" OutputFile="./_tkinter_d.pyd" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="C:\Program Files\Tcl\lib" + AdditionalLibraryDirectories="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\./_tkinter_d.pdb" SubSystem="2" @@ -157,7 +157,7 @@ AdditionalOptions=" /USECL:MS_ITANIUM" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\..\tcl84\include,..\Include,..\PC" + AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\..\tcltk\include,..\Include,..\PC" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WITH_APPINIT" StringPooling="TRUE" BasicRuntimeChecks="0" @@ -179,11 +179,11 @@ <Tool Name="VCLinkerTool" AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" - AdditionalDependencies="..\..\tcl84\lib\tk84.lib ..\..\tcl84\lib\tcl84.lib odbccp32.lib" + AdditionalDependencies="..\..\tcltk\lib\tk84.lib ..\..\tcltk\lib\tcl84.lib odbccp32.lib" OutputFile="./_tkinter.pyd" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="C:\Program Files\Tcl\lib" + AdditionalLibraryDirectories="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\./_tkinter.pdb" SubSystem="2" Index: readme.txt =================================================================== RCS file: /cvsroot/python/python/dist/src/PCbuild/readme.txt,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- readme.txt 20 Jul 2004 14:37:48 -0000 1.55 +++ readme.txt 30 Aug 2004 09:22:04 -0000 1.56 @@ -63,7 +63,7 @@ _tkinter Python wrapper for the Tk windowing system. Requires building - Tcl/Tk first. Following are instructions for Tcl/Tk 8.4.5; these + Tcl/Tk first. Following are instructions for Tcl/Tk 8.4.7; these should work for version 8.4.6 too, with suitable substitutions: Get source @@ -71,11 +71,11 @@ Go to http://prdownloads.sourceforge.net/tcl/ and download - tcl845-src.zip - tk845-src.zip + tcl847-src.zip + tk847-src.zip Unzip into - dist\tcl8.4.5\ - dist\tk8.4.5\ + dist\tcl8.4.7\ + dist\tk8.4.7\ respectively. Build Tcl first (done here w/ MSVC 7.1 on Windows XP) @@ -83,25 +83,25 @@ Use "Start -> All Programs -> Microsoft Visual Studio .NET 2003 -> Visual Studio .NET Tools -> Visual Studio .NET 2003 Command Prompt" to get a shell window with the correct environment settings - cd dist\tcl8.4.5\win + cd dist\tcl8.4.7\win nmake -f makefile.vc - nmake -f makefile.vc INSTALLDIR=..\..\tcl84 install + nmake -f makefile.vc INSTALLDIR=..\..\tcltk install XXX Should we compile with OPTS=threads? Optional: run tests, via nmake -f makefile.vc test - On WinXP Pro, wholly up to date as of 11-Apr-2004: - all.tcl: Total 10564 Passed 9855 Skipped 708 Failed 1 + On WinXP Pro, wholly up to date as of 30-Aug-2004: + all.tcl: Total 10572 Passed 9869 Skipped 703 Failed 0 Sourced 129 Test Files. - Files with failing tests: httpold.test + Files with failing tests: ioCmd.test Build Tk -------- - cd dist\tk8.4.5\win - nmake -f makefile.vc TCLDIR=..\..\tcl8.4.5 - nmake -f makefile.vc TCLDIR=..\..\tcl8.4.5 INSTALLDIR=..\..\tcl84 install + cd dist\tk8.4.7\win + nmake -f makefile.vc TCLDIR=..\..\tcl8.4.7 + nmake -f makefile.vc TCLDIR=..\..\tcl8.4.7 INSTALLDIR=..\..\tcltk install XXX Should we compile with OPTS=threads? @@ -109,21 +109,13 @@ XXX directory. Is all of that really needed for Python use of Tcl/Tk? Optional: run tests, via - nmake -f makefile.vc TCLDIR=..\..\tcl8.4.5 test - - On WinXP Pro, wholly up to date as of 11-Apr-2004: - all.tcl: Total 8327 Passed 6717 Skipped 1579 Failed 31 - Sourced 182 Test Files. - Files with failing tests: canvImg.test scale.test scrollbar.test textWind.test winWm.test - - - Make sure the installer matches - ------------------------------- - Ensure that the Wise compiler vrbl _TCLDIR_ is set to the name of - the common Tcl/Tk installation directory (tcl84 for the instructions - above). This is needed so the installer can copy various Tcl/Tk - files into the Python distribution. + nmake -f makefile.vc TCLDIR=..\..\tcl8.4.7 test + On WinXP Pro, wholly up to date as of 30-Aug-2004: + all.tcl: Total 8421 Passed 6826 Skipped 1581 Failed 14 + Sourced 91 Test Files. + Files with failing tests: frame.test scrollbar.test textWind.test winDialog.test + winWm.test winfo.test zlib Python wrapper for the zlib compression library. Get the source code

1 0