Mailman 3 January 2005 - Python-checkins

python/dist/src/Objects stringobject.c, 2.226, 2.227
by mwh＠users.sourceforge.net 31 Jan '05

31 Jan '05

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24013/Objects Modified Files: stringobject.c Log Message: More bug #1077106 stuff, sorry -- modem induced impatiece! This should go on whatever bugfix branches the other fetches up on. Index: stringobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v retrieving revision 2.226 retrieving revision 2.227 diff -u -d -r2.226 -r2.227 --- stringobject.c 26 Oct 2004 01:52:37 -0000 2.226 +++ stringobject.c 31 Jan 2005 17:09:25 -0000 2.227 @@ -52,6 +52,7 @@ PyString_FromStringAndSize(const char *str, int size) { register PyStringObject *op; + assert(size >= 0); if (size == 0 && (op = nullstring) != NULL) { #ifdef COUNT_ALLOCS null_strings++;

1 0

python/dist/src/Misc NEWS,1.1235,1.1236
by mwh＠users.sourceforge.net 31 Jan '05

31 Jan '05

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24013/Misc Modified Files: NEWS Log Message: More bug #1077106 stuff, sorry -- modem induced impatiece! This should go on whatever bugfix branches the other fetches up on. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1235 retrieving revision 1.1236 diff -u -d -r1.1235 -r1.1236 --- NEWS 29 Jan 2005 13:29:23 -0000 1.1235 +++ NEWS 31 Jan 2005 17:09:20 -0000 1.1236 @@ -21,6 +21,8 @@ - set and frozenset objects can now be marshalled. SF #1098985. +- Bug #1077106: Poor argument checking could cause memory corruption + in calls to os.read(). Extension Modules -----------------

1 0

python/dist/src/Modules posixmodule.c, 2.332, 2.333
by mwh＠users.sourceforge.net 31 Jan '05

31 Jan '05

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21253 Modified Files: posixmodule.c Log Message: Fix [ 1077106 ] Negative numbers to os.read() cause segfault Sorry for sitting on this for so long! Is there a chance it could make 2.3.5? Index: posixmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v retrieving revision 2.332 retrieving revision 2.333 diff -u -d -r2.332 -r2.333 --- posixmodule.c 16 Jan 2005 08:57:38 -0000 2.332 +++ posixmodule.c 31 Jan 2005 17:01:59 -0000 2.333 @@ -5349,6 +5349,10 @@ PyObject *buffer; if (!PyArg_ParseTuple(args, "ii:read", &fd, &size)) return NULL; + if (size < 0) { + errno = EINVAL; + return posix_error(); + } buffer = PyString_FromStringAndSize((char *)NULL, size); if (buffer == NULL) return NULL;

1 0

[Python-checkins] python/dist/src/Lib/idlelib EditorWindow.py, 1.66, 1.67 NEWS.txt, 1.54, 1.55 configDialog.py, 1.60, 1.61
by kbk＠users.sourceforge.net 31 Jan '05

31 Jan '05

Update of /cvsroot/python/python/dist/src/Lib/idlelib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12586 Modified Files: EditorWindow.py NEWS.txt configDialog.py Log Message: Removed ability to configure tabs indent from Options dialog. This 'feature' has never worked and no one has complained. It is still possible to set a default tabs (v. spaces) indent 'manually' via config-main.def (or to turn on tabs for the current EditorWindow via the Format menu) but IDLE will encourage indentation via spaces. Enable setting the indentation width using the Options dialog. Bug # 783877 Remove some commented out old code from configDialog.py (related to old methods for invoking the HelpBrowser). M EditorWindow.py M NEWS.txt M configHandler.py Index: EditorWindow.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/EditorWindow.py,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- EditorWindow.py 28 Jan 2005 00:16:15 -0000 1.66 +++ EditorWindow.py 31 Jan 2005 03:34:26 -0000 1.67 @@ -157,12 +157,12 @@ vbar['command'] = text.yview vbar.pack(side=RIGHT, fill=Y) text['yscrollcommand'] = vbar.set - fontWeight='normal' - if idleConf.GetOption('main','EditorWindow','font-bold',type='bool'): + fontWeight = 'normal' + if idleConf.GetOption('main', 'EditorWindow', 'font-bold', type='bool'): fontWeight='bold' - text.config(font=(idleConf.GetOption('main','EditorWindow','font'), - idleConf.GetOption('main','EditorWindow','font-size'), - fontWeight)) + text.config(font=(idleConf.GetOption('main', 'EditorWindow', 'font'), + idleConf.GetOption('main', 'EditorWindow', 'font-size'), + fontWeight)) text_frame.pack(side=LEFT, fill=BOTH, expand=1) text.pack(side=TOP, fill=BOTH, expand=1) text.focus_set() @@ -173,19 +173,23 @@ # which will cause Tabnanny to nag! # false -> tab characters are converted to spaces by indent # and dedent cmds, and ditto TAB keystrokes - self.usetabs = False - - # indentwidth is the number of characters per logical indent level. - # Recommended Python default indent is four spaces. - self.indentwidth = 4 + # Although use-spaces=0 can be configured manually in config-main.def, + # configuration of tabs v. spaces is not supported in the configuration + # dialog. IDLE promotes the preferred Python indentation: use spaces! + usespaces = idleConf.GetOption('main', 'Indent', 'use-spaces', type='bool') + self.usetabs = not usespaces # tabwidth is the display width of a literal tab character. # CAUTION: telling Tk to use anything other than its default # tab setting causes it to use an entirely different tabbing algorithm, # treating tab stops as fixed distances from the left margin. # Nobody expects this, so for now tabwidth should never be changed. - self.tabwidth = 8 # for IDLE use, must remain 8 until Tk is fixed. - # indentwidth should be 8 when usetabs is True. + self.tabwidth = 8 # must remain 8 until Tk is fixed. + + # indentwidth is the number of screen characters per indent level. + # The recommended Python indentation is four spaces. + self.indentwidth = self.tabwidth + self.set_notabs_indentwidth() # If context_use_ps1 is true, parsing searches back for a ps1 line; # else searches for a popular (if, def, ...) Python stmt. @@ -583,6 +587,13 @@ accel=get_accelerator(keydefs, event) menu.entryconfig(index,accelerator=accel) + def set_notabs_indentwidth(self): + "Update the indentwidth if changed and not using tabs in this window" + # Called from configDialog.py + if not self.usetabs: + self.indentwidth = idleConf.GetOption('main', 'Indent','num-spaces', + type='int') + def reset_help_menu_entries(self): "Update the additional help entries on the Help menu" help_list = idleConf.GetAllExtraHelpSourcesList() Index: NEWS.txt =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/NEWS.txt,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- NEWS.txt 28 Jan 2005 00:16:16 -0000 1.54 +++ NEWS.txt 31 Jan 2005 03:34:26 -0000 1.55 @@ -3,6 +3,15 @@ *Release date: XX-XXX-2005* +- Removed ability to configure tabs indent from Options dialog. This 'feature' + has never worked and no one has complained. It is still possible to set a + default tabs (v. spaces) indent 'manually' via config-main.def (or to turn on + tabs for the current EditorWindow via the Format menu) but IDLE will + encourage indentation via spaces. + +- Enable setting the indentation width using the Options dialog. + Bug # 783877 + - Add keybindings for del-word-left and del-word-right. - Discourage using an indent width other than 8 when using tabs to indent Index: configDialog.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/configDialog.py,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- configDialog.py 16 Nov 2004 21:28:36 -0000 1.60 +++ configDialog.py 31 Jan 2005 03:34:26 -0000 1.61 @@ -6,7 +6,7 @@ and default window size. Define additional help sources. Note that tab width in IDLE is currently fixed at eight due to Tk issues. -Refer to comment in EditorWindow autoindent code for details. +Refer to comments in EditorWindow autoindent code for details. """ from Tkinter import * @@ -21,9 +21,7 @@ from configHelpSourceEdit import GetHelpSourceDialog class ConfigDialog(Toplevel): - """ - configuration dialog for idle - """ + def __init__(self,parent,title): Toplevel.__init__(self, parent) self.configure(borderwidth=5) @@ -93,8 +91,6 @@ self.fontBold=BooleanVar(self) self.fontName=StringVar(self) self.spaceNum=IntVar(self) - #self.tabCols=IntVar(self) - self.indentBySpaces=BooleanVar(self) self.editFont=tkFont.Font(self,('courier',10,'normal')) ##widget creation #body frame @@ -124,25 +120,12 @@ text='AaBbCcDdEe\nFfGgHhIiJjK\n1234567890\n#:+=(){}[]', justify=LEFT,font=self.editFont) #frameIndent - labelIndentTitle=Label(frameIndent,text='Set Indentation Defaults') - frameIndentType=Frame(frameIndent) frameIndentSize=Frame(frameIndent) - labelIndentTypeTitle=Label(frameIndentType, - text='Choose indentation type :') - radioUseSpaces=Radiobutton(frameIndentType,variable=self.indentBySpaces, - value=1,text='Tab key inserts spaces') - radioUseTabs=Radiobutton(frameIndentType,variable=self.indentBySpaces, - value=0,text='Tab key inserts tabs') - labelIndentSizeTitle=Label(frameIndentSize, - text='Choose indentation size :') - labelSpaceNumTitle=Label(frameIndentSize,justify=LEFT, - text='indent width') - self.scaleSpaceNum=Scale(frameIndentSize,variable=self.spaceNum, - orient='horizontal',tickinterval=2,from_=2,to=16) - #labeltabColsTitle=Label(frameIndentSize,justify=LEFT, - # text='when tab key inserts tabs,\ncolumns per tab') - #self.scaleTabCols=Scale(frameIndentSize,variable=self.tabCols, - # orient='horizontal',tickinterval=2,from_=2,to=8) + labelSpaceNumTitle=Label(frameIndentSize, justify=LEFT, + text='Python Standard: 4 Spaces!') + self.scaleSpaceNum=Scale(frameIndentSize, variable=self.spaceNum, + label='Indentation Width', orient='horizontal', + tickinterval=2, from_=2, to=16) #widget packing #body frameFont.pack(side=LEFT,padx=5,pady=10,expand=TRUE,fill=BOTH) @@ -160,17 +143,9 @@ frameFontSample.pack(side=TOP,padx=5,pady=5,expand=TRUE,fill=BOTH) self.labelFontSample.pack(expand=TRUE,fill=BOTH) #frameIndent - labelIndentTitle.pack(side=TOP,anchor=W,padx=5,pady=5) - frameIndentType.pack(side=TOP,padx=5,fill=X) frameIndentSize.pack(side=TOP,padx=5,pady=5,fill=BOTH) - labelIndentTypeTitle.pack(side=TOP,anchor=W,padx=5,pady=5) - radioUseSpaces.pack(side=TOP,anchor=W,padx=5) - radioUseTabs.pack(side=TOP,anchor=W,padx=5) - labelIndentSizeTitle.pack(side=TOP,anchor=W,padx=5,pady=5) labelSpaceNumTitle.pack(side=TOP,anchor=W,padx=5) self.scaleSpaceNum.pack(side=TOP,padx=5,fill=X) - #labeltabColsTitle.pack(side=TOP,anchor=W,padx=5) - #self.scaleTabCols.pack(side=TOP,padx=5,fill=X) return frame def CreatePageHighlight(self): @@ -390,7 +365,6 @@ radioEncNone=Radiobutton(frameEncoding,variable=self.encoding, value="none",text="None") #frameHelp - ##labelHelpTitle=Label(frameHelp,text='Help Options') frameHelpList=Frame(frameHelp) frameHelpListButtons=Frame(frameHelpList) labelHelpListTitle=Label(frameHelpList,text='Additional Help Sources:') @@ -406,13 +380,6 @@ width=8,command=self.HelpListItemAdd) self.buttonHelpListRemove=Button(frameHelpListButtons,text='Remove', state=DISABLED,width=8,command=self.HelpListItemRemove) - # the following is better handled by the BROWSER environment - # variable under unix/linux - #checkHelpBrowser=Checkbutton(frameHelp,variable=self.userHelpBrowser, - # onvalue=1,offvalue=0,text='user specified (html) help browser:', - # command=self.OnCheckUserHelpBrowser) - #self.entryHelpBrowser=Entry(frameHelp,textvariable=self.helpBrowser, - # width=40) #widget packing #body frameRun.pack(side=TOP,padx=5,pady=5,fill=X) @@ -446,7 +413,6 @@ radioEncUTF8.pack(side=RIGHT,anchor=E,pady=5) radioEncLocale.pack(side=RIGHT,anchor=E,pady=5) #frameHelp - ##labelHelpTitle.pack(side=TOP,anchor=W,padx=5,pady=5) frameHelpListButtons.pack(side=RIGHT,padx=5,pady=5,fill=Y) frameHelpList.pack(side=TOP,padx=5,pady=5,expand=TRUE,fill=BOTH) labelHelpListTitle.pack(side=TOP,anchor=W) @@ -455,8 +421,6 @@ self.buttonHelpListEdit.pack(side=TOP,anchor=W,pady=5) self.buttonHelpListAdd.pack(side=TOP,anchor=W) self.buttonHelpListRemove.pack(side=TOP,anchor=W,pady=5) - #checkHelpBrowser.pack(side=TOP,anchor=W,padx=5) - #self.entryHelpBrowser.pack(side=TOP,anchor=W,padx=5,pady=5) return frame def AttachVarCallbacks(self): @@ -464,8 +428,6 @@ self.fontName.trace_variable('w',self.VarChanged_fontName) self.fontBold.trace_variable('w',self.VarChanged_fontBold) self.spaceNum.trace_variable('w',self.VarChanged_spaceNum) - #self.tabCols.trace_variable('w',self.VarChanged_tabCols) - self.indentBySpaces.trace_variable('w',self.VarChanged_indentBySpaces) self.colour.trace_variable('w',self.VarChanged_colour) self.builtinTheme.trace_variable('w',self.VarChanged_builtinTheme) self.customTheme.trace_variable('w',self.VarChanged_customTheme) @@ -494,18 +456,10 @@ value=self.fontBold.get() self.AddChangedItem('main','EditorWindow','font-bold',value) - def VarChanged_indentBySpaces(self,*params): - value=self.indentBySpaces.get() - self.AddChangedItem('main','Indent','use-spaces',value) - def VarChanged_spaceNum(self,*params): value=self.spaceNum.get() self.AddChangedItem('main','Indent','num-spaces',value) - #def VarChanged_tabCols(self,*params): - # value=self.tabCols.get() - # self.AddChangedItem('main','Indent','tab-cols',value) - def VarChanged_colour(self,*params): self.OnNewColourSet() @@ -912,12 +866,6 @@ self.textHighlightSample.tag_config(element, **colours) self.SetColourSample() -## def OnCheckUserHelpBrowser(self): -## if self.userHelpBrowser.get(): -## self.entryHelpBrowser.config(state=NORMAL) -## else: -## self.entryHelpBrowser.config(state=DISABLED) - def HelpSourceSelected(self,event): self.SetHelpListButtonStates() @@ -996,17 +944,10 @@ self.SetFontSample() def LoadTabCfg(self): - ##indent type radiobuttons - spaceIndent=idleConf.GetOption('main','Indent','use-spaces', - default=1,type='bool') - self.indentBySpaces.set(spaceIndent) ##indent sizes spaceNum=idleConf.GetOption('main','Indent','num-spaces', default=4,type='int') - #tabCols=idleConf.GetOption('main','Indent','tab-cols', - # default=4,type='int') self.spaceNum.set(spaceNum) - #self.tabCols.set(tabCols) def LoadThemeCfg(self): ##current theme type radiobutton @@ -1096,11 +1037,6 @@ for helpItem in self.userHelpList: self.listHelp.insert(END,helpItem[0]) self.SetHelpListButtonStates() - #self.userHelpBrowser.set(idleConf.GetOption('main','General', - # 'user-help-browser',default=0,type='bool')) - #self.helpBrowser.set(idleConf.GetOption('main','General', - # 'user-help-browser-command',default='')) - #self.OnCheckUserHelpBrowser() def LoadConfigs(self): """ @@ -1171,17 +1107,12 @@ self.ResetChangedItems() #clear the changed items dict def ActivateConfigChanges(self): - #things that need to be done to make - #applied config changes dynamic: - #update editor/shell font and repaint - #dynamically update indentation setttings - #update theme and repaint - #update keybindings and re-bind - #update user help sources menu + "Dynamically apply configuration changes" winInstances=self.parent.instance_dict.keys() for instance in winInstances: instance.ResetColorizer() instance.ResetFont() + instance.set_notabs_indentwidth() instance.ResetKeybindings() instance.reset_help_menu_entries()

1 0

python/nondist/peps pep-0000.txt, 1.298, 1.299 pep-0252.txt, 1.19, 1.20 pep-0253.txt, 1.18, 1.19
by bwarsaw＠users.sourceforge.net 30 Jan '05

30 Jan '05

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19458 Modified Files: pep-0000.txt pep-0252.txt pep-0253.txt Log Message: Marking PEPs 252 and 253 as final, with GvR's approval. Includes an editor's note about the accuracy of the description in the PEP. Index: pep-0000.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0000.txt,v retrieving revision 1.298 retrieving revision 1.299 diff -u -d -r1.298 -r1.299 --- pep-0000.txt 29 Jan 2005 18:24:59 -0000 1.298 +++ pep-0000.txt 30 Jan 2005 03:08:02 -0000 1.299 @@ -62,8 +62,6 @@ Accepted PEPs (accepted; may not be implemented yet) - S 252 Making Types Look More Like Classes GvR - S 253 Subtyping Built-in Types GvR SA 309 Partial Function Application Harris SA 328 Imports: Multi-Line and Absolute/Relative Aahz @@ -150,6 +148,8 @@ SF 241 Metadata for Python Software Packages Kuchling SF 250 Using site-packages on Windows Moore IF 251 Python 2.2 Release Schedule Warsaw, GvR + SF 252 Making Types Look More Like Classes GvR + SF 253 Subtyping Built-in Types GvR SF 255 Simple Generators Schemenauer, et al SF 260 Simplify xrange() GvR SF 261 Support for "wide" Unicode characters Prescod @@ -286,8 +286,8 @@ IF 249 Python Database API Specification v2.0 Lemburg SF 250 Using site-packages on Windows Moore IF 251 Python 2.2 Release Schedule Warsaw, GvR - S 252 Making Types Look More Like Classes GvR - S 253 Subtyping Built-in Types GvR + SF 252 Making Types Look More Like Classes GvR + SF 253 Subtyping Built-in Types GvR S 254 Making Classes Look More Like Types GvR SF 255 Simple Generators Schemenauer, et al S 256 Docstring Processing System Framework Goodger Index: pep-0252.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0252.txt,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- pep-0252.txt 4 Oct 2001 04:58:56 -0000 1.19 +++ pep-0252.txt 30 Jan 2005 03:08:02 -0000 1.20 @@ -2,7 +2,7 @@ Title: Making Types Look More Like Classes Version: $Revision$ Author: guido(a)python.org (Guido van Rossum) -Status: Draft +Status: Final Type: Standards Track Python-Version: 2.2 Created: 19-Apr-2001 @@ -27,6 +27,9 @@ Based on the generalized descriptor API, this PEP also introduces a way to declare class methods and static methods. + [Editor's note: the ideas described in this PEP have been incorporated + into Python. The PEP no longer accurately describes the implementation.] + Introduction Index: pep-0253.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0253.txt,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- pep-0253.txt 19 Oct 2001 18:17:00 -0000 1.18 +++ pep-0253.txt 30 Jan 2005 03:08:02 -0000 1.19 @@ -2,7 +2,7 @@ Title: Subtyping Built-in Types Version: $Revision$ Author: guido(a)python.org (Guido van Rossum) -Status: Draft +Status: Final Type: Standards Track Python-Version: 2.2 Created: 14-May-2001 @@ -13,6 +13,9 @@ This PEP proposes additions to the type object API that will allow the creation of subtypes of built-in types, in C and in Python. + [Editor's note: the ideas described in this PEP have been incorporated + into Python. The PEP no longer accurately describes the implementation.] + Introduction

1 0

python/dist/src/Doc/lib tkinter.tex, 1.27.2.3, 1.27.2.4
by jlgijsbers＠users.sourceforge.net 29 Jan '05

29 Jan '05

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27820 Modified Files: Tag: release24-maint tkinter.tex Log Message: Backport for bug #1108490: fix broken link. Index: tkinter.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/tkinter.tex,v retrieving revision 1.27.2.3 retrieving revision 1.27.2.4 diff -u -d -r1.27.2.3 -r1.27.2.4 --- tkinter.tex 19 Jan 2005 03:42:09 -0000 1.27.2.3 +++ tkinter.tex 29 Jan 2005 19:54:45 -0000 1.27.2.4 @@ -1353,7 +1353,7 @@ \item \ulink{Compound} -{http://tix.sourceforge.net/dist/current/man/html/TixCmd/compound.html} +{http://tix.sourceforge.net/dist/current/man/html/TixCmd/compound.htm} image types can be used to create images that consists of multiple horizontal lines; each line is composed of a series of items (texts, bitmaps, images or spaces) arranged from left to right. For example, a

1 0

python/dist/src/Doc/lib tkinter.tex,1.30,1.31
by jlgijsbers＠users.sourceforge.net 29 Jan '05

29 Jan '05

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26648 Modified Files: tkinter.tex Log Message: Bug #1108490: fix broken link. Index: tkinter.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/tkinter.tex,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- tkinter.tex 19 Jan 2005 03:39:16 -0000 1.30 +++ tkinter.tex 29 Jan 2005 19:49:34 -0000 1.31 @@ -1353,7 +1353,7 @@ \item \ulink{Compound} -{http://tix.sourceforge.net/dist/current/man/html/TixCmd/compound.html} +{http://tix.sourceforge.net/dist/current/man/html/TixCmd/compound.htm} image types can be used to create images that consists of multiple horizontal lines; each line is composed of a series of items (texts, bitmaps, images or spaces) arranged from left to right. For example, a

1 0

python/nondist/peps pep-0000.txt, 1.297, 1.298 pep-0215.txt, 1.3, 1.4 pep-0278.txt, 1.9, 1.10 pep-0292.txt, 1.15, 1.16 pep-0318.txt, 1.35, 1.36 pep-0324.txt, 1.7, 1.8
by bwarsaw＠users.sourceforge.net 29 Jan '05

29 Jan '05

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6250 Modified Files: pep-0000.txt pep-0215.txt pep-0278.txt pep-0292.txt pep-0318.txt pep-0324.txt Log Message: Jim Jewett points out that PEPs 278, 292, 318, and 324 can be marked as Final, and that 215 can be marked as Rejected. Index: pep-0000.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0000.txt,v retrieving revision 1.297 retrieving revision 1.298 diff -u -d -r1.297 -r1.298 --- pep-0000.txt 11 Dec 2004 20:24:11 -0000 1.297 +++ pep-0000.txt 29 Jan 2005 18:24:59 -0000 1.298 @@ -65,14 +65,12 @@ S 252 Making Types Look More Like Classes GvR S 253 Subtyping Built-in Types GvR SA 309 Partial Function Application Harris - SA 318 Decorators for Functions and Methods Smith, et al SA 328 Imports: Multi-Line and Absolute/Relative Aahz Open PEPs (under consideration) I 206 2.0 Batteries Included Zadka S 209 Adding Multidimensional Arrays Barrett, Oliphant - S 215 String Interpolation Yee S 228 Reworking Python's Numeric Model Zadka, GvR S 237 Unifying Long Integers and Integers Zadka, GvR S 239 Adding a Rational Type to Python Craig, Zadka @@ -91,14 +89,12 @@ S 274 Dict Comprehensions Warsaw S 275 Switching on Multiple Values Lemburg S 276 Simple Iterator for ints Althoff - S 278 Universal Newline Support Jansen S 280 Optimizing access to globals GvR S 281 Loop Counter Iteration with range and xrange Hetland S 284 Integer for-loops Eppstein, Ewing S 286 Enhanced Argument Tuples von Loewis I 287 reStructuredText Docstring Format Goodger S 288 Generators Attributes and Exceptions Hettinger - S 292 Simpler String Substitutions Warsaw S 294 Type Names in the types Module Tirosh S 297 Support for System Upgrades Lemburg S 298 The Locked Buffer Interface Heller @@ -115,7 +111,6 @@ S 319 Python Synchronize/Asynchronize Block Pelletier S 321 Date/Time Parsing and Formatting Kuchling S 323 Copyable Iterators Martelli - S 324 subprocess - New process module Astrand S 325 Resource-Release Support for Generators Pedroni S 330 Python Bytecode Verification Pelletier S 331 Locale-Independent Float/String conversions Reis @@ -162,17 +157,21 @@ SF 264 Future statements in simulated shells Hudson SF 273 Import Modules from Zip Archives Ahlstrom SF 277 Unicode file name support for Windows NT Hodgson + SF 278 Universal Newline Support Jansen SF 279 The enumerate() built-in function Hettinger SF 282 A Logging System Sajip, Mick IF 283 Python 2.3 Release Schedule GvR SF 285 Adding a bool type GvR SF 289 Generator Expressions Hettinger + SF 292 Simpler String Substitutions Warsaw SF 293 Codec Error Handling Callbacks Dörwald SF 305 CSV File API Montanaro, et al SF 307 Extensions to the pickle protocol GvR, Peters SF 311 Simplified GIL Acquisition for Extensions Hammond + SF 318 Decorators for Functions and Methods Smith, et al IF 320 Python 2.4 Release Schedule Warsaw, et al SF 322 Reverse Iteration Hettinger + SF 324 subprocess - New process module Astrand SF 327 Decimal Data Type Batista Empty PEPs (or containing only an abstract) @@ -186,6 +185,7 @@ SD 211 Adding A New Outer Product Operator Wilson SD 212 Loop Counter Iteration Schneider-Kamp SD 213 Attribute Access Handlers Prescod + SR 215 String Interpolation Yee IR 216 Docstring Format Zadka SD 219 Stackless Python McMillan SD 222 Web Library Enhancements Kuchling @@ -249,7 +249,7 @@ SD 212 Loop Counter Iteration Schneider-Kamp SD 213 Attribute Access Handlers Prescod SF 214 Extended Print Statement Warsaw - SD 215 String Interpolation Yee + SR 215 String Interpolation Yee IR 216 Docstring Format Zadka SF 217 Display Hook for Interactive Use Zadka SF 218 Adding a Built-In Set Object Type Wilson, Hettinger @@ -312,7 +312,7 @@ S 275 Switching on Multiple Values Lemburg S 276 Simple Iterator for ints Althoff SF 277 Unicode file name support for Windows NT Hodgson - S 278 Universal Newline Support Jansen + SF 278 Universal Newline Support Jansen SF 279 The enumerate() built-in function Hettinger S 280 Optimizing access to globals GvR S 281 Loop Counter Iteration with range and xrange Hetland @@ -326,7 +326,7 @@ SF 289 Generator Expressions Hettinger I 290 Code Migration and Modernization Hettinger I 291 Backward Compatibility for Standard Library Norwitz - S 292 Simpler String Substitutions Warsaw + SF 292 Simpler String Substitutions Warsaw SF 293 Codec Error Handling Callbacks Dörwald S 294 Type Names in the types Module Tirosh SR 295 Interpretation of multiline string constants Koltsov @@ -351,13 +351,13 @@ S 315 Enhanced While Loop Carroll SD 316 Programming by Contract for Python Way SR 317 Eliminate Implicit Exception Instantiation Taschuk - SA 318 Decorators for Functions and Methods Smith, et al + SF 318 Decorators for Functions and Methods Smith, et al S 319 Python Synchronize/Asynchronize Block Pelletier IF 320 Python 2.4 Release Schedule Warsaw, et al S 321 Date/Time Parsing and Formatting Kuchling SF 322 Reverse Iteration Hettinger S 323 Copyable Iterators Martelli - S 324 subprocess - New POSIX process module Astrand + SF 324 subprocess - New POSIX process module Astrand S 325 Resource-Release Support for Generators Pedroni SR 326 A Case for Top and Bottom Values Carlson, Reedy SF 327 Decimal Data Type Batista Index: pep-0215.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0215.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- pep-0215.txt 30 Jan 2001 17:09:53 -0000 1.3 +++ pep-0215.txt 29 Jan 2005 18:24:59 -0000 1.4 @@ -2,11 +2,12 @@ Title: String Interpolation Version: $Revision$ Author: ping(a)lfw.org (Ka-Ping Yee) -Status: Draft +Status: Rejected Type: Standards Track Python-Version: 2.1 Created: 24-Jul-2000 Post-History: +Replaced-By: 292 Abstract Index: pep-0278.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0278.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- pep-0278.txt 6 May 2004 04:17:58 -0000 1.9 +++ pep-0278.txt 29 Jan 2005 18:24:59 -0000 1.10 @@ -3,7 +3,7 @@ Version: $Revision$ Last-Modified: $Date$ Author: jack(a)cwi.nl (Jack Jansen) -Status: Draft +Status: Final Type: Standards Track Created: 14-Jan-2002 Python-Version: 2.3 Index: pep-0292.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0292.txt,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- pep-0292.txt 18 Sep 2004 20:53:35 -0000 1.15 +++ pep-0292.txt 29 Jan 2005 18:24:59 -0000 1.16 @@ -3,7 +3,7 @@ Version: $Revision$ Last-Modified: $Date$ Author: barry(a)python.org (Barry A. Warsaw) -Status: Draft +Status: Final Type: Standards Track Created: 18-Jun-2002 Python-Version: 2.4 Index: pep-0318.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0318.txt,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- pep-0318.txt 14 Sep 2004 07:34:23 -0000 1.35 +++ pep-0318.txt 29 Jan 2005 18:24:59 -0000 1.36 @@ -3,7 +3,7 @@ Version: $Revision$ Last-Modified: $Date$ Author: Kevin D. Smith, Jim Jewett, Skip Montanaro, Anthony Baxter -Status: Draft +Status: Final Type: Standards Track Content-Type: text/x-rst Created: 05-Jun-2003 Index: pep-0324.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0324.txt,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- pep-0324.txt 27 Nov 2004 07:44:10 -0000 1.7 +++ pep-0324.txt 29 Jan 2005 18:24:59 -0000 1.8 @@ -3,7 +3,7 @@ Version: $Revision$ Last-Modified: $Date$ Author: Peter Astrand <astrand(a)lysator.liu.se> -Status: Draft +Status: Final Type: Standards Track (library) Created: 19-Nov-2003 Content-Type: text/plain

1 0

python/dist/src/Misc NEWS, 1.1193.2.16, 1.1193.2.17
by loewis＠users.sourceforge.net 29 Jan '05

29 Jan '05

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7293/Misc Modified Files: Tag: release24-maint NEWS Log Message: Revert os.py 1.75, and directly implement update. Fixes #1110478 and #1100235. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1193.2.16 retrieving revision 1.1193.2.17 diff -u -d -r1.1193.2.16 -r1.1193.2.17 --- NEWS 27 Jan 2005 18:58:29 -0000 1.1193.2.16 +++ NEWS 29 Jan 2005 13:33:27 -0000 1.1193.2.17 @@ -25,6 +25,8 @@ Library ------- +- Bug #1110478: Revert os.environ.update to do putenv again. + - Bug #1103844: fix distutils.install.dump_dirs() with negated options. - Bug #1067732: wininst --install-script doesn't leave residual files anymore.

1 0

python/dist/src/Lib os.py,1.83,1.83.2.1
by loewis＠users.sourceforge.net 29 Jan '05

29 Jan '05

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7293/Lib Modified Files: Tag: release24-maint os.py Log Message: Revert os.py 1.75, and directly implement update. Fixes #1110478 and #1100235. Index: os.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/os.py,v retrieving revision 1.83 retrieving revision 1.83.2.1 diff -u -d -r1.83 -r1.83.2.1 --- os.py 11 Oct 2004 18:12:15 -0000 1.83 +++ os.py 29 Jan 2005 13:33:23 -0000 1.83.2.1 @@ -435,6 +435,17 @@ return key.upper() in self.data def get(self, key, failobj=None): return self.data.get(key.upper(), failobj) + def update(self, dict=None, **kwargs): + if dict: + try: + items = dict.items() + except AttributeError: + # List of (key, value) + items = dict + for k, v in items: + self[k] = v + if kwargs: + self.update(kwargs) def copy(self): return dict(self) @@ -446,6 +457,17 @@ def __setitem__(self, key, item): putenv(key, item) self.data[key] = item + def update(self, dict=None, **kwargs): + if dict: + try: + items = dict.items() + except AttributeError: + # List of (key, value) + items = dict + for k, v in items: + self[k] = v + if kwargs: + self.update(kwargs) try: unsetenv except NameError:

1 0