Mailman 3 December 2004 - Python-checkins

python/dist/src/Lib cgi.py,1.81,1.82
by rhettinger＠users.sourceforge.net Dec. 31, 2004

Dec. 31, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5023 Modified Files: cgi.py Log Message: Remove some lambdas. Index: cgi.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/cgi.py,v retrieving revision 1.81 retrieving revision 1.82 diff -u -d -r1.81 -r1.82 --- cgi.py 31 Dec 2004 19:15:26 -0000 1.81 +++ cgi.py 31 Dec 2004 21:59:02 -0000 1.82 @@ -34,6 +34,7 @@ # Imports # ======= +from operator import attrgetter import sys import os import urllib @@ -331,7 +332,7 @@ Return the main content-type and a dictionary of options. """ - plist = map(lambda x: x.strip(), line.split(';')) + plist = [x.strip() for x in line.split(';')] key = plist.pop(0).lower() pdict = {} for p in plist: @@ -570,7 +571,7 @@ if key in self: value = self[key] if type(value) is type([]): - return map(lambda v: v.value, value) + return map(attrgetter('value'), value) else: return value.value else: @@ -592,7 +593,7 @@ if key in self: value = self[key] if type(value) is type([]): - return map(lambda v: v.value, value) + return map(attrgetter('value'), value) else: return [value.value] else:

1 0

python/dist/src/Lib SimpleHTTPServer.py, 1.22, 1.23 SocketServer.py, 1.37, 1.38 cgi.py, 1.80, 1.81 gettext.py, 1.24, 1.25 mhlib.py, 1.37, 1.38 tarfile.py, 1.21, 1.22 urllib.py, 1.165, 1.166 urlparse.py, 1.45, 1.46
by rhettinger＠users.sourceforge.net Dec. 31, 2004

Dec. 31, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5738 Modified Files: SimpleHTTPServer.py SocketServer.py cgi.py gettext.py mhlib.py tarfile.py urllib.py urlparse.py Log Message: Use cStringIO where available. Index: SimpleHTTPServer.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/SimpleHTTPServer.py,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- SimpleHTTPServer.py 21 Aug 2004 10:43:29 -0000 1.22 +++ SimpleHTTPServer.py 31 Dec 2004 19:15:26 -0000 1.23 @@ -17,7 +17,10 @@ import cgi import shutil import mimetypes -from StringIO import StringIO +try: + from cStringIO import StringIO +except ImportError: + from StringIO import StringIO class SimpleHTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): Index: SocketServer.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/SocketServer.py,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- SocketServer.py 9 Oct 2003 23:48:52 -0000 1.37 +++ SocketServer.py 31 Dec 2004 19:15:26 -0000 1.38 @@ -575,10 +575,13 @@ """Define self.rfile and self.wfile for datagram sockets.""" def setup(self): - import StringIO + try: + from cStringIO import StringIO + except ImportError: + from StringIO import StringIO self.packet, self.socket = self.request - self.rfile = StringIO.StringIO(self.packet) - self.wfile = StringIO.StringIO() + self.rfile = StringIO(self.packet) + self.wfile = StringIO() def finish(self): self.socket.sendto(self.wfile.getvalue(), self.client_address) Index: cgi.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/cgi.py,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -r1.80 -r1.81 --- cgi.py 14 Aug 2004 15:39:34 -0000 1.80 +++ cgi.py 31 Dec 2004 19:15:26 -0000 1.81 @@ -40,7 +40,10 @@ import mimetools import rfc822 import UserDict -from StringIO import StringIO +try: + from cStringIO import StringIO +except ImportError: + from StringIO import StringIO __all__ = ["MiniFieldStorage", "FieldStorage", "FormContentDict", "SvFormContentDict", "InterpFormContentDict", "FormContent", Index: gettext.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/gettext.py,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- gettext.py 22 Jul 2004 18:44:00 -0000 1.24 +++ gettext.py 31 Dec 2004 19:15:26 -0000 1.25 @@ -77,7 +77,10 @@ Python lambda function that implements an equivalent expression. """ # Security check, allow only the "n" identifier - from StringIO import StringIO + try: + from cStringIO import StringIO + except ImportError: + from StringIO import StringIO import token, tokenize tokens = tokenize.generate_tokens(StringIO(plural).readline) try: Index: mhlib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/mhlib.py,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- mhlib.py 12 Feb 2004 17:35:06 -0000 1.37 +++ mhlib.py 31 Dec 2004 19:15:26 -0000 1.38 @@ -697,7 +697,10 @@ encoding = self.getencoding() if not decode or encoding in ('', '7bit', '8bit', 'binary'): return self.fp.read() - from StringIO import StringIO + try: + from cStringIO import StringIO + except ImportError: + from StringIO import StringIO output = StringIO() mimetools.decode(self.fp, output, encoding) return output.getvalue() Index: tarfile.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/tarfile.py,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- tarfile.py 20 Oct 2004 11:48:42 -0000 1.21 +++ tarfile.py 31 Dec 2004 19:15:26 -0000 1.22 @@ -1936,12 +1936,15 @@ def write(self, filename, arcname=None, compress_type=None): self.tarfile.add(filename, arcname) def writestr(self, zinfo, bytes): - import StringIO + try: + from cStringIO import StringIO + except ImportError: + from StringIO import StringIO import calendar zinfo.name = zinfo.filename zinfo.size = zinfo.file_size zinfo.mtime = calendar.timegm(zinfo.date_time) - self.tarfile.addfile(zinfo, StringIO.StringIO(bytes)) + self.tarfile.addfile(zinfo, StringIO(bytes)) def close(self): self.tarfile.close() #class TarFileCompat Index: urllib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/urllib.py,v retrieving revision 1.165 retrieving revision 1.166 diff -u -d -r1.165 -r1.166 --- urllib.py 11 Oct 2004 13:53:07 -0000 1.165 +++ urllib.py 31 Dec 2004 19:15:26 -0000 1.166 @@ -410,7 +410,11 @@ def open_local_file(self, url): """Use local file.""" - import mimetypes, mimetools, email.Utils, StringIO + import mimetypes, mimetools, email.Utils + try: + from cStringIO import StringIO + except ImportError: + from StringIO import StringIO host, file = splithost(url) localname = url2pathname(file) try: @@ -420,7 +424,7 @@ size = stats.st_size modified = email.Utils.formatdate(stats.st_mtime, usegmt=True) mtype = mimetypes.guess_type(url)[0] - headers = mimetools.Message(StringIO.StringIO( + headers = mimetools.Message(StringIO( 'Content-Type: %s\nContent-Length: %d\nLast-modified: %s\n' % (mtype or 'text/plain', size, modified))) if not host: @@ -441,7 +445,11 @@ def open_ftp(self, url): """Use FTP protocol.""" - import mimetypes, mimetools, StringIO + import mimetypes, mimetools + try: + from cStringIO import StringIO + except ImportError: + from StringIO import StringIO host, path = splithost(url) if not host: raise IOError, ('ftp error', 'no host given') host, port = splitport(host) @@ -490,7 +498,7 @@ headers += "Content-Type: %s\n" % mtype if retrlen is not None and retrlen >= 0: headers += "Content-Length: %d\n" % retrlen - headers = mimetools.Message(StringIO.StringIO(headers)) + headers = mimetools.Message(StringIO(headers)) return addinfourl(fp, headers, "ftp:" + url) except ftperrors(), msg: raise IOError, ('ftp error', msg), sys.exc_info()[2] @@ -504,7 +512,11 @@ # mediatype := [ type "/" subtype ] *( ";" parameter ) # data := *urlchar # parameter := attribute "=" value - import StringIO, mimetools + import mimetools + try: + from cStringIO import StringIO + except ImportError: + from StringIO import StringIO try: [type, data] = url.split(',', 1) except ValueError: @@ -530,7 +542,7 @@ msg.append('') msg.append(data) msg = '\n'.join(msg) - f = StringIO.StringIO(msg) + f = StringIO(msg) headers = mimetools.Message(f, 0) f.fileno = None # needed for addinfourl return addinfourl(f, headers, url) @@ -697,8 +709,11 @@ global _noheaders if _noheaders is None: import mimetools - import StringIO - _noheaders = mimetools.Message(StringIO.StringIO(), 0) + try: + from cStringIO import StringIO + except ImportError: + from StringIO import StringIO + _noheaders = mimetools.Message(StringIO(), 0) _noheaders.fp.close() # Recycle file descriptor return _noheaders Index: urlparse.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/urlparse.py,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- urlparse.py 29 Jun 2004 04:02:39 -0000 1.45 +++ urlparse.py 31 Dec 2004 19:15:26 -0000 1.46 @@ -243,8 +243,11 @@ else: fp = open(fn) else: - import StringIO - fp = StringIO.StringIO(test_input) + try: + from cStringIO import StringIO + except ImportError: + from StringIO import StringIO + fp = StringIO(test_input) while 1: line = fp.readline() if not line: break

1 0

python/dist/src/PC .cvsignore,1.1,1.2
by theller＠users.sourceforge.net Dec. 31, 2004

Dec. 31, 2004

Update of /cvsroot/python/python/dist/src/PC In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7886 Modified Files: .cvsignore Log Message: cvsignore files generated by make_versioninfo. Index: .cvsignore =================================================================== RCS file: /cvsroot/python/python/dist/src/PC/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 10 Oct 2003 16:57:40 -0000 1.1 +++ .cvsignore 31 Dec 2004 16:37:32 -0000 1.2 @@ -1,2 +1,4 @@ +python_nt.h +python_nt_d.h pythonnt_rc.h pythonnt_rc_d.h

1 0

python/dist/src/Mac/scripts BuildApplet.py, 1.21, 1.21.4.1
by jackjansen＠users.sourceforge.net Dec. 31, 2004

Dec. 31, 2004

Update of /cvsroot/python/python/dist/src/Mac/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2806/Mac/scripts Modified Files: Tag: release24-maint BuildApplet.py Log Message: Backport: Fix for #1091468: DESTROOTed frameworkinstalls fail. Added a --destroot option to various tools, and do the right thing when we're doing a destroot install. Index: BuildApplet.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Mac/scripts/BuildApplet.py,v retrieving revision 1.21 retrieving revision 1.21.4.1 diff -u -d -r1.21 -r1.21.4.1 --- BuildApplet.py 18 Jul 2004 05:58:15 -0000 1.21 +++ BuildApplet.py 31 Dec 2004 11:23:20 -0000 1.21.4.1 @@ -53,8 +53,8 @@ buildtools.process(template, filename, dstfilename, 1) else: - SHORTOPTS = "o:r:ne:v?P" - LONGOPTS=("output=", "resource=", "noargv", "extra=", "verbose", "help", "python=") + SHORTOPTS = "o:r:ne:v?PR" + LONGOPTS=("output=", "resource=", "noargv", "extra=", "verbose", "help", "python=", "destroot=") try: options, args = getopt.getopt(sys.argv[1:], SHORTOPTS, LONGOPTS) except getopt.error: @@ -67,6 +67,7 @@ raw = 0 extras = [] verbose = None + destroot = '' for opt, arg in options: if opt in ('-o', '--output'): dstfilename = arg @@ -87,6 +88,8 @@ verbose = Verbose() elif opt in ('-?', '--help'): usage() + elif opt in ('-d', '--destroot'): + destroot = arg # On OS9 always be verbose if sys.platform == 'mac' and not verbose: verbose = 'default' @@ -97,7 +100,8 @@ buildtools.update(template, filename, dstfilename) else: buildtools.process(template, filename, dstfilename, 1, - rsrcname=rsrcfilename, others=extras, raw=raw, progress=verbose) + rsrcname=rsrcfilename, others=extras, raw=raw, + progress=verbose, destroot=destroot) def usage(): print "BuildApplet creates an application from a Python source file"

1 0

python/dist/src/Mac/OSX Makefile,1.54,1.54.4.1
by jackjansen＠users.sourceforge.net Dec. 31, 2004

Dec. 31, 2004

Update of /cvsroot/python/python/dist/src/Mac/OSX In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2806/Mac/OSX Modified Files: Tag: release24-maint Makefile Log Message: Backport: Fix for #1091468: DESTROOTed frameworkinstalls fail. Added a --destroot option to various tools, and do the right thing when we're doing a destroot install. Index: Makefile =================================================================== RCS file: /cvsroot/python/python/dist/src/Mac/OSX/Makefile,v retrieving revision 1.54 retrieving revision 1.54.4.1 diff -u -d -r1.54 -r1.54.4.1 --- Makefile 2 Jun 2004 20:06:38 -0000 1.54 +++ Makefile 31 Dec 2004 11:23:20 -0000 1.54.4.1 @@ -2,7 +2,7 @@ # main Makefile. The next couple of variables are overridden on the # commandline in that case. -VERSION=2.4 +VERSION=2.5 builddir = ../.. srcdir = ../.. prefix=/Library/Frameworks/Python.framework/Versions/$(VERSION) @@ -120,10 +120,12 @@ echo See Mac/OSX/README for details; \ else \ echo $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \ + --destroot $(DESTDIR) \ --python $(INSTALLED_PYTHONW) \ --output $(DESTDIR)$(PYTHONAPPSDIR)/PythonIDE.app --noargv \ $(srcdir)/Mac/Tools/IDE/PythonIDE.py ; \ $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \ + --destroot $(DESTDIR) \ --python $(INSTALLED_PYTHONW) \ --output $(DESTDIR)$(PYTHONAPPSDIR)/PythonIDE.app --noargv \ $(srcdir)/Mac/Tools/IDE/PythonIDE.py; \ @@ -136,6 +138,7 @@ else \ echo $(BUILDPYTHON) $(bundlebuilder) \ --builddir $(DESTDIR)$(PYTHONAPPSDIR)/ \ + --destroot $(DESTDIR) \ --python $(INSTALLED_PYTHONW) \ --resource $(srcdir)/Mac/Tools/IDE/PythonIDE.rsrc \ --mainprogram $(srcdir)/Mac/Tools/IDE/PackageManager.py \ @@ -143,6 +146,7 @@ --creator Pimp build; \ $(BUILDPYTHON) $(bundlebuilder) \ --builddir $(DESTDIR)$(PYTHONAPPSDIR)/ \ + --destroot $(DESTDIR) \ --python $(INSTALLED_PYTHONW) \ --resource $(srcdir)/Mac/Tools/IDE/PythonIDE.rsrc \ --mainprogram $(srcdir)/Mac/Tools/IDE/PackageManager.py \ @@ -157,11 +161,13 @@ else \ echo $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \ --python $(INSTALLED_PYTHONW) \ + --destroot $(DESTDIR) \ --output $(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app \ --extra $(srcdir)/Lib/idlelib \ $(srcdir)/Tools/scripts/idle ; \ $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \ --python $(INSTALLED_PYTHONW) \ + --destroot $(DESTDIR) \ --output $(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app \ --extra $(srcdir)/Lib/idlelib:Contents/Resources/idlelib \ $(srcdir)/Tools/scripts/idle ; \ @@ -170,6 +176,7 @@ install_BuildApplet: $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \ + --destroot $(DESTDIR) \ --python $(INSTALLED_PYTHONW) \ --output $(DESTDIR)$(PYTHONAPPSDIR)/BuildApplet.app \ $(srcdir)/Mac/scripts/BuildApplet.py

1 0

python/dist/src/Lib/plat-mac buildtools.py, 1.12, 1.12.4.1 bundlebuilder.py, 1.36, 1.36.10.1
by jackjansen＠users.sourceforge.net Dec. 31, 2004

Dec. 31, 2004

Update of /cvsroot/python/python/dist/src/Lib/plat-mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2806/Lib/plat-mac Modified Files: Tag: release24-maint buildtools.py bundlebuilder.py Log Message: Backport: Fix for #1091468: DESTROOTed frameworkinstalls fail. Added a --destroot option to various tools, and do the right thing when we're doing a destroot install. Index: buildtools.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/buildtools.py,v retrieving revision 1.12 retrieving revision 1.12.4.1 diff -u -d -r1.12 -r1.12.4.1 --- buildtools.py 18 Jul 2004 06:14:45 -0000 1.12 +++ buildtools.py 31 Dec 2004 11:23:19 -0000 1.12.4.1 @@ -60,7 +60,7 @@ return file def process(template, filename, destname, copy_codefragment=0, - rsrcname=None, others=[], raw=0, progress="default"): + rsrcname=None, others=[], raw=0, progress="default", destroot=""): if progress == "default": progress = EasyDialogs.ProgressBar("Processing %s..."%os.path.split(filename)[1], 120) @@ -108,7 +108,7 @@ except os.error: pass process_common(template, progress, code, rsrcname, destname, 0, - copy_codefragment, raw, others, filename) + copy_codefragment, raw, others, filename, destroot) def update(template, filename, output): @@ -130,10 +130,10 @@ def process_common(template, progress, code, rsrcname, destname, is_update, - copy_codefragment, raw=0, others=[], filename=None): + copy_codefragment, raw=0, others=[], filename=None, destroot=""): if MacOS.runtimemodel == 'macho': return process_common_macho(template, progress, code, rsrcname, destname, - is_update, raw, others, filename) + is_update, raw, others, filename, destroot) if others: raise BuildError, "Extra files only allowed for MachoPython applets" # Create FSSpecs for the various files @@ -265,7 +265,7 @@ progress.inc(0) def process_common_macho(template, progress, code, rsrcname, destname, is_update, - raw=0, others=[], filename=None): + raw=0, others=[], filename=None, destroot=""): # Check that we have a filename if filename is None: raise BuildError, "Need source filename on MacOSX" @@ -302,6 +302,7 @@ builder.mainprogram = filename builder.builddir = destdir builder.name = shortname + builder.destroot = destroot if rsrcname: realrsrcname = macresource.resource_pathname(rsrcname) builder.files.append((realrsrcname, Index: bundlebuilder.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/bundlebuilder.py,v retrieving revision 1.36 retrieving revision 1.36.10.1 diff -u -d -r1.36 -r1.36.10.1 --- bundlebuilder.py 10 Jul 2003 14:53:27 -0000 1.36 +++ bundlebuilder.py 31 Dec 2004 11:23:20 -0000 1.36.10.1 @@ -110,6 +110,9 @@ # Verbosity level. verbosity = 1 + + # Destination root directory + destroot = "" def setup(self): # XXX rethink self.name munging, this is brittle. @@ -445,7 +448,7 @@ execname = os.path.basename(self.executable) execpath = pathjoin(self.execdir, execname) if not self.symlink_exec: - self.files.append((self.executable, execpath)) + self.files.append((self.destroot + self.executable, execpath)) self.execpath = execpath if self.mainprogram is not None: @@ -828,7 +831,7 @@ "mainprogram=", "creator=", "nib=", "plist=", "link", "link-exec", "help", "verbose", "quiet", "argv", "standalone", "exclude=", "include=", "package=", "strip", "iconfile=", - "lib=", "python=", "semi-standalone", "bundle-id=") + "lib=", "python=", "semi-standalone", "bundle-id=", "destroot=") try: options, args = getopt.getopt(sys.argv[1:], shortopts, longopts) @@ -890,6 +893,8 @@ builder.includePackages.append(arg) elif opt == '--strip': builder.strip = 1 + elif opt == '--destroot': + builder.destroot = arg if len(args) != 1: usage("Must specify one command ('build', 'report' or 'help')")

1 0

python/dist/src/Mac/scripts BuildApplet.py, 1.20, 1.20.8.1
by jackjansen＠users.sourceforge.net Dec. 31, 2004

Dec. 31, 2004

Update of /cvsroot/python/python/dist/src/Mac/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28333/Mac/scripts Modified Files: Tag: release23-maint BuildApplet.py Log Message: Backport: Fix for #1091468: DESTROOTed frameworkinstalls fail. Added a --destroot option to various tools, and do the right thing when we're doing a destroot install. Index: BuildApplet.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Mac/scripts/BuildApplet.py,v retrieving revision 1.20 retrieving revision 1.20.8.1 diff -u -d -r1.20 -r1.20.8.1 --- BuildApplet.py 25 May 2003 22:00:17 -0000 1.20 +++ BuildApplet.py 31 Dec 2004 10:44:24 -0000 1.20.8.1 @@ -53,8 +53,8 @@ buildtools.process(template, filename, dstfilename, 1) else: - SHORTOPTS = "o:r:ne:v?P" - LONGOPTS=("output=", "resource=", "noargv", "extra=", "verbose", "help", "python=") + SHORTOPTS = "o:r:ne:v?PR" + LONGOPTS=("output=", "resource=", "noargv", "extra=", "verbose", "help", "python=", "destroot=") try: options, args = getopt.getopt(sys.argv[1:], SHORTOPTS, LONGOPTS) except getopt.error: @@ -67,6 +67,7 @@ raw = 0 extras = [] verbose = None + destroot = '' for opt, arg in options: if opt in ('-o', '--output'): dstfilename = arg @@ -87,6 +88,8 @@ verbose = Verbose() elif opt in ('-?', '--help'): usage() + elif opt in ('-d', '--destroot'): + destroot = arg # On OS9 always be verbose if sys.platform == 'mac' and not verbose: verbose = 'default' @@ -97,21 +100,22 @@ buildtools.update(template, filename, dstfilename) else: buildtools.process(template, filename, dstfilename, 1, - rsrcname=rsrcfilename, others=extras, raw=raw, progress=verbose) + rsrcname=rsrcfilename, others=extras, raw=raw, + progress=verbose, destroot=destroot) def usage(): print "BuildApplet creates an application from a Python source file" print "Usage:" - print " BuildApplet interactive, single file, no options" - print " BuildApplet src1.py src2.py ... non-interactive multiple file" - print " BuildApplet [options] src.py non-interactive single file" + print " BuildApplet interactive, single file, no options" + print " BuildApplet src1.py src2.py ... non-interactive multiple file" + print " BuildApplet [options] src.py non-interactive single file" print "Options:" - print " --output o Output file; default based on source filename, short -o" - print " --resource r Resource file; default based on source filename, short -r" - print " --noargv Build applet without drag-and-drop sys.argv emulation, short -n, OSX only" - print " --extra src[:dst] Extra file to put in .app bundle, short -e, OSX only" - print " --verbose Verbose, short -v" - print " --help This message, short -?" + print " --output o Output file; default based on source filename, short -o" + print " --resource r Resource file; default based on source filename, short -r" + print " --noargv Build applet without drag-and-drop sys.argv emulation, short -n, OSX only" + print " --extra src[:dst] Extra file to put in .app bundle, short -e, OSX only" + print " --verbose Verbose, short -v" + print " --help This message, short -?" sys.exit(1) class Verbose:

1 0

python/dist/src/Lib/plat-mac bundlebuilder.py, 1.36, 1.36.6.1 buildtools.py, 1.10, 1.10.10.1
by jackjansen＠users.sourceforge.net Dec. 31, 2004

Dec. 31, 2004

Update of /cvsroot/python/python/dist/src/Lib/plat-mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28333/Lib/plat-mac Modified Files: Tag: release23-maint bundlebuilder.py buildtools.py Log Message: Backport: Fix for #1091468: DESTROOTed frameworkinstalls fail. Added a --destroot option to various tools, and do the right thing when we're doing a destroot install. Index: bundlebuilder.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/bundlebuilder.py,v retrieving revision 1.36 retrieving revision 1.36.6.1 diff -u -d -r1.36 -r1.36.6.1 --- bundlebuilder.py 10 Jul 2003 14:53:27 -0000 1.36 +++ bundlebuilder.py 31 Dec 2004 10:44:41 -0000 1.36.6.1 @@ -110,6 +110,9 @@ # Verbosity level. verbosity = 1 + + # Destination root directory + destroot = "" def setup(self): # XXX rethink self.name munging, this is brittle. @@ -445,7 +448,7 @@ execname = os.path.basename(self.executable) execpath = pathjoin(self.execdir, execname) if not self.symlink_exec: - self.files.append((self.executable, execpath)) + self.files.append((self.destroot + self.executable, execpath)) self.execpath = execpath if self.mainprogram is not None: @@ -828,7 +831,7 @@ "mainprogram=", "creator=", "nib=", "plist=", "link", "link-exec", "help", "verbose", "quiet", "argv", "standalone", "exclude=", "include=", "package=", "strip", "iconfile=", - "lib=", "python=", "semi-standalone", "bundle-id=") + "lib=", "python=", "semi-standalone", "bundle-id=", "destroot=") try: options, args = getopt.getopt(sys.argv[1:], shortopts, longopts) @@ -890,6 +893,8 @@ builder.includePackages.append(arg) elif opt == '--strip': builder.strip = 1 + elif opt == '--destroot': + builder.destroot = arg if len(args) != 1: usage("Must specify one command ('build', 'report' or 'help')") Index: buildtools.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/buildtools.py,v retrieving revision 1.10 retrieving revision 1.10.10.1 diff -u -d -r1.10 -r1.10.10.1 --- buildtools.py 22 Apr 2003 14:33:48 -0000 1.10 +++ buildtools.py 31 Dec 2004 10:44:41 -0000 1.10.10.1 @@ -60,7 +60,7 @@ return file def process(template, filename, destname, copy_codefragment=0, - rsrcname=None, others=[], raw=0, progress="default"): + rsrcname=None, others=[], raw=0, progress="default", destroot=""): if progress == "default": progress = EasyDialogs.ProgressBar("Processing %s..."%os.path.split(filename)[1], 120) @@ -108,7 +108,7 @@ except os.error: pass process_common(template, progress, code, rsrcname, destname, 0, - copy_codefragment, raw, others, filename) + copy_codefragment, raw, others, filename, destroot) def update(template, filename, output): @@ -130,10 +130,10 @@ def process_common(template, progress, code, rsrcname, destname, is_update, - copy_codefragment, raw=0, others=[], filename=None): + copy_codefragment, raw=0, others=[], filename=None, destroot=""): if MacOS.runtimemodel == 'macho': return process_common_macho(template, progress, code, rsrcname, destname, - is_update, raw, others, filename) + is_update, raw, others, filename, destroot) if others: raise BuildError, "Extra files only allowed for MachoPython applets" # Create FSSpecs for the various files @@ -265,7 +265,7 @@ progress.inc(0) def process_common_macho(template, progress, code, rsrcname, destname, is_update, - raw=0, others=[], filename=None): + raw=0, others=[], filename=None, destroot=""): # Check that we have a filename if filename is None: raise BuildError, "Need source filename on MacOSX" @@ -302,6 +302,7 @@ builder.mainprogram = filename builder.builddir = destdir builder.name = shortname + builder.destroot = destroot if rsrcname: realrsrcname = macresource.resource_pathname(rsrcname) builder.files.append((realrsrcname,

1 0

python/dist/src/Mac/OSX Makefile, 1.50.4.3, 1.50.4.4
by jackjansen＠users.sourceforge.net Dec. 31, 2004

Dec. 31, 2004

Update of /cvsroot/python/python/dist/src/Mac/OSX In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28333/Mac/OSX Modified Files: Tag: release23-maint Makefile Log Message: Backport: Fix for #1091468: DESTROOTed frameworkinstalls fail. Added a --destroot option to various tools, and do the right thing when we're doing a destroot install. Index: Makefile =================================================================== RCS file: /cvsroot/python/python/dist/src/Mac/OSX/Makefile,v retrieving revision 1.50.4.3 retrieving revision 1.50.4.4 diff -u -d -r1.50.4.3 -r1.50.4.4 --- Makefile 2 Jun 2004 20:07:42 -0000 1.50.4.3 +++ Makefile 31 Dec 2004 10:44:24 -0000 1.50.4.4 @@ -121,10 +121,12 @@ echo See Mac/OSX/README for details; \ else \ echo $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \ + --destroot $(DESTDIR) \ --python $(INSTALLED_PYTHONW) \ --output $(DESTDIR)$(PYTHONAPPSDIR)/PythonIDE.app --noargv \ $(srcdir)/Mac/Tools/IDE/PythonIDE.py ; \ $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \ + --destroot $(DESTDIR) \ --python $(INSTALLED_PYTHONW) \ --output $(DESTDIR)$(PYTHONAPPSDIR)/PythonIDE.app --noargv \ $(srcdir)/Mac/Tools/IDE/PythonIDE.py; \ @@ -137,6 +139,7 @@ else \ echo $(BUILDPYTHON) $(bundlebuilder) \ --builddir $(DESTDIR)$(PYTHONAPPSDIR)/ \ + --destroot $(DESTDIR) \ --python $(INSTALLED_PYTHONW) \ --resource $(srcdir)/Mac/Tools/IDE/PythonIDE.rsrc \ --mainprogram $(srcdir)/Mac/Tools/IDE/PackageManager.py \ @@ -145,6 +148,7 @@ --creator Pimp build; \ $(BUILDPYTHON) $(bundlebuilder) \ --builddir $(DESTDIR)$(PYTHONAPPSDIR)/ \ + --destroot $(DESTDIR) \ --python $(INSTALLED_PYTHONW) \ --resource $(srcdir)/Mac/Tools/IDE/PythonIDE.rsrc \ --mainprogram $(srcdir)/Mac/Tools/IDE/PackageManager.py \ @@ -160,11 +164,13 @@ else \ echo $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \ --python $(INSTALLED_PYTHONW) \ + --destroot $(DESTDIR) \ --output $(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app \ --extra $(srcdir)/Lib/idlelib \ $(srcdir)/Lib/idlelib/idle ; \ $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \ --python $(INSTALLED_PYTHONW) \ + --destroot $(DESTDIR) \ --output $(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app \ --extra $(srcdir)/Lib/idlelib:Contents/Resources/idlelib \ $(srcdir)/Lib/idlelib/idle ; \ @@ -173,6 +179,7 @@ install_BuildApplet: $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \ + --destroot $(DESTDIR) \ --python $(INSTALLED_PYTHONW) \ --output $(DESTDIR)$(PYTHONAPPSDIR)/BuildApplet.app \ $(srcdir)/Mac/scripts/BuildApplet.py

1 0

python/dist/src/Lib inspect.py,1.58,1.58.2.1
by jlgijsbers＠users.sourceforge.net Dec. 31, 2004

Dec. 31, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18271 Modified Files: Tag: release24-maint inspect.py Log Message: Patch #1011890: fix inspect.getsource breaking with line-continuation & more. Thanks to Simon Percivall! The patch makes changes to inspect.py in two places: * the pattern to match against functions at line 436 is modified: lambdas should be matched even if not preceded by whitespace, as long as "lambda" isn't part of another word. * the BlockFinder class is heavily modified. Changes are: - checking for "def", "class" or "lambda" names before setting self.started to True. Then checking the same line for word characters after the colon (if the colon is on that line). If so, and the line does not end with a line continuation marker, raise EndOfBlock immediately. - adding self.passline to show that the line is to be included and no more checking is necessary on that line. Since a NEWLINE token is not generated when a line continuation marker exists, this allows getsource to continue with these functions even if the following line would not be indented. Don't backport the tests, as these have been too heavily modified on the trunk. Index: inspect.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/inspect.py,v retrieving revision 1.58 retrieving revision 1.58.2.1 diff -u -d -r1.58 -r1.58.2.1 --- inspect.py 20 Sep 2004 18:08:31 -0000 1.58 +++ inspect.py 31 Dec 2004 09:45:37 -0000 1.58.2.1 @@ -432,7 +432,7 @@ if not hasattr(object, 'co_firstlineno'): raise IOError('could not find function definition') lnum = object.co_firstlineno - 1 - pat = re.compile(r'^(\s*def\s)|(.*\slambda(:|\s))|^(\s*@)') + pat = re.compile(r'^(\s*def\s)|(.*(?<!\w)lambda(:|\s))|^(\s*@)') while lnum > 0: if pat.match(lines[lnum]): break lnum = lnum - 1 @@ -503,17 +503,28 @@ """Provide a tokeneater() method to detect the end of a code block.""" def __init__(self): self.indent = 0 - self.started = 0 + self.started = False + self.passline = False self.last = 0 def tokeneater(self, type, token, (srow, scol), (erow, ecol), line): if not self.started: - if '@' in line: pass - elif type == tokenize.NAME: self.started = 1 + if token in ("def", "class", "lambda"): + lastcolon = line.rfind(":") + if lastcolon: + oneline = re.search(r"\w", line[lastcolon:]) + if oneline and line[-2:] != "\\\n": + raise EndOfBlock, srow + self.started = True + self.passline = True elif type == tokenize.NEWLINE: + self.passline = False self.last = srow + elif self.passline: + pass elif type == tokenize.INDENT: self.indent = self.indent + 1 + self.passline = True elif type == tokenize.DEDENT: self.indent = self.indent - 1 if self.indent == 0:

1 0