Mailman 3 November 2010 - Python-checkins

r86803 - python/branches/py3k-stat-on-windows
by hirokazu.yamamoto Nov. 26, 2010

Nov. 26, 2010

Author: hirokazu.yamamoto Date: Fri Nov 26 13:53:47 2010 New Revision: 86803 Log: Recreate branch Added: python/branches/py3k-stat-on-windows/ - copied from r86802, /python/branches/py3k-stat-on-windows-v2/

1 0

r86802 - python/branches/py3k-stat-on-windows
by hirokazu.yamamoto Nov. 26, 2010

Nov. 26, 2010

Author: hirokazu.yamamoto Date: Fri Nov 26 13:53:06 2010 New Revision: 86802 Log: Remove branch Removed: python/branches/py3k-stat-on-windows/

1 0

r86801 - python/branches/py3k/Doc/tutorial/stdlib.rst
by georg.brandl Nov. 26, 2010

Nov. 26, 2010

Author: georg.brandl Date: Fri Nov 26 13:12:14 2010 New Revision: 86801 Log: Better example for os.system(): do not change the system time. Modified: python/branches/py3k/Doc/tutorial/stdlib.rst Modified: python/branches/py3k/Doc/tutorial/stdlib.rst ============================================================================== --- python/branches/py3k/Doc/tutorial/stdlib.rst (original) +++ python/branches/py3k/Doc/tutorial/stdlib.rst Fri Nov 26 13:12:14 2010 @@ -14,11 +14,11 @@ operating system:: >>> import os - >>> os.system('time 0:02') - 0 >>> os.getcwd() # Return the current working directory 'C:\\Python31' - >>> os.chdir('/server/accesslogs') + >>> os.chdir('/server/accesslogs') # Change current working directory + >>> os.system('mkdir today') # Run the command mkdir in the system shell + 0 Be sure to use the ``import os`` style instead of ``from os import *``. This will keep :func:`os.open` from shadowing the built-in :func:`open` function which

1 0

r86800 - python/branches/py3k/Doc/whatsnew/3.2.rst
by georg.brandl Nov. 26, 2010

Nov. 26, 2010

Author: georg.brandl Date: Fri Nov 26 13:10:06 2010 New Revision: 86800 Log: Typo fix. Modified: python/branches/py3k/Doc/whatsnew/3.2.rst Modified: python/branches/py3k/Doc/whatsnew/3.2.rst ============================================================================== --- python/branches/py3k/Doc/whatsnew/3.2.rst (original) +++ python/branches/py3k/Doc/whatsnew/3.2.rst Fri Nov 26 13:10:06 2010 @@ -657,7 +657,7 @@ :data:`os.environ`, :func:`os.getenvb` function and :data:`os.supports_bytes_environ` constant. -``'mbcs'`` encoding doesn't ignore the error handler argument anymore. By +``'mbcs'`` encoding doesn't ignore the error handler argument any more. By default (strict mode), it raises an UnicodeDecodeError on undecodable byte sequence and UnicodeEncodeError on unencodable character. To get the ``'mbcs'`` encoding of Python 3.1, use ``'ignore'`` error handler to decode and @@ -721,7 +721,7 @@ * The :mod:`nntplib` module was reworked extensively, meaning that its APIs are often incompatible with the 3.1 APIs. -* :class:`bytearray` objects cannot be used anymore as filenames: convert them +* :class:`bytearray` objects cannot be used any more as filenames: convert them to :class:`bytes`. * PyArg_Parse*() functions:

1 0

r86799 - python/branches/py3k/Doc/library/builtins.rst
by georg.brandl Nov. 26, 2010

Nov. 26, 2010

Author: georg.brandl Date: Fri Nov 26 13:08:19 2010 New Revision: 86799 Log: Remove parenthetical remark that is confusing now that the module is not named "__builtin__" anymore. Modified: python/branches/py3k/Doc/library/builtins.rst Modified: python/branches/py3k/Doc/library/builtins.rst ============================================================================== --- python/branches/py3k/Doc/library/builtins.rst (original) +++ python/branches/py3k/Doc/library/builtins.rst Fri Nov 26 13:08:19 2010 @@ -32,9 +32,8 @@ # ... -As an implementation detail, most modules have the name ``__builtins__`` (note -the ``'s'``) made available as part of their globals. The value of -``__builtins__`` is normally either this module or the value of this modules's -:attr:`__dict__` attribute. Since this is an implementation detail, it may not -be used by alternate implementations of Python. - +As an implementation detail, most modules have the name ``__builtins__`` made +available as part of their globals. The value of ``__builtins__`` is normally +either this module or the value of this modules's :attr:`__dict__` attribute. +Since this is an implementation detail, it may not be used by alternate +implementations of Python.

1 0

r86798 - python/branches/py3k/Doc/library/bdb.rst
by georg.brandl Nov. 26, 2010

Nov. 26, 2010

Author: georg.brandl Date: Fri Nov 26 13:05:48 2010 New Revision: 86798 Log: #10420: fix docs of bdb.effective(). Modified: python/branches/py3k/Doc/library/bdb.rst Modified: python/branches/py3k/Doc/library/bdb.rst ============================================================================== --- python/branches/py3k/Doc/library/bdb.rst (original) +++ python/branches/py3k/Doc/library/bdb.rst Fri Nov 26 13:05:48 2010 @@ -359,12 +359,10 @@ .. function:: effective(file, line, frame) Determine if there is an effective (active) breakpoint at this line of code. - Return breakpoint number or 0 if none. - - Called only if we know there is a breakpoint at this location. Returns the - breakpoint that was triggered and a flag that indicates if it is ok to delete - a temporary breakpoint. + Return a tuple of the breakpoint and a boolean that indicates if it is ok + to delete a temporary breakpoint. Return ``(None, None)`` if there is no + matching breakpoint. .. function:: set_trace() - Starts debugging with a :class:`Bdb` instance from caller's frame. + Start debugging with a :class:`Bdb` instance from caller's frame.

1 0

r86797 - python/branches/py3k/Lib/bdb.py
by georg.brandl Nov. 26, 2010

Nov. 26, 2010

Author: georg.brandl Date: Fri Nov 26 13:05:27 2010 New Revision: 86797 Log: Modernize code in effective(). Modified: python/branches/py3k/Lib/bdb.py Modified: python/branches/py3k/Lib/bdb.py ============================================================================== --- python/branches/py3k/Lib/bdb.py (original) +++ python/branches/py3k/Lib/bdb.py Fri Nov 26 13:05:27 2010 @@ -565,47 +565,41 @@ that indicates if it is ok to delete a temporary bp. """ - possibles = Breakpoint.bplist[file,line] - for i in range(0, len(possibles)): - b = possibles[i] - if b.enabled == 0: + possibles = Breakpoint.bplist[file, line] + for b in possibles: + if not b.enabled: continue if not checkfuncname(b, frame): continue # Count every hit when bp is enabled - b.hits = b.hits + 1 + b.hits += 1 if not b.cond: - # If unconditional, and ignoring, - # go on to next, else break + # If unconditional, and ignoring go on to next, else break if b.ignore > 0: - b.ignore = b.ignore -1 + b.ignore -= 1 continue else: - # breakpoint and marker that's ok - # to delete if temporary - return (b,1) + # breakpoint and marker that it's ok to delete if temporary + return (b, True) else: # Conditional bp. # Ignore count applies only to those bpt hits where the # condition evaluates to true. try: - val = eval(b.cond, frame.f_globals, - frame.f_locals) + val = eval(b.cond, frame.f_globals, frame.f_locals) if val: if b.ignore > 0: - b.ignore = b.ignore -1 + b.ignore -= 1 # continue else: - return (b,1) + return (b, True) # else: # continue except: - # if eval fails, most conservative - # thing is to stop on breakpoint - # regardless of ignore count. - # Don't delete temporary, - # as another hint to user. - return (b,0) + # if eval fails, most conservative thing is to stop on + # breakpoint regardless of ignore count. Don't delete + # temporary, as another hint to user. + return (b, False) return (None, None) # -------------------- testing --------------------

1 0

r86796 - in python/branches/release31-maint: Misc/NEWS setup.py
by matthias.klose Nov. 26, 2010

Nov. 26, 2010

Author: matthias.klose Date: Fri Nov 26 12:56:26 2010 New Revision: 86796 Log: Merged revisions 85645 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85645 | matthias.klose | 2010-10-17 15:22:33 +0200 (Sun, 17 Oct 2010) | 2 lines - Accept Oracle Berkeley DB 5.0 and 5.1 as backend for the dbm extension. ........ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Misc/NEWS python/branches/release31-maint/setup.py Modified: python/branches/release31-maint/Misc/NEWS ============================================================================== --- python/branches/release31-maint/Misc/NEWS (original) +++ python/branches/release31-maint/Misc/NEWS Fri Nov 26 12:56:26 2010 @@ -54,6 +54,8 @@ - Stop packaging versioncheck tool (already done for rc1). +- Accept Oracle Berkeley DB 4.8, 5.0 and 5.1 as backend for the dbm extension. + Tests ----- Modified: python/branches/release31-maint/setup.py ============================================================================== --- python/branches/release31-maint/setup.py (original) +++ python/branches/release31-maint/setup.py Fri Nov 26 12:56:26 2010 @@ -729,7 +729,7 @@ # a release. Most open source OSes come with one or more # versions of BerkeleyDB already installed. - max_db_ver = (4, 7) + max_db_ver = (5, 1) min_db_ver = (3, 3) db_setup_debug = False # verbose debug prints from this script?

1 0

r86795 - in python/branches/py3k/Doc/extending: embedding.rst extending.rst
by georg.brandl Nov. 26, 2010

Nov. 26, 2010

Author: georg.brandl Date: Fri Nov 26 12:55:48 2010 New Revision: 86795 Log: Use PyLong_FromLong where appropriate. Modified: python/branches/py3k/Doc/extending/embedding.rst python/branches/py3k/Doc/extending/extending.rst Modified: python/branches/py3k/Doc/extending/embedding.rst ============================================================================== --- python/branches/py3k/Doc/extending/embedding.rst (original) +++ python/branches/py3k/Doc/extending/embedding.rst Fri Nov 26 12:55:48 2010 @@ -209,7 +209,7 @@ { if(!PyArg_ParseTuple(args, ":numargs")) return NULL; - return Py_BuildValue("i", numargs); + return PyLong_FromLong(numargs); } static PyMethodDef EmbMethods[] = { Modified: python/branches/py3k/Doc/extending/extending.rst ============================================================================== --- python/branches/py3k/Doc/extending/extending.rst (original) +++ python/branches/py3k/Doc/extending/extending.rst Fri Nov 26 12:55:48 2010 @@ -81,7 +81,7 @@ if (!PyArg_ParseTuple(args, "s", &command)) return NULL; sts = system(command); - return Py_BuildValue("i", sts); + return PyLong_FromLong(sts); } There is a straightforward translation from the argument list in Python (for @@ -274,12 +274,9 @@ sts = system(command); Our :func:`spam.system` function must return the value of :c:data:`sts` as a -Python object. This is done using the function :c:func:`Py_BuildValue`, which is -something like the inverse of :c:func:`PyArg_ParseTuple`: it takes a format -string and an arbitrary number of C values, and returns a new Python object. -More info on :c:func:`Py_BuildValue` is given later. :: +Python object. This is done using the function :c:func:`PyLong_FromLong`. :: - return Py_BuildValue("i", sts); + return PyLong_FromLong(sts); In this case, it will return an integer object. (Yes, even integers are objects on the heap in Python!) @@ -1195,7 +1192,7 @@ if (!PyArg_ParseTuple(args, "s", &command)) return NULL; sts = PySpam_System(command); - return Py_BuildValue("i", sts); + return PyLong_FromLong(sts); } In the beginning of the module, right after the line ::

1 0

r86794 - python/branches/py3k/Doc/whatsnew/2.7.rst
by georg.brandl Nov. 26, 2010

Nov. 26, 2010

Author: georg.brandl Date: Fri Nov 26 12:50:13 2010 New Revision: 86794 Log: #10526: fix typo. Modified: python/branches/py3k/Doc/whatsnew/2.7.rst Modified: python/branches/py3k/Doc/whatsnew/2.7.rst ============================================================================== --- python/branches/py3k/Doc/whatsnew/2.7.rst (original) +++ python/branches/py3k/Doc/whatsnew/2.7.rst Fri Nov 26 12:50:13 2010 @@ -246,7 +246,7 @@ modules. * The :mod:`ConfigParser` module uses them by default, meaning that - configuration files can now read, modified, and then written back + configuration files can now be read, modified, and then written back in their original order. * The :meth:`~collections.somenamedtuple._asdict()` method for

1 0