Mailman 3 January 2004 - Python-checkins

python/dist/src/PC/VC6 - New directory
by loewis＠users.sourceforge.net Jan. 2, 2004

Jan. 2, 2004

Update of /cvsroot/python/python/dist/src/PC/VC6 In directory sc8-pr-cvs1:/tmp/cvs-serv19848/VC6 Log Message: Directory /cvsroot/python/python/dist/src/PC/VC6 added to the repository

1 0

python/nondist/peps pep-0324.txt, NONE, 1.1 pep-0000.txt, 1.258, 1.259
by goodger＠users.sourceforge.net Jan. 2, 2004

Jan. 2, 2004

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1:/tmp/cvs-serv19377 Modified Files: pep-0000.txt Added Files: pep-0324.txt Log Message: added PEP 324, popen5 - New POSIX process module, by Peter Astrand --- NEW FILE: pep-0324.txt --- PEP: 324 Title: popen5 - New POSIX process module Version: $Revision: 1.1 $ Last-Modified: $Date: 2004/01/02 20:53:01 $ Author: Peter Astrand <astrand(a)lysator.liu.se> Status: Draft Type: Standards Track (library) Created: 19-Nov-2003 Content-Type: text/plain Python-Version: 2.4 Abstract This PEP describes a new module for starting and communicating with processes on POSIX systems. Motivation Starting new processes is a common task in any programming language, and very common in a high-level language like Python. Good support for this task is needed, because: - Inappropriate functions for starting processes could mean a security risk: If the program is started through the shell, and the arguments contain shell meta characters, the result can be disastrous. [1] - It makes Python an even better replacement language for over-complicated shell scripts. Currently, Python has a large number of different functions for process creation. This makes it hard for developers to choose. The popen5 modules provides the following enhancements over previous functions: - One "unified" module provides all functionality from previous functions. - Cross-process exceptions: Exceptions happening in the child before the new process has started to execute are re-raised in the parent. This means that it's easy to handle exec() failures, for example. With popen2, for example, it's impossible to detect if the execution failed. - A hook for executing custom code between fork and exec. This can be used for, for example, changing uid. - No implicit call of /bin/sh. This means that there is no need for escaping dangerous shell meta characters. - All combinations of file descriptor redirection is possible. For example, the "python-dialog" [2] needs to spawn a process and redirect stderr, but not stdout. This is not possible with current functions, without using temporary files. - With popen5, it's possible to control if all open file descriptors should be closed before the new program is executed. - Support for connecting several subprocesses (shell "pipe"). - Universal newline support. - A communicate() method, which makes it easy to send stdin data and read stdout and stderr data, without risking deadlocks. Most people are aware of the flow control issues involved with child process communication, but not all have the patience or skills to write a fully correct and deadlock-free select loop. This means that many Python applications contain race conditions. A communicate() method in the standard library solves this problem. Rationale The following points summarizes the design: - popen5 was based on popen2, which is tried-and-tested. - The factory functions in popen2 have been removed, because I consider the class constructor equally easy to work with. - popen2 contains several factory functions and classes for different combinations of redirection. popen5, however, contains one single class. Since popen5 supports 12 different combinations of redirection, providing a class or function for each of them would be cumbersome and not very intuitive. Even with popen2, this is a readability problem. For example, many people cannot tell the difference between popen2.popen2 and popen2.popen4 without using the documentation. - One small utility function is provided: popen5.run(). It aims to be an enhancement over os.system(), while still very easy to use: - It does not use the Standard C function system(), which has limitations. - It does not call the shell implicitly. - No need for quoting; using a variable argument list. - The return value is easier to work with. - The "preexec" functionality makes it possible to run arbitrary code between fork and exec. One might ask why there are special arguments for setting the environment and current directory, but not for, for example, setting the uid. The answer is: - Changing environment and working directory is considered fairly common. - Old functions like spawn() has support for an "env"-argument. - env and cwd are considered quite cross-platform: They make sense even on Windows. - No MS Windows support is available, currently. To be able to provide more functionality than what is already available from the popen2 module, help from C modules is required. Specification This module defines one class called Popen: class Popen(args, bufsize=0, argv0=None, stdin=None, stdout=None, stderr=None, preexec_fn=None, preexec_args=(), close_fds=0, cwd=None, env=None, universal_newlines=0) Arguments are: - args should be a sequence of program arguments. The program to execute is normally the first item in the args sequence, but can be explicitly set by using the argv0 argument. The Popen class uses os.execvp() to execute the child program. - bufsize, if given, has the same meaning as the corresponding argument to the built-in open() function: 0 means unbuffered, 1 means line buffered, any other positive value means use a buffer of (approximately) that size. A negative bufsize means to use the system default, which usually means fully buffered. The default value for bufsize is 0 (unbuffered). - stdin, stdout and stderr specify the executed programs' standard input, standard output and standard error file handles, respectively. Valid values are PIPE, an existing file descriptor (a positive integer), an existing file object, and None. PIPE indicates that a new pipe to the child should be created. With None, no redirection will occur; the child's file handles will be inherited from the parent. Additionally, stderr can be STDOUT, which indicates that the stderr data from the applications should be captured into the same file handle as for stdout. - If preexec_fn is set to a callable object, this object will be called in the child process just before the child is executed, with arguments preexec_args. - If close_fds is true, all file descriptors except 0, 1 and 2 will be closed before the child process is executed. - If cwd is not None, the current directory will be changed to cwd before the child is executed. - If env is not None, it defines the environment variables for the new process. - If universal_newlines is true, the file objects fromchild and childerr are opened as a text files, but lines may be terminated by any of '\n', the Unix end-of-line convention, '\r', the Macintosh convention or '\r\n', the Windows convention. All of these external representations are seen as '\n' by the Python program. Note: This feature is only available if Python is built with universal newline support (the default). Also, the newlines attribute of the file objects fromchild, tochild and childerr are not updated by the communicate() method. The module also defines one shortcut function: run(*args): Run command with arguments. Wait for command to complete, then return the returncode attribute. Example: retcode = popen5.run("stty", "sane") Exceptions ---------- Exceptions raised in the child process, before the new program has started to execute, will be re-raised in the parent. Additionally, the exception object will have one extra attribute called 'child_traceback', which is a string containing traceback information from the child's point of view. The most common exception raised is OSError. This occurs, for example, when trying to execute a non-existent file. Applications should prepare for OSErrors. A PopenException will also be raised if Popen is called with invalid arguments. Security -------- popen5 will never call /bin/sh implicitly. This means that all characters, including shell metacharacters, can safely be passed to child processes. Popen objects ------------- Instances of the Popen class have the following methods: poll() Returns -1 if child process hasn't completed yet, or its exit status otherwise. See below for a description of how the exit status is encoded. wait() Waits for and returns the exit status of the child process. The exit status encodes both the return code of the process and information about whether it exited using the exit() system call or died due to a signal. Functions to help interpret the status code are defined in the os module (the W*() family of functions). communicate(input=None) Interact with process: Send data to stdin. Read data from stdout and stderr, until end-of-file is reached. Wait for process to terminate. The optional stdin argument should be a string to be sent to the child process, or None, if no data should be sent to the child. communicate() returns a tuple (stdout, stderr). Note: The data read is buffered in memory, so do not use this method if the data size is large or unlimited. The following attributes are also available: fromchild A file object that provides output from the child process. tochild A file object that provides input to the child process. childerr A file object that provides error output from the child process. pid The process ID of the child process. returncode The child return code. A None value indicates that the process hasn't terminated yet. A negative value means that the process was terminated by a signal with number -returncode. Open Issues Perhaps the module should be called something like "process", instead of "popen5". Reference Implementation A reference implementation is available from http://www.lysator.liu.se/~astrand/popen5/. References [1] Secure Programming for Linux and Unix HOWTO, section 8.3. http://www.dwheeler.com/secure-programs/ [2] Python Dialog http://pythondialog.sourceforge.net/ Copyright This document has been placed in the public domain. Local Variables: mode: indented-text indent-tabs-mode: nil sentence-end-double-space: t fill-column: 70 End: Index: pep-0000.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0000.txt,v retrieving revision 1.258 retrieving revision 1.259 diff -C2 -d -r1.258 -r1.259 *** pep-0000.txt 6 Nov 2003 14:07:17 -0000 1.258 --- pep-0000.txt 2 Jan 2004 20:53:01 -0000 1.259 *************** *** 120,123 **** --- 120,124 ---- S 321 Date/Time Parsing and Formatting Kuchling S 323 Copyable Iterators Martelli + S 324 popen5 - New POSIX process module Astrand S 754 IEEE 754 Floating Point Special Values Warnes *************** *** 339,342 **** --- 340,345 ---- S 321 Date/Time Parsing and Formatting Kuchling SF 322 Reverse Iteration Hettinger + S 323 Copyable Iterators Martelli + S 324 popen5 - New POSIX process module Astrand SR 666 Reject Foolish Indentation Creighton S 754 IEEE 754 Floating Point Special Values Warnes *************** *** 362,365 **** --- 365,369 ---- Altis, Kevin altis(a)semi-retired.com Ascher, David davida(a)activestate.com + Astrand, Peter astrand(a)lysator.liu.se Barrett, Paul barrett(a)stsci.edu Baxter, Anthony anthony(a)interlink.com.au

1 0

python/nondist/sandbox/msi msi.py,1.3,1.4
by loewis＠users.sourceforge.net Jan. 2, 2004

Jan. 2, 2004

Update of /cvsroot/python/python/nondist/sandbox/msi In directory sc8-pr-cvs1:/tmp/cvs-serv17550 Modified Files: msi.py Log Message: Add advanced options dialog (default python, all users install). Delete Verb/ProgId/Extension tables, as they cannot be conditionalized. Index: msi.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/msi/msi.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** msi.py 1 Jan 2004 15:41:06 -0000 1.3 --- msi.py 2 Jan 2004 20:43:24 -0000 1.4 *************** *** 73,77 **** msilib.add_tables(db, sequence) add_data(db, "Property", [("UpgradeCode", upgrade_code), ! ("ALLUSERS", "2")]) db.Commit() return db --- 73,78 ---- msilib.add_tables(db, sequence) add_data(db, "Property", [("UpgradeCode", upgrade_code), ! ("DEFAULTPYTHON", "1"), ! ("WhichUsers", "ALL")]) db.Commit() return db *************** *** 156,160 **** # msidbCustomActionTypeFirstSequence + msidbCustomActionTypeTextData + msidbCustomActionTypeProperty ("InitialTargetDir", 307, "TARGETDIR", ! "[WindowsVolume]Python%s%s" % (major, minor)) ]) --- 157,161 ---- # msidbCustomActionTypeFirstSequence + msidbCustomActionTypeTextData + msidbCustomActionTypeProperty ("InitialTargetDir", 307, "TARGETDIR", ! "[WindowsVolume]Python%s%s" % (major, minor)), ]) *************** *** 171,174 **** --- 172,176 ---- [("InitialTargetDir", 'TARGETDIR=""', 750)]) + ##################################################################### # Standard dialogs: FatalError, UserExit, ExitDialog fatal=PyDialog(db, "FatalError", x, y, w, h, modal, title, *************** *** 207,210 **** --- 209,213 ---- c.event("EndDialog", "Return") + ##################################################################### # Required dialog: FilesInUse, ErrorDlg inuse = PyDialog(db, "FilesInUse", x, y, w, h, 19, title, *************** *** 237,240 **** --- 240,244 ---- error.pushbutton("R",198,72,81,21,3,"Retry",None).event("EndDialog","ErrorRetry") + ##################################################################### # Global "Query Cancel" dialog cancel = Dialog(db, "CancelDlg", 50, 10, 260, 85, 3, title, *************** *** 250,253 **** --- 254,258 ---- c.event("EndDialog", "Return") + ##################################################################### # Global "Wait for costing" dialog costing = Dialog(db, "WaitForCostingDlg", 50, 10, 260, 85, modal, title, *************** *** 260,263 **** --- 265,269 ---- c.event("EndDialog", "Exit") + ##################################################################### # Preparation dialog: no user input except cancellation prep = PyDialog(db, "PrepareDlg", x, y, w, h, modeless, title, *************** *** 301,304 **** --- 307,311 ---- c.event("DirectoryListNew", "0") + ##################################################################### # SelectFeaturesDlg features = PyDialog(db, "SelectFeaturesDlg", x, y, w, h, modal|track_disk_space, *************** *** 311,319 **** c=features.back("< Back", "Next") ! c.event("NewDialog", "SelectDirectoryDlg") # XXX InstallMode="" c=features.next("Next >", "Cancel") c.mapping("SelectionNoItems", "Enabled") ! c.event("EndDialog", "Return") c=features.cancel("Cancel", "Tree") --- 318,328 ---- c=features.back("< Back", "Next") ! c.event("NewDialog", "SelectDirectoryDlg") c=features.next("Next >", "Cancel") c.mapping("SelectionNoItems", "Enabled") ! c.event("[ALLUSERS]", "2", 'VersionNT and WhichUsers="ALL"', order=1) ! c.event("SpawnDialog", "DiskCostDlg", "OutOfDiskSpace=1", order=2) ! c.event("EndDialog", "Return", "OutOfDiskSpace<>1", order=3) c=features.cancel("Cancel", "Tree") *************** *** 334,337 **** --- 343,349 ---- c.event("SpawnDialog", "DiskCostDlg") + c=features.xbutton("Advanced", "Advanced", None, 0.30) + c.event("SpawnDialog", "AdvancedDlg") + c=features.text("ItemDescription", 140, 180, 210, 50, 3, "Multiline description of the currently selected item.") *************** *** 342,345 **** --- 354,358 ---- c.mapping("SelectionSize", "Text") + ##################################################################### # Disk cost cost = PyDialog(db, "DiskCostDlg", x, y, w, h, modal, title, *************** *** 358,363 **** None, "{120}{70}{70}{70}{70}", None, None) cost.xbutton("OK", "Ok", None, 0.5).event("EndDialog", "Return") - # Installation Progress dialog (modeless) progress = PyDialog(db, "ProgressDlg", x, y, w, h, modeless, title, --- 371,403 ---- None, "{120}{70}{70}{70}{70}", None, None) cost.xbutton("OK", "Ok", None, 0.5).event("EndDialog", "Return") + ##################################################################### + # Advanced Options + advanced = PyDialog(db, "AdvancedDlg", x, y, w, h, modal, title, + "OK", "OK", "OK") + advanced.title("Advanced Options") + #0x10: Numeric property + advanced.control("Default", "CheckBox", 135, 60, 160, 20, 19, + "DEFAULTPYTHON", "Install as Default Python Installation", + "AdminInstall", None) + g = advanced.radiogroup("AdminInstall", 135, 90, 160, 50, 3, + "WhichUsers", "", "OK") + # ALLUSERS should not be tempered with on W9x + g.condition("Hide", "Windows9x or NOT Privileged") + g.add("ALL", 0, 5, 150, 20, "Install for all users") + g.add("JUSTME", 0, 25, 150, 20, "Install just for me") + + # Alternative texts if AdminInstall is not available + c=advanced.text("Unprivileged", 135, 90, 160, 50, 3, + "Installing Python for all users is not possible, because you lack privileges.") + c.condition("Hide", "Privileged") + c=advanced.text("W9X", 135, 80, 160, 90, 3, + "Installing Python for all users is not possible on Windows 9x.") + c.condition("Hide", "NOT Windows9x") + + advanced.cancel("Ok", "Default", name="OK").event("EndDialog", "Return") + + + ##################################################################### # Installation Progress dialog (modeless) progress = PyDialog(db, "ProgressDlg", x, y, w, h, modeless, title, *************** *** 454,469 **** cab = CAB("python") tmpfiles = [] root = Directory(db, cab, None, srcdir, "TARGETDIR", "SourceDir") ! # Create separate components for python.exe and pythonw.exe so we can ! # create advertised shortcuts ! root.start_component("python.exe", default_feature, "python.exe") root.add_file("PCBuild/python.exe") - root.start_component("pythonw.exe", default_feature, "pythonw.exe") root.add_file("PCBuild/pythonw.exe") - # Add all other root files into the TARGETDIR component - root.start_component("TARGETDIR", default_feature) - root.add_file("PCBuild/w9xpopen.exe") # XXX: separate component to only install on W9x - root.add_file("PCBuild/python%s%s.dll" % (major, minor)) # XXX separate component for system32 # XXX determine dependencies --- 494,509 ---- cab = CAB("python") tmpfiles = [] + # Add all executables, icons, text files into the TARGETDIR component root = Directory(db, cab, None, srcdir, "TARGETDIR", "SourceDir") ! default_feature.set_current() root.add_file("PCBuild/python.exe") root.add_file("PCBuild/pythonw.exe") + root.add_file("PCBuild/w9xpopen.exe") + root.add_file("PC/py.ico") + root.add_file("PC/pyc.ico") + root.add_file("README.txt", src="README") + root.add_file("NEWS.txt", src="Misc/NEWS") + root.add_file("LICENSE.txt", src="LICENSE") root.add_file("PCBuild/python%s%s.dll" % (major, minor)) # XXX separate component for system32 # XXX determine dependencies *************** *** 473,481 **** tmpfiles.append("msvcr71.dll") - root.add_file("README.txt", src="README") - root.add_file("NEWS.txt", src="Misc/NEWS") - root.add_file("LICENSE.txt", src="LICENSE") - dirs={} # Add all .py files in Lib, except lib-tk, test pydirs = [(root,"Lib")] while pydirs: --- 513,518 ---- tmpfiles.append("msvcr71.dll") # Add all .py files in Lib, except lib-tk, test + dirs={} pydirs = [(root,"Lib")] while pydirs: *************** *** 506,509 **** --- 543,556 ---- lib.glob("*.gif") lib.add_file("idle.icns") + if dir=="command": + lib.add_file("wininst.exe") + if dir=="data" and parent.physical=="test" and parent.basedir.physical=="email": + # This should contain all non-CVS files listed in CVS + for f in os.listdir(lib.absolute): + if f.endswith(".txt") or f=="CVS":continue + if f.endswith(".au") or f.endswith(".gif"): + lib.add_file(f) + else: + print "WARNING: New file %s in email/test/data" % f for f in os.listdir(lib.absolute): if os.path.isdir(os.path.join(lib.absolute, f)): *************** *** 541,544 **** --- 588,592 ---- lib = Directory(db, cab, root, "include", "include", "INCLUDE|include") lib.glob("*.h") + lib.add_file("pyconfig.h", src="../PC/pyconfig.h") # Add import libraries lib = Directory(db, cab, root, "PCBuild", "libs", "LIBS|libs") *************** *** 582,632 **** def add_registry(db): ! # File extensions, associated with the REGISTRY component # msidbComponentAttributesRegistryKeyPath = 4 add_data(db, "Component", [("REGISTRY", msilib.gen_uuid(), "TARGETDIR", 4, None, ! "InstallPath")]) add_data(db, "FeatureComponents", ! [(default_feature.id, "REGISTRY")]) ! add_data(db, "Extension", ! # Apparently, the key file of the component is used as the command; ! # the verb table only contributes the arguments. As the result, all ! # verbs for an extension must use the same command. ! # (Verb.Command is just the localized UI label of the verb) ! [(ext, 'python.exe', testprefix+'Python.File', None, default_feature.id), ! (ext+'w', 'pythonw.exe', testprefix+'Python.NoConFile', None, default_feature.id), ! (ext+'c', 'python.exe', testprefix+'Python.CompiledFile', None, default_feature.id), ! ]) ! add_data(db, "ProgId", ! [(testprefix+'Python.File', None, None, 'Python File', 'py.ico', None), ! (testprefix+'Python.NoConFile', None, None, ! 'Python File (no console)', 'py.ico', None), ! (testprefix+'Python.CompiledFile', None, None, ! 'Compiled Python File', 'pyc.ico', None)]) ! add_data(db, "Icon", ! [('py.ico', Binary(srcdir+r"\PC\py.ico")), ! ('pyc.ico', Binary(srcdir+r"\PC\pyc.ico"))]) ! add_data(db, "Verb", ! [(ext, 'open', 1, None, '"%1" %*'), ! (ext+'w', 'open', 1, None, '"%1" %*'), ! (ext+'c', 'open', 1, None, '"%1" %*'), ! ]) ! # IDLE verbs depend on the tcltk feature. ! # For several reasons (see above) we cannot author them into the Verb table ! add_data(db, "Component", ! [("REGISTRY.tcl", msilib.gen_uuid(), "TARGETDIR", 4, None, ! None)]) ! add_data(db, "FeatureComponents", [(tcltk.id, "REGISTRY.tcl")]) ! pat = r"Software\Classes\%sPython.%sFile\shell\Edit with IDLE\command" add_data(db, "Registry", ! [("IDLE.py", -1, pat % (testprefix, ""), "", r'"[TARGETDIR]pythonw.exe" "[TARGETDIR]Lib\idlelib\idle.pyw" -n -e "%1"', "REGISTRY.tcl"), ! ("IDLE.pyw", -1, pat % (testprefix, "NoCon"), "", r'"[TARGETDIR]pythonw.exe" "[TARGETDIR]Lib\idlelib\idle.pyw" -n -e "%1"', ! "REGISTRY.tcl") ]) # Registry keys - # -1 for Root specifies "dependent on ALLUSERS property" prefix = r"Software\%sPython\PythonCore\%s" % (testprefix, short_version) add_data(db, "Registry", --- 630,698 ---- def add_registry(db): ! # File extensions, associated with the REGISTRY.def component ! # IDLE verbs depend on the tcltk feature. # msidbComponentAttributesRegistryKeyPath = 4 + # -1 for Root specifies "dependent on ALLUSERS property" add_data(db, "Component", [("REGISTRY", msilib.gen_uuid(), "TARGETDIR", 4, None, ! "InstallPath"), ! ("REGISTRY.def", msilib.gen_uuid(), "TARGETDIR", 4, ! "DEFAULTPYTHON=1", None), ! ("REGISTRY.tcl", msilib.gen_uuid(), "TARGETDIR", 4, ! "DEFAULTPYTHON=1", None)]) add_data(db, "FeatureComponents", ! [(default_feature.id, "REGISTRY"), ! (default_feature.id, "REGISTRY.def"), ! (tcltk.id, "REGISTRY.tcl")]) ! ! pat = r"Software\Classes\%sPython.%sFile\shell\%s\command" ! ewi = "Edit with IDLE" ! pat2 = r"Software\Classes\%sPython.%sFile\DefaultIcon" ! pat3 = r"Software\Classes\%sPython.%sFile" add_data(db, "Registry", ! [# Extensions ! ("py.ext", -1, r"Software\Classes\."+ext, "", ! "Python.File", "REGISTRY.def"), ! ("pyw.ext", -1, r"Software\Classes\."+ext+'w', "", ! "Python.NoConFile", "REGISTRY.def"), ! ("pyc.ext", -1, r"Software\Classes\."+ext+'c', "", ! "Python.CompiledFile", "REGISTRY.def"), ! ("pyo.ext", -1, r"Software\Classes\."+ext+'o', "", ! "Python.CompiledFile", "REGISTRY.def"), ! # MIME types ! ("py.mime", -1, r"Software\Classes\."+ext, "Content Type", ! "text/plain", "REGISTRY.def"), ! ("pyw.mime", -1, r"Software\Classes\."+ext+'w', "Content Type", ! "text/plain", "REGISTRY.def"), ! #Verbs ! ("py.open", -1, pat % (testprefix, "", "open"), "", ! r'"[TARGETDIR]python.exe" "%1" %*', "REGISTRY.def"), ! ("pyw.open", -1, pat % (testprefix, "NoCon", "open"), "", ! r'"[TARGETDIR]pythonw.exe" "%1" %*', "REGISTRY.def"), ! ("pyc.open", -1, pat % (testprefix, "Compiled", "open"), "", ! r'"[TARGETDIR]python.exe" "%1" %*', "REGISTRY.def"), ! ("py.IDLE", -1, pat % (testprefix, "", ewi), "", r'"[TARGETDIR]pythonw.exe" "[TARGETDIR]Lib\idlelib\idle.pyw" -n -e "%1"', "REGISTRY.tcl"), ! ("pyw.IDLE", -1, pat % (testprefix, "NoCon", ewi), "", r'"[TARGETDIR]pythonw.exe" "[TARGETDIR]Lib\idlelib\idle.pyw" -n -e "%1"', ! "REGISTRY.tcl"), ! #Icons ! ("py.icon", -1, pat2 % (testprefix, ""), "", ! r'[TARGETDIR]py.ico', "REGISTRY.def"), ! ("pyw.icon", -1, pat2 % (testprefix, "NoCon"), "", ! r'[TARGETDIR]py.ico', "REGISTRY.def"), ! ("pyc.icon", -1, pat2 % (testprefix, "Compiled"), "", ! r'[TARGETDIR]pyc.ico', "REGISTRY.def"), ! # Descriptions ! ("py.txt", -1, pat3 % (testprefix, ""), "", ! "Python File", "REGISTRY.def"), ! ("pyw.txt", -1, pat3 % (testprefix, "NoCon"), "", ! "Python File (no console)", "REGISTRY.def"), ! ("pyc.txt", -1, pat3 % (testprefix, "Compiled"), "", ! "Compiled Python File", "REGISTRY.def"), ]) + # Registry keys prefix = r"Software\%sPython\PythonCore\%s" % (testprefix, short_version) add_data(db, "Registry", *************** *** 640,644 **** ("Modules", -1, prefix+r"\Modules", "+", None, "REGISTRY"), ("AppPaths", -1, r"Software\Microsoft\Windows\CurrentVersion\App Paths\Python.exe", ! "", r"[TARGETDIR]Python.exe", "REGISTRY") ]) # Shortcuts --- 706,710 ---- ("Modules", -1, prefix+r"\Modules", "+", None, "REGISTRY"), ("AppPaths", -1, r"Software\Microsoft\Windows\CurrentVersion\App Paths\Python.exe", ! "", r"[TARGETDIR]Python.exe", "REGISTRY.def") ]) # Shortcuts

1 0

python/nondist/sandbox/msi msilib.py,1.2,1.3
by loewis＠users.sourceforge.net Jan. 2, 2004

Jan. 2, 2004

Update of /cvsroot/python/python/nondist/sandbox/msi In directory sc8-pr-cvs1:/tmp/cvs-serv17402 Modified Files: msilib.py Log Message: Locate cabarc in registry. Add value= to radiobuttons. Support control conditions. Index: msilib.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/msi/msilib.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** msilib.py 30 Dec 2003 15:02:42 -0000 1.2 --- msilib.py 2 Jan 2004 20:42:24 -0000 1.3 *************** *** 6,10 **** import pythoncom from win32com.client import constants ! import re, string, os, sets, glob, popen2, sys Win64 = 0 --- 6,10 ---- import pythoncom from win32com.client import constants ! import re, string, os, sets, glob, popen2, sys, _winreg Win64 = 0 *************** *** 357,361 **** except OSError: pass ! f = popen2.popen4(r"cabarc.exe n %s.cab @%s.txt" % (self.name, self.name))[0] for line in f: if line.startswith(" -- adding "): --- 357,374 ---- except OSError: pass ! for k, v in [(r"Software\Microsoft\VisualStudio\7.1\Setup\VS", "VS7CommonBinDir"), ! (r"Software\Microsoft\Win32SDK\Directories", "Install Dir")]: ! try: ! key = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, k) ! except WindowsError: ! continue ! cabarc = os.path.join(_winreg.QueryValueEx(key, v)[0], r"Bin", "cabarc.exe") ! _winreg.CloseKey(key) ! assert os.path.exists(cabarc), cabarc ! break ! else: ! print "WARNING: cabarc.exe not found in registry" ! cabarc = "cabarc.exe" ! f = popen2.popen4(r'"%s" n %s.cab @%s.txt' % (cabarc, self.name, self.name))[0] for line in f: if line.startswith(" -- adding "): *************** *** 526,529 **** --- 539,546 ---- [(self.dlg.name, self.name, ev, attr)]) + def condition(self, action, condition): + add_data(self.dlg.db, "ControlCondition", + [(self.dlg.name, self.name, action, condition)]) + class RadioButtonGroup(Control): def __init__(self, dlg, name, property): *************** *** 533,539 **** self.index = 1 ! def add(self, name, x, y, w, h, text): add_data(self.dlg.db, "RadioButton", ! [(self.property, self.index, name, x, y, w, h, text, None)]) self.index += 1 --- 550,558 ---- self.index = 1 ! def add(self, name, x, y, w, h, text, value = None): ! if value is None: ! value = name add_data(self.dlg.db, "RadioButton", ! [(self.property, self.index, value, x, y, w, h, text, None)]) self.index += 1

1 0

[Python-checkins] python/nondist/sandbox/parrotbench README.txt, 1.7, 1.8
by gvanrossum＠users.sourceforge.net Jan. 2, 2004

Jan. 2, 2004

Update of /cvsroot/python/python/nondist/sandbox/parrotbench In directory sc8-pr-cvs1:/tmp/cvs-serv5581 Modified Files: README.txt Log Message: Release 1.0.4. No changes in benchmark this time, just in t.py and Makefile. Index: README.txt =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/README.txt,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** README.txt 1 Jan 2004 16:48:11 -0000 1.7 --- README.txt 2 Jan 2004 19:37:56 -0000 1.8 *************** *** 1,8 **** ! Parrot benchmark 1.0.3 ====================== ! [This is version 1.0.3, with a bugfix for the Mac OSX issue that Dan ! reported, and two further bugfixes for the dict ordering problem noted ! by Samuele Pedroni.] This is a benchmark to be run in front of a live audience at OSCON --- 1,8 ---- ! Parrot benchmark 1.0.4 ====================== ! [This is version 1.0.4, with a bugfix for the Mac OSX issue that Dan ! reported, two further bugfixes for the dict ordering problem noted by ! Samuele Pedroni, and an updated Makefile and t.py driver for Windows.] This is a benchmark to be run in front of a live audience at OSCON

1 0

python/nondist/sandbox/parrotbench t.py,1.2,1.3
by gvanrossum＠users.sourceforge.net Jan. 2, 2004

Jan. 2, 2004

Update of /cvsroot/python/python/nondist/sandbox/parrotbench In directory sc8-pr-cvs1:/tmp/cvs-serv5400 Modified Files: t.py Log Message: Fix the timing driver now that b.py has a main() of itself. Index: t.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/t.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** t.py 31 Dec 2003 21:51:48 -0000 1.2 --- t.py 2 Jan 2004 19:36:46 -0000 1.3 *************** *** 3,7 **** import time t0 = time.clock() ! import b t1 = time.clock() print >>sys.stderr, "%.3f seconds" % (t1-t0) --- 3,7 ---- import time t0 = time.clock() ! import b; b.main() t1 = time.clock() print >>sys.stderr, "%.3f seconds" % (t1-t0)

1 0

python/dist/src/Lib/test pystone.py,1.7,1.8
by aleax＠users.sourceforge.net Jan. 2, 2004

Jan. 2, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv11491 Modified Files: pystone.py Log Message: The script now takes an optional command-line argument to specify how many loops to run (default remains 50,000 if no argument is specified). Index: pystone.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/pystone.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pystone.py 6 Aug 2002 17:21:20 -0000 1.7 --- pystone.py 2 Jan 2004 17:11:54 -0000 1.8 *************** *** 58,65 **** FALSE = 0 ! def main(): ! benchtime, stones = pystones() print "Pystone(%s) time for %d passes = %g" % \ ! (__version__, LOOPS, benchtime) print "This machine benchmarks at %g pystones/second" % stones --- 58,65 ---- FALSE = 0 ! def main(loops=LOOPS): ! benchtime, stones = pystones(loops) print "Pystone(%s) time for %d passes = %g" % \ ! (__version__, loops, benchtime) print "This machine benchmarks at %g pystones/second" % stones *************** *** 250,252 **** if __name__ == '__main__': ! main() --- 250,267 ---- if __name__ == '__main__': ! import sys ! def error(msg): ! print >>sys.stderr, msg, ! print >>sys.stderr, "usage: %s [number_of_loops]" % sys.argv[0] ! sys.exit(100) ! nargs = len(sys.argv) - 1 ! if nargs > 1: ! error("%d arguments are too many;" % nargs) ! elif nargs == 1: ! try: loops = int(sys.argv[1]) ! except ValueError: ! error("Invalid argument %r;" % sys.argv[1]) ! else: ! loops = LOOPS ! main(loops) !

1 0

python/dist/src/Lib tarfile.py,1.9,1.10
by akuchling＠users.sourceforge.net Jan. 2, 2004

Jan. 2, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv26203 Modified Files: tarfile.py Log Message: [Bug #812325 ] tarfile.close() can write out more bytes to the output than are specified by the buffer size. The patch calls .__write() to ensure that any full blocks are written out. Index: tarfile.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/tarfile.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tarfile.py 24 Oct 2003 17:38:34 -0000 1.9 --- tarfile.py 2 Jan 2004 15:44:29 -0000 1.10 *************** *** 354,357 **** --- 354,358 ---- if self.type != "tar": self.buf += self.cmp.flush() + self.__write("") # Write remaining blocks to output self.fileobj.write(self.buf) self.buf = ""

1 0

python/nondist/peps pep-0323.txt,1.2,1.3
by aleax＠users.sourceforge.net Jan. 2, 2004

Jan. 2, 2004

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1:/tmp/cvs-serv30291 Modified Files: pep-0323.txt Log Message: fixed 2 typos in example code kindly pointed out by Tom Jenkins. Index: pep-0323.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0323.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pep-0323.txt 29 Oct 2003 13:39:51 -0000 1.2 --- pep-0323.txt 2 Jan 2004 09:15:55 -0000 1.3 *************** *** 144,148 **** def __copy__(self): ! result = self.__class__(sequence) result.index = self.index return result --- 144,148 ---- def __copy__(self): ! result = self.__class__(self.sequence) result.index = self.index return result *************** *** 331,335 **** def __copy__(self): ! result = self.__class__.new() result.it = self.it.__copy__() result.i = self.i --- 331,335 ---- def __copy__(self): ! result = self.__class__.__new__() result.it = self.it.__copy__() result.i = self.i

1 0

[Python-checkins] python/dist/src/Doc/whatsnew whatsnew20.tex, 1.50, 1.51 whatsnew21.tex, 1.31, 1.32 whatsnew22.tex, 1.63, 1.64 whatsnew23.tex, 1.164, 1.165 whatsnew24.tex, 1.23, 1.24
by fdrake＠users.sourceforge.net Jan. 2, 2004

Jan. 2, 2004

Update of /cvsroot/python/python/dist/src/Doc/whatsnew In directory sc8-pr-cvs1:/tmp/cvs-serv10936/whatsnew Modified Files: whatsnew20.tex whatsnew21.tex whatsnew22.tex whatsnew23.tex whatsnew24.tex Log Message: list the Python Software Foundation on all the documents Index: whatsnew20.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/whatsnew/whatsnew20.tex,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** whatsnew20.tex 30 Dec 2003 17:16:41 -0000 1.50 --- whatsnew20.tex 2 Jan 2004 06:57:49 -0000 1.51 *************** *** 6,10 **** \release{1.02} \author{A.M. Kuchling and Moshe Zadka} ! \authoraddress{\email{amk(a)amk.ca}, \email{moshez(a)twistedmatrix.com} } \begin{document} \maketitle\tableofcontents --- 6,13 ---- \release{1.02} \author{A.M. Kuchling and Moshe Zadka} ! \authoraddress{ ! \strong{Python Software Foundation}\\ ! Email: \email{amk(a)amk.ca}, \email{moshez(a)twistedmatrix.com} ! } \begin{document} \maketitle\tableofcontents Index: whatsnew21.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/whatsnew/whatsnew21.tex,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** whatsnew21.tex 22 Jul 2003 00:52:42 -0000 1.31 --- whatsnew21.tex 2 Jan 2004 06:57:50 -0000 1.32 *************** *** 8,12 **** \release{1.00} \author{A.M. Kuchling} ! \authoraddress{\email{amk(a)amk.ca}} \begin{document} \maketitle\tableofcontents --- 8,15 ---- \release{1.00} \author{A.M. Kuchling} ! \authoraddress{ ! \strong{Python Software Foundation}\\ ! Email: \email{amk(a)amk.ca} ! } \begin{document} \maketitle\tableofcontents Index: whatsnew22.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/whatsnew/whatsnew22.tex,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** whatsnew22.tex 29 Aug 2003 17:49:26 -0000 1.63 --- whatsnew22.tex 2 Jan 2004 06:57:50 -0000 1.64 *************** *** 6,10 **** \release{1.02} \author{A.M. Kuchling} ! \authoraddress{\email{amk(a)amk.ca}} \begin{document} \maketitle\tableofcontents --- 6,13 ---- \release{1.02} \author{A.M. Kuchling} ! \authoraddress{ ! \strong{Python Software Foundation}\\ ! Email: \email{amk(a)amk.ca} ! } \begin{document} \maketitle\tableofcontents Index: whatsnew23.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/whatsnew/whatsnew23.tex,v retrieving revision 1.164 retrieving revision 1.165 diff -C2 -d -r1.164 -r1.165 *** whatsnew23.tex 23 Dec 2003 16:46:41 -0000 1.164 --- whatsnew23.tex 2 Jan 2004 06:57:50 -0000 1.165 *************** *** 6,10 **** \release{1.01} \author{A.M.\ Kuchling} ! \authoraddress{\email{amk(a)amk.ca}} \begin{document} --- 6,13 ---- \release{1.01} \author{A.M.\ Kuchling} ! \authoraddress{ ! \strong{Python Software Foundation}\\ ! Email: \email{amk(a)amk.ca} ! } \begin{document} Index: whatsnew24.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/whatsnew/whatsnew24.tex,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** whatsnew24.tex 1 Jan 2004 18:33:34 -0000 1.23 --- whatsnew24.tex 2 Jan 2004 06:57:50 -0000 1.24 *************** *** 6,10 **** \release{0.0} \author{A.M.\ Kuchling} ! \authoraddress{\email{amk(a)amk.ca}} \begin{document} --- 6,13 ---- \release{0.0} \author{A.M.\ Kuchling} ! \authoraddress{ ! \strong{Python Software Foundation}\\ ! Email: \email{amk(a)amk.ca} ! } \begin{document}

1 0