Mailman 3 March 2004 - Python-checkins

python/dist/src/Objects setobject.c,1.21,1.22
by rhettinger＠users.sourceforge.net 08 Mar '04

08 Mar '04

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16976 Modified Files: setobject.c Log Message: The copy module now handles sets directly. The __copy__ methods are no longer needed. Index: setobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/setobject.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** setobject.c 31 Dec 2003 14:08:58 -0000 1.21 --- setobject.c 8 Mar 2004 18:31:10 -0000 1.22 *************** *** 914,919 **** {"copy", (PyCFunction)set_copy, METH_NOARGS, copy_doc}, - {"__copy__", (PyCFunction)set_copy, METH_NOARGS, - copy_doc}, {"discard", (PyCFunction)set_discard, METH_O, discard_doc}, --- 914,917 ---- *************** *** 1042,1047 **** {"copy", (PyCFunction)frozenset_copy, METH_NOARGS, copy_doc}, - {"__copy__", (PyCFunction)frozenset_copy, METH_NOARGS, - copy_doc}, {"difference", (PyCFunction)set_difference, METH_O, difference_doc}, --- 1040,1043 ----

1 0

python/dist/src/Misc NEWS,1.941,1.942
by rhettinger＠users.sourceforge.net 08 Mar '04

08 Mar '04

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15099/Misc Modified Files: NEWS Log Message: SF patch #907403: Improvements to cStringIO.writelines() The writelines() method now accepts any iterable argument and writes the lines one at a time rather than using ''.join(lines) followed by a single write. Results in considerable memory savings and makes the method suitable for use with generator expressions. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.941 retrieving revision 1.942 diff -C2 -d -r1.941 -r1.942 *** NEWS 7 Mar 2004 07:31:06 -0000 1.941 --- NEWS 8 Mar 2004 18:22:35 -0000 1.942 *************** *** 176,179 **** --- 176,184 ---- ----------------- + - cStringIO.writelines() now accepts any iterable argument and writes + the lines one at a time rather than joining them and writing once. + Made a parallel change to StringIO.writelines(). Saves memory and + makes suitable for use with generator expressions. + - time.strftime() now checks that the values in its time tuple argument are within the proper boundaries to prevent possible crashes from the

1 0

python/dist/src/Lib StringIO.py,1.33,1.34
by rhettinger＠users.sourceforge.net 08 Mar '04

08 Mar '04

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13720/Lib Modified Files: StringIO.py Log Message: SF patch #907403: Improvements to cStringIO.writelines() The writelines() method now accepts any iterable argument and writes the lines one at a time rather than using ''.join(lines) followed by a single write. Results in considerable memory savings and makes the method suitable for use with generator expressions. Index: StringIO.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/StringIO.py,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** StringIO.py 12 Feb 2004 17:35:05 -0000 1.33 --- StringIO.py 8 Mar 2004 18:17:31 -0000 1.34 *************** *** 179,184 **** self.pos = newpos ! def writelines(self, list): ! self.write(''.join(list)) def flush(self): --- 179,186 ---- self.pos = newpos ! def writelines(self, iterable): ! write = self.write ! for line in iterable: ! write(line) def flush(self):

1 0

python/dist/src/Modules cStringIO.c,2.46,2.47
by rhettinger＠users.sourceforge.net 08 Mar '04

08 Mar '04

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13720/Modules Modified Files: cStringIO.c Log Message: SF patch #907403: Improvements to cStringIO.writelines() The writelines() method now accepts any iterable argument and writes the lines one at a time rather than using ''.join(lines) followed by a single write. Results in considerable memory savings and makes the method suitable for use with generator expressions. Index: cStringIO.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/cStringIO.c,v retrieving revision 2.46 retrieving revision 2.47 diff -C2 -d -r2.46 -r2.47 *** cStringIO.c 27 Feb 2004 10:30:49 -0000 2.46 --- cStringIO.c 8 Mar 2004 18:17:31 -0000 2.47 *************** *** 417,454 **** } - PyDoc_STRVAR(O_writelines__doc__, ! "writelines(sequence_of_strings): write each string"); static PyObject * O_writelines(Oobject *self, PyObject *args) { ! PyObject *tmp = 0; ! static PyObject *joiner = NULL; ! ! if (!joiner) { ! PyObject *empty_string = PyString_FromString(""); ! if (empty_string == NULL) return NULL; ! joiner = PyObject_GetAttrString(empty_string, "join"); ! Py_DECREF(empty_string); ! if (joiner == NULL) return NULL; } ! ! if (PyObject_Size(args) < 0) return NULL; ! ! args = PyTuple_Pack(1, args); ! if (args == NULL) ! return NULL; ! tmp = PyObject_Call(joiner, args, NULL); ! Py_DECREF(args); ! UNLESS (tmp) return NULL; ! ! args = PyTuple_Pack(1, tmp); ! Py_DECREF(tmp); ! UNLESS (args) return NULL; ! ! tmp = O_write(self, args); ! Py_DECREF(args); ! return tmp; } --- 417,449 ---- } PyDoc_STRVAR(O_writelines__doc__, ! "writelines(sequence_of_strings) -> None. Write the strings to the file.\n" ! "\n" ! "Note that newlines are not added. The sequence can be any iterable object\n" ! "producing strings. This is equivalent to calling write() for each string."); static PyObject * O_writelines(Oobject *self, PyObject *args) { ! PyObject *it, *s; ! ! it = PyObject_GetIter(args); ! if (it == NULL) ! return NULL; ! while ((s = PyIter_Next(it)) != NULL) { ! int n; ! char *c; ! if (PyString_AsStringAndSize(s, &c, &n) == -1) { ! Py_DECREF(it); ! Py_DECREF(s); return NULL; ! } ! if (O_cwrite((PyObject *)self, c, n) == -1) { ! Py_DECREF(it); ! Py_DECREF(s); return NULL; + } + Py_DECREF(s); } ! Py_DECREF(it); ! Py_RETURN_NONE; }

1 0

python/dist/src/Lib/idlelib ClassBrowser.py, 1.7, 1.8 ColorDelegator.py, 1.12, 1.13 EditorWindow.py, 1.55, 1.56 NEWS.txt, 1.30, 1.31 PyShell.py, 1.86, 1.87 TreeWidget.py, 1.8, 1.9 config-highlight.def, 1.7, 1.8 configDialog.py, 1.56, 1.57 configHandler.py, 1.33, 1.34
by kbk＠users.sourceforge.net 08 Mar '04

08 Mar '04

Update of /cvsroot/python/python/dist/src/Lib/idlelib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13677 Modified Files: ClassBrowser.py ColorDelegator.py EditorWindow.py NEWS.txt PyShell.py TreeWidget.py config-highlight.def configDialog.py configHandler.py Log Message: Add a highlight theme for builtin keywords. Python Patch 805830 Nigel Rowe M ClassBrowser.py M ColorDelegator.py M EditorWindow.py M NEWS.txt M PyShell.py M TreeWidget.py M config-highlight.def M configDialog.py M configHandler.py Index: ClassBrowser.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/ClassBrowser.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ClassBrowser.py 20 Jan 2003 04:49:37 -0000 1.7 --- ClassBrowser.py 8 Mar 2004 18:15:30 -0000 1.8 *************** *** 18,21 **** --- 18,22 ---- from WindowList import ListedToplevel from TreeWidget import TreeNode, TreeItem, ScrolledCanvas + from configHandler import idleConf class ClassBrowser: *************** *** 43,47 **** top.focus_set() # create scrolled canvas ! sc = ScrolledCanvas(top, bg="white", highlightthickness=0, takefocus=1) sc.frame.pack(expand=1, fill="both") item = self.rootnode() --- 44,50 ---- top.focus_set() # create scrolled canvas ! theme = idleConf.GetOption('main','Theme','name') ! background = idleConf.GetHighlight(theme, 'normal')['background'] ! sc = ScrolledCanvas(top, bg=background, highlightthickness=0, takefocus=1) sc.frame.pack(expand=1, fill="both") item = self.rootnode() Index: ColorDelegator.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/ColorDelegator.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ColorDelegator.py 12 Feb 2004 17:35:08 -0000 1.12 --- ColorDelegator.py 8 Mar 2004 18:15:30 -0000 1.13 *************** *** 2,5 **** --- 2,6 ---- import re import keyword + import __builtin__ from Tkinter import * from Delegator import Delegator *************** *** 18,21 **** --- 19,25 ---- def make_pat(): kw = r"\b" + any("KEYWORD", keyword.kwlist) + r"\b" + builtinlist = [str(name) for name in dir(__builtin__) + if not name.startswith('_')] + builtin = r"([^\\.]\b|^)" + any("BUILTIN", builtinlist) + r"\b" comment = any("COMMENT", [r"#[^\n]*"]) sqstring = r"(\b[rR])?'[^'\\\n]*(\\.[^'\\\n]*)*'?" *************** *** 24,28 **** dq3string = r'(\b[rR])?"""[^"\\]*((\\.|"(?!""))[^"\\]*)*(""")?' string = any("STRING", [sq3string, dq3string, sqstring, dqstring]) ! return kw + "|" + comment + "|" + string + "|" + any("SYNC", [r"\n"]) prog = re.compile(make_pat(), re.S) --- 28,32 ---- dq3string = r'(\b[rR])?"""[^"\\]*((\\.|"(?!""))[^"\\]*)*(""")?' string = any("STRING", [sq3string, dq3string, sqstring, dqstring]) ! return kw + "|" + builtin + "|" + comment + "|" + string + "|" + any("SYNC", [r"\n"]) prog = re.compile(make_pat(), re.S) *************** *** 59,62 **** --- 63,67 ---- "COMMENT": idleConf.GetHighlight(theme, "comment"), "KEYWORD": idleConf.GetHighlight(theme, "keyword"), + "BUILTIN": idleConf.GetHighlight(theme, "builtin"), "STRING": idleConf.GetHighlight(theme, "string"), "DEFINITION": idleConf.GetHighlight(theme, "definition"), *************** *** 69,73 **** } ! if DEBUG: print 'tagdefs',tagdefs def insert(self, index, chars, tags=None): --- 74,78 ---- } ! if DEBUG: print 'tagdefs',self.tagdefs def insert(self, index, chars, tags=None): Index: EditorWindow.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/EditorWindow.py,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** EditorWindow.py 12 Feb 2004 17:35:08 -0000 1.55 --- EditorWindow.py 8 Mar 2004 18:15:30 -0000 1.56 *************** *** 511,514 **** --- 511,516 ---- self.color = self.ColorDelegator() self.per.insertfilter(self.color) + theme = idleConf.GetOption('main','Theme','name') + self.text.config(idleConf.GetHighlight(theme, "normal")) def ResetFont(self): Index: NEWS.txt =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/NEWS.txt,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** NEWS.txt 21 Jan 2004 19:21:11 -0000 1.30 --- NEWS.txt 8 Mar 2004 18:15:30 -0000 1.31 *************** *** 4,7 **** --- 4,9 ---- *Release date: XX-XXX-2004* + - Add a highlight theme for builtin keywords. Python Patch 805830 Nigel Rowe + - rpc.py:SocketIO - Large modules were generating large pickles when downloaded to the execution server. The return of the OK response from the subprocess Index: PyShell.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/PyShell.py,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** PyShell.py 12 Feb 2004 17:35:09 -0000 1.86 --- PyShell.py 8 Mar 2004 18:15:31 -0000 1.87 *************** *** 529,533 **** from TreeWidget import ScrolledCanvas, TreeNode top = Toplevel(self.tkconsole.root) ! sc = ScrolledCanvas(top, bg="white", highlightthickness=0) sc.frame.pack(expand=1, fill="both") node = TreeNode(sc.canvas, None, item) --- 529,535 ---- from TreeWidget import ScrolledCanvas, TreeNode top = Toplevel(self.tkconsole.root) ! theme = idleConf.GetOption('main','Theme','name') ! background = idleConf.GetHighlight(theme, 'normal')['background'] ! sc = ScrolledCanvas(top, bg=background, highlightthickness=0) sc.frame.pack(expand=1, fill="both") node = TreeNode(sc.canvas, None, item) Index: TreeWidget.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/TreeWidget.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** TreeWidget.py 12 Feb 2004 17:35:09 -0000 1.8 --- TreeWidget.py 8 Mar 2004 18:15:31 -0000 1.9 *************** *** 21,24 **** --- 21,25 ---- import ZoomHeight + from configHandler import idleConf ICONDIR = "Icons" *************** *** 250,257 **** # padding carefully selected (on Windows) to match Entry widget: self.label = Label(self.canvas, text=text, bd=0, padx=2, pady=2) if self.selected: ! self.label.configure(fg="white", bg="darkblue") else: ! self.label.configure(fg="black", bg="white") id = self.canvas.create_window(textx, texty, anchor="nw", window=self.label) --- 251,259 ---- # padding carefully selected (on Windows) to match Entry widget: self.label = Label(self.canvas, text=text, bd=0, padx=2, pady=2) + theme = idleConf.GetOption('main','Theme','name') if self.selected: ! self.label.configure(idleConf.GetHighlight(theme, 'hilite')) else: ! self.label.configure(idleConf.GetHighlight(theme, 'normal')) id = self.canvas.create_window(textx, texty, anchor="nw", window=self.label) Index: config-highlight.def =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/config-highlight.def,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** config-highlight.def 18 May 2003 02:21:55 -0000 1.7 --- config-highlight.def 8 Mar 2004 18:15:31 -0000 1.8 *************** *** 7,10 **** --- 7,12 ---- keyword-foreground= #ff7700 keyword-background= #ffffff + builtin-foreground= #ca00ca + builtin-background= #ffffff comment-foreground= #dd0000 comment-background= #ffffff *************** *** 36,39 **** --- 38,43 ---- keyword-foreground= #ff7700 keyword-background= #ffffff + builtin-foreground= #ca00ca + builtin-background= #ffffff comment-foreground= #dd0000 comment-background= #ffffff Index: configDialog.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/configDialog.py,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** configDialog.py 12 Feb 2004 17:35:09 -0000 1.56 --- configDialog.py 8 Mar 2004 18:15:31 -0000 1.57 *************** *** 36,48 **** 'Python Keywords':('keyword','01'), 'Python Definitions':('definition','02'), ! 'Python Comments':('comment','03'), ! 'Python Strings':('string','04'), ! 'Selected Text':('hilite','05'), ! 'Found Text':('hit','06'), ! 'Cursor':('cursor','07'), ! 'Error Text':('error','08'), ! 'Shell Normal Text':('console','09'), ! 'Shell Stdout Text':('stdout','10'), ! 'Shell Stderr Text':('stderr','11')} self.ResetChangedItems() #load initial values in changed items dict self.CreateWidgets() --- 36,50 ---- 'Python Keywords':('keyword','01'), 'Python Definitions':('definition','02'), ! 'Python Builtins':('builtin', '03'), ! 'Python Comments':('comment','04'), ! 'Python Strings':('string','05'), ! 'Selected Text':('hilite','06'), ! 'Found Text':('hit','07'), ! 'Cursor':('cursor','08'), ! 'Error Text':('error','09'), ! 'Shell Normal Text':('console','10'), ! 'Shell Stdout Text':('stdout','11'), ! 'Shell Stderr Text':('stderr','12'), ! } self.ResetChangedItems() #load initial values in changed items dict self.CreateWidgets() *************** *** 198,202 **** ('\n ','normal'),('"""string"""','string'),('\n var0 = ','normal'), ("'string'",'string'),('\n var1 = ','normal'),("'selected'",'hilite'), ! ('\n var2 = ','normal'),("'found'",'hit'),('\n\n','normal'), (' error ','error'),(' ','normal'),('cursor |','cursor'), ('\n ','normal'),('shell','console'),(' ','normal'),('stdout','stdout'), --- 200,206 ---- ('\n ','normal'),('"""string"""','string'),('\n var0 = ','normal'), ("'string'",'string'),('\n var1 = ','normal'),("'selected'",'hilite'), ! ('\n var2 = ','normal'),("'found'",'hit'), ! ('\n var3 = ','normal'),('list', 'builtin'), ('(','normal'), ! ('None', 'builtin'),(')\n\n','normal'), (' error ','error'),(' ','normal'),('cursor |','cursor'), ('\n ','normal'),('shell','console'),(' ','normal'),('stdout','stdout'), Index: configHandler.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/configHandler.py,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** configHandler.py 12 Feb 2004 17:35:09 -0000 1.33 --- configHandler.py 8 Mar 2004 18:15:31 -0000 1.34 *************** *** 307,310 **** --- 307,312 ---- 'keyword-foreground':'#000000', 'keyword-background':'#ffffff', + 'builtin-foreground':'#000000', + 'builtin-background':'#ffffff', 'comment-foreground':'#000000', 'comment-background':'#ffffff',

1 0

python/nondist/peps pep-0262.txt,1.15,1.16
by akuchling＠users.sourceforge.net 08 Mar '04

08 Mar '04

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22695 Modified Files: pep-0262.txt Log Message: Add section for open issues Index: pep-0262.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0262.txt,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** pep-0262.txt 8 Mar 2004 13:51:59 -0000 1.15 --- pep-0262.txt 8 Mar 2004 14:09:21 -0000 1.16 *************** *** 247,250 **** --- 247,281 ---- + Open Issues + + PJE suggests the installation database "be potentially present on + every directory in sys.path, with the contents merged in sys.path + order. This would allow home-directory or other + alternate-location installs to work, and ease the process of a + distutils install command writing the file." Nice feature: it does + mean that package manager tools can take into account Python + packages that a user has privately installed. + + AMK wonders: what does setup.py do if it's told to install + packages to a directory not on sys.path? Does it write an + install-db directory to the directory it's told to write to, or + does it do nothing? + + Should the package-database file itself be included in the files + list? (PJE would think yes, but of course it can't contain its + own checksum. AMK can't think of a use case where including the + DB file matters.) + + PJE wonders about writing the package DB file + *first*, before installing any other files, so that failed partial + installations can both be backed out, and recognized as broken. + This PEP may have to specify some algorithm for recognizing this + situation. + + Should we guarantee the format of installation databases remains + compatible across Python versions, or is it subject to arbitrary + change? Probably we need to guarantee compatibility. + + Rejected Suggestions

1 0

python/nondist/peps pep-0262.txt,1.14,1.15
by akuchling＠users.sourceforge.net 08 Mar '04

08 Mar '04

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18204 Modified Files: pep-0262.txt Log Message: Terminology change (package -> distribution); specify the digest field for .pyc files Index: pep-0262.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0262.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** pep-0262.txt 8 Mar 2004 13:38:50 -0000 1.14 --- pep-0262.txt 8 Mar 2004 13:51:59 -0000 1.15 *************** *** 10,35 **** Introduction ! This PEP describes a format for a database of Python packages installed on a system. Requirements ! We need a way to figure out what packages, and what versions of ! those packages, are installed on a system. We want to provide features similar to CPAN, APT, or RPM. Required use cases that should be supported are: ! * Is package X on a system? ! * What version of package X is installed? ! * Where can the new version of package X be found? (This can be defined as either "a home page where the user can go and find a download link", or "a place where a program can find the newest version?" Both should probably be supported.) ! * What files did package X put on my system? ! * What package did the file x/y/z.py come from? * Has anyone modified x/y/z.py locally? ! * What other packages does this package need? ! * What Python modules does this package provide? --- 10,41 ---- Introduction ! This PEP describes a format for a database of the Python software installed on a system. + (In this document, the term "distribution" is used to mean a set + of code that's developed and distributed together. A "distribution" + is the same as a Red Hat or Debian package, but the term "package" + already has a meaning in Python terminology, meaning "a directory + with an __init__.py file in it.") + Requirements ! We need a way to figure out what distributions, and what versions of ! those distributions, are installed on a system. We want to provide features similar to CPAN, APT, or RPM. Required use cases that should be supported are: ! * Is distribution X on a system? ! * What version of distribution X is installed? ! * Where can the new version of distribution X be found? (This can be defined as either "a home page where the user can go and find a download link", or "a place where a program can find the newest version?" Both should probably be supported.) ! * What files did distribution X put on my system? ! * What distribution did the file x/y/z.py come from? * Has anyone modified x/y/z.py locally? ! * What other distributions does this software need? ! * What Python modules does this distribution provide? *************** *** 42,51 **** The structure of the database is deliberately kept simple; each file in this directory or its subdirectories (if any) describes a ! single package. Binary packages of Python software such as RPMs ! can then update Python's database by just installing the corresponding file into the INSTALLDB directory. The rationale for scanning subdirectories is that we can move to a ! directory-based indexing scheme if the package directory contains too many entries. For example, this would let us transparently switch from INSTALLDB/Numeric to INSTALLDB/N/Nu/Numeric or some --- 48,57 ---- The structure of the database is deliberately kept simple; each file in this directory or its subdirectories (if any) describes a ! single distribution. Binary packagings of Python software such as ! RPMs can then update Python's database by just installing the corresponding file into the INSTALLDB directory. The rationale for scanning subdirectories is that we can move to a ! directory-based indexing scheme if the database directory contains too many entries. For example, this would let us transparently switch from INSTALLDB/Numeric to INSTALLDB/N/Nu/Numeric or some *************** *** 56,60 **** Each file in INSTALLDB or its subdirectories describes a single ! package, and has the following contents: An initial line listing the sections in this file, separated --- 62,66 ---- Each file in INSTALLDB or its subdirectories describes a single ! distribution, and has the following contents: An initial line listing the sections in this file, separated *************** *** 65,73 **** are always separated by blank lines. ! A package that uses the Distutils for installation should ! automatically update the database. Packages that roll their own ! installation will have to use the database's API to to manually ! add or update their own entry. System package managers such as ! RPM or pkgadd can just create the new 'package name' file in the INSTALLDB directory. --- 71,79 ---- are always separated by blank lines. ! A distribution that uses the Distutils for installation should ! automatically update the database. Distributions that roll their ! own installation will have to use the database's API to to ! manually add or update their own entry. System package managers ! such as RPM or pkgadd can just create the new file in the INSTALLDB directory. *************** *** 76,106 **** PKG-INFO section ! An initial set of RFC-822 headers containing the package information for a file, as described in PEP 241, "Metadata for Python Software Packages". - A blank line indicating the end of the PKG-INFO section. - FILES section ! An entry for each file installed by the package. Generated files ! such as .pyc and .pyo files are on this list as well as the original ! .py files installed by a package; their checksums won't be stored or ! checked, though. ! Each file's entry is a single tab-delimited line that contains ! the following fields: ! * The file's full path, as installed on the system. ! * The file's size ! * The file's permissions. On Windows, this field will always be ! 'unknown' - * The owner and group of the file, separated by a tab. - On Windows, these fields will both be 'unknown'. - - * A SHA1 digest of the file, encoded in hex. REQUIRES section --- 82,114 ---- PKG-INFO section ! An initial set of RFC-822 headers containing the distribution information for a file, as described in PEP 241, "Metadata for Python Software Packages". FILES section ! An entry for each file installed by the ! distribution. Generated files such as .pyc and .pyo files are ! on this list as well as the original .py files installed by a ! distribution; their checksums won't be stored or checked, ! though. ! Each file's entry is a single tab-delimited line that contains ! the following fields: ! * The file's full path, as installed on the system. ! * The file's size ! * The file's permissions. On Windows, this field will always be ! 'unknown' ! ! * The owner and group of the file, separated by a tab. ! On Windows, these fields will both be 'unknown'. ! ! * A SHA1 digest of the file, encoded in hex. For generated files ! such as *.pyc files, this field must contain the string "-", ! which indicates that the file's checksum should not be verified. REQUIRES section *************** *** 108,112 **** This section is a list of strings giving the services required for this module distribution to run properly. This list includes the ! package name ("python-stdlib") and module names ("rfc822", "htmllib", "email", "email.Charset"). It will be specified by an extra 'requires' argument to the distutils.core.setup() --- 116,120 ---- This section is a list of strings giving the services required for this module distribution to run properly. This list includes the ! distribution name ("python-stdlib") and module names ("rfc822", "htmllib", "email", "email.Charset"). It will be specified by an extra 'requires' argument to the distutils.core.setup() *************** *** 124,128 **** This section is a list of strings giving the services provided by ! an installed package. This list includes the package name ("python-stdlib") and module names ("rfc822", "htmllib", "email", "email.Charset"). --- 132,136 ---- This section is a list of strings giving the services provided by ! an installed distribution. This list includes the distribution name ("python-stdlib") and module names ("rfc822", "htmllib", "email", "email.Charset"). *************** *** 148,157 **** alternate module name?) ! The InstallationDatabase returns instances of Package that contain ! all the information about an installed package. ! XXX Several of the fields in Package are duplicates of ones in distutils.dist.Distribution. Probably they should be factored out ! into the Package class proposed here, but can this be done in a backward-compatible way? --- 156,165 ---- alternate module name?) ! The InstallationDatabase returns instances of Distribution that contain ! all the information about an installed distribution. ! XXX Several of the fields in Distribution are duplicates of ones in distutils.dist.Distribution. Probably they should be factored out ! into the Distribution class proposed here, but can this be done in a backward-compatible way? *************** *** 165,194 **** """ ! def get_package (self, package_name): ! """get_package(package_name:string) : Package ! Get the object corresponding to a single package. """ ! def list_packages (self): ! """list_packages() : [Package] ! Return a list of all packages installed on the system, enumerated in no particular order. """ ! def find_package (self, path): ! """find_file(path:string) : Package ! Search and return the package containing the file 'path'. ! Returns None if the file doesn't belong to any package that the InstallationDatabase knows about. XXX should this work for directories? """ ! class Package: """Instance attributes: name : string ! Package name files : {string : (size:int, perms:int, owner:string, group:string, digest:string)} ! Dictionary mapping the path of a file installed by this package to information about the file. --- 173,202 ---- """ ! def get_distribution (self, distribution_name): ! """get_distribution(distribution_name:string) : Distribution ! Get the object corresponding to a single distribution. """ ! def list_distributions (self): ! """list_distributions() : [Distribution] ! Return a list of all distributions installed on the system, enumerated in no particular order. """ ! def find_distribution (self, path): ! """find_file(path:string) : Distribution ! Search and return the distribution containing the file 'path'. ! Returns None if the file doesn't belong to any distribution that the InstallationDatabase knows about. XXX should this work for directories? """ ! class Distribution: """Instance attributes: name : string ! Distribution name files : {string : (size:int, perms:int, owner:string, group:string, digest:string)} ! Dictionary mapping the path of a file installed by this distribution to information about the file. *************** *** 196,200 **** version : distutils.version.Version ! Version of this package platform : [string] summary : string --- 204,208 ---- version : distutils.version.Version ! Version of this distribution platform : [string] summary : string *************** *** 217,221 **** """has_file(path:string) : Boolean Returns true if the specified path belongs to a file in this ! package. """ --- 225,229 ---- """has_file(path:string) : Boolean Returns true if the specified path belongs to a file in this ! distribution. """ *************** *** 233,237 **** Patches to the Distutils that 1) implement an InstallationDatabase ! class, 2) Update the database when a new package is installed. 3) add a simple package management tool, features to be added to this PEP. (Or should that be a separate PEP?) See [2] for the current --- 241,245 ---- Patches to the Distutils that 1) implement an InstallationDatabase ! class, 2) Update the database when a new distribution is installed. 3) add a simple package management tool, features to be added to this PEP. (Or should that be a separate PEP?) See [2] for the current *************** *** 241,256 **** Rejected Suggestions ! Instead of using one text file per package, one large text file or ! an anydbm file could be used. This has been rejected for a few ! reasons. First, performance is probably not an extremely pressing ! concern as the package database is only used when installing or ! removing packages, a relatively infrequent task. Scalability also likely isn't a problem, as people may have hundreds of Python ! packages installed, but thousands seems unlikely. Finally, ! individual text files are compatible with installers such as RPM ! or DPKG because a package can just drop the new database file into ! the database directory. If one large text file or a binary file ! were used, the Python database would then have to be updated by ! running a postinstall script. On Windows, the permissions and owner/group of a file aren't --- 249,264 ---- Rejected Suggestions ! Instead of using one text file per distribution, one large text ! file or an anydbm file could be used. This has been rejected for ! a few reasons. First, performance is probably not an extremely ! pressing concern as the database is only used when installing or ! removing software, a relatively infrequent task. Scalability also likely isn't a problem, as people may have hundreds of Python ! packages installed, but thousands or tens of thousands seems ! unlikely. Finally, individual text files are compatible with ! installers such as RPM or DPKG because a binary packager can just ! drop the new database file into the database directory. If one ! large text file or a binary file were used, the Python database ! would then have to be updated by running a postinstall script. On Windows, the permissions and owner/group of a file aren't *************** *** 268,272 **** [2] A patch to implement this PEP will be tracked as patch #562100 on SourceForge. ! http://www.python.org/sf/562100 --- 276,282 ---- [2] A patch to implement this PEP will be tracked as patch #562100 on SourceForge. ! http://www.python.org/sf/562100 . ! Code implementing the installation database is currently in ! Python CVS in the nondist/sandbox/pep262 directory. *************** *** 274,278 **** Ideas for this PEP originally came from postings by Greg Ward, ! Fred L. Drake Jr., Thomas Heller, Mats Wichmann, and others. Many changes and rewrites to this document were suggested by the --- 284,289 ---- Ideas for this PEP originally came from postings by Greg Ward, ! Fred L. Drake Jr., Thomas Heller, Mats Wichmann, Phillip J. Eby, ! and others. Many changes and rewrites to this document were suggested by the

1 0

python/nondist/peps pep-0262.txt,1.13,1.14
by akuchling＠users.sourceforge.net 08 Mar '04

08 Mar '04

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15460 Modified Files: pep-0262.txt Log Message: Change name of installation DB Index: pep-0262.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0262.txt,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** pep-0262.txt 30 Mar 2003 16:52:11 -0000 1.13 --- pep-0262.txt 8 Mar 2004 13:38:50 -0000 1.14 *************** *** 37,41 **** The database lives in a bunch of files under ! <prefix>/lib/python<version>/install/. This location will be called INSTALLDB through the remainder of this PEP. --- 37,41 ---- The database lives in a bunch of files under ! <prefix>/lib/python<version>/install-db/. This location will be called INSTALLDB through the remainder of this PEP.

1 0

python/dist/src/Objects listobject.c, 2.185, 2.186 tupleobject.c, 2.82, 2.83
by rhettinger＠users.sourceforge.net 07 Mar '04

07 Mar '04

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11822/Objects Modified Files: listobject.c tupleobject.c Log Message: Optimize tuple_slice() and make further improvements to list_slice() and list.extend(). Factoring the inner loops to remove the constant structure references and fixed offsets gives speedups ranging from 20% to 30%. Index: listobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/listobject.c,v retrieving revision 2.185 retrieving revision 2.186 diff -C2 -d -r2.185 -r2.186 *** listobject.c 8 Mar 2004 05:56:15 -0000 2.185 --- listobject.c 8 Mar 2004 07:25:04 -0000 2.186 *************** *** 343,346 **** --- 343,347 ---- { PyListObject *np; + PyObject **src, **dest; int i, len; if (ilow < 0) *************** *** 357,364 **** return NULL; for (i = 0; i < len; i++) { ! PyObject *v = a->ob_item[i+ilow]; Py_INCREF(v); ! np->ob_item[i] = v; } return (PyObject *)np; --- 358,367 ---- return NULL; + src = a->ob_item + ilow; + dest = np->ob_item; for (i = 0; i < len; i++) { ! PyObject *v = src[i]; Py_INCREF(v); ! dest[i] = v; } return (PyObject *)np; *************** *** 647,650 **** --- 650,654 ---- int blen; register int i; + PyObject **src, **dest; if (PyObject_Size(b) == 0) { *************** *** 679,695 **** /* populate the end of self with b's items */ ! if (PyList_Check(b)) { ! for (i = 0; i < blen; i++) { ! PyObject *o = PyList_GET_ITEM(b, i); ! Py_INCREF(o); ! PyList_SET_ITEM(self, i+selflen, o); ! } ! } else { assert (PyTuple_Check(b)); ! for (i = 0; i < blen; i++) { ! PyObject *o = PyTuple_GET_ITEM(b, i); ! Py_INCREF(o); ! PyList_SET_ITEM(self, i+selflen, o); ! } } Py_DECREF(b); --- 683,697 ---- /* populate the end of self with b's items */ ! if (PyList_Check(b)) ! src = ((PyListObject *)b)->ob_item; ! else { assert (PyTuple_Check(b)); ! src = ((PyTupleObject *)b)->ob_item; ! } ! dest = self->ob_item + selflen; ! for (i = 0; i < blen; i++) { ! PyObject *o = src[i]; ! Py_INCREF(o); ! dest[i] = o; } Py_DECREF(b); Index: tupleobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/tupleobject.c,v retrieving revision 2.82 retrieving revision 2.83 diff -C2 -d -r2.82 -r2.83 *** tupleobject.c 12 Oct 2003 18:24:33 -0000 2.82 --- tupleobject.c 8 Mar 2004 07:25:04 -0000 2.83 *************** *** 307,311 **** --- 307,313 ---- { register PyTupleObject *np; + PyObject **src, **dest; register int i; + int len; if (ilow < 0) ilow = 0; *************** *** 318,328 **** return (PyObject *)a; } ! np = (PyTupleObject *)PyTuple_New(ihigh - ilow); if (np == NULL) return NULL; ! for (i = ilow; i < ihigh; i++) { ! PyObject *v = a->ob_item[i]; Py_INCREF(v); ! np->ob_item[i - ilow] = v; } return (PyObject *)np; --- 320,333 ---- return (PyObject *)a; } ! len = ihigh - ilow; ! np = (PyTupleObject *)PyTuple_New(len); if (np == NULL) return NULL; ! src = a->ob_item + ilow; ! dest = np->ob_item; ! for (i = 0; i < len; i++) { ! PyObject *v = src[i]; Py_INCREF(v); ! dest[i] = v; } return (PyObject *)np;

1 0

[Python-checkins] python/dist/src/Doc/whatsnew whatsnew24.tex, 1.37, 1.38
by rhettinger＠users.sourceforge.net 07 Mar '04

07 Mar '04

Update of /cvsroot/python/python/dist/src/Doc/whatsnew In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11822/Doc/whatsnew Modified Files: whatsnew24.tex Log Message: Optimize tuple_slice() and make further improvements to list_slice() and list.extend(). Factoring the inner loops to remove the constant structure references and fixed offsets gives speedups ranging from 20% to 30%. Index: whatsnew24.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/whatsnew/whatsnew24.tex,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** whatsnew24.tex 7 Mar 2004 07:31:05 -0000 1.37 --- whatsnew24.tex 8 Mar 2004 07:25:05 -0000 1.38 *************** *** 264,267 **** --- 264,270 ---- \begin{itemize} + \item The inner loops for \class{list} and \class{tuple} slicing + were optimized and now run about one-third faster. + \item The machinery for growing and shrinking lists was optimized for speed and for space efficiency. Small lists (under eight elements)

1 0