diff -r 27ae40361ca5 Doc/data/refcounts.dat --- a/Doc/data/refcounts.dat Sat Aug 04 16:17:10 2012 +0200 +++ b/Doc/data/refcounts.dat Sat Aug 04 22:46:03 2012 +0300 @@ -29,7 +29,7 @@ # reference to the item argument! # The parameter names are as they appear in the API manual, not the source -# code. +# code. PyBool_FromLong:PyObject*::+1: PyBool_FromLong:long:v:0: @@ -902,7 +902,7 @@ PyNumber_Xor:PyObject*:o1:0: PyNumber_Xor:PyObject*:o2:0: -PyObject_AsFileDescriptor:int::: +PyObject_AsFileDescriptor:int::: PyObject_AsFileDescriptor:PyObject*:o:0: PyObject_Call:PyObject*::+1: diff -r 27ae40361ca5 Doc/library/turtle-star.ps --- a/Doc/library/turtle-star.ps Sat Aug 04 16:17:10 2012 +0200 +++ b/Doc/library/turtle-star.ps Sat Aug 04 22:46:03 2012 +0300 @@ -84,10 +84,10 @@ 0 exch 0 exch { dup type /stringtype eq - { stringwidth } { - currentfont /Encoding get exch 1 exch put (\001) stringwidth + { stringwidth } { + currentfont /Encoding get exch 1 exch put (\001) stringwidth } - ifelse + ifelse exch 3 1 roll add 3 1 roll add exch } forall @@ -279,8 +279,8 @@ dup cstringwidth pop justify neg mul 0 moveto stipple { - - + + % The text is stippled, so turn it into a path and print % by calling StippledText, which in turn calls StippleFill. % Unfortunately, many Postscript interpreters will get @@ -312,7 +312,7 @@ moveto } ifelse } forall - grestore + grestore } {cstringshow} ifelse 0 spacing neg translate } forall diff -r 27ae40361ca5 Doc/tools/sphinxext/layout.html --- a/Doc/tools/sphinxext/layout.html Sat Aug 04 16:17:10 2012 +0200 +++ b/Doc/tools/sphinxext/layout.html Sat Aug 04 22:46:03 2012 +0300 @@ -14,7 +14,7 @@
© Copyright {{ copyright|e }}.
- The Python Software Foundation is a non-profit corporation. + The Python Software Foundation is a non-profit corporation. Please donate.
Last updated on {{ last_updated|e }}. diff -r 27ae40361ca5 Grammar/Grammar --- a/Grammar/Grammar Sat Aug 04 16:17:10 2012 +0200 +++ b/Grammar/Grammar Sat Aug 04 22:46:03 2012 +0300 @@ -117,7 +117,7 @@ classdef: 'class' NAME ['(' [arglist] ')'] ':' suite arglist: (argument ',')* (argument [','] - |'*' test (',' argument)* [',' '**' test] + |'*' test (',' argument)* [',' '**' test] |'**' test) # The reason that keywords are test nodes instead of NAME is that using NAME # results in an ambiguity. ast.c makes sure it's a NAME. diff -r 27ae40361ca5 Lib/distutils/tests/Setup.sample --- a/Lib/distutils/tests/Setup.sample Sat Aug 04 16:17:10 2012 +0200 +++ b/Lib/distutils/tests/Setup.sample Sat Aug 04 22:46:03 2012 +0300 @@ -14,7 +14,7 @@ #--EndConfig #DEBUG = -C-W -C-Wall -DEBUG = +DEBUG = #the following modules are optional. you will want to compile #everything you can, but you can ignore ones you don't have @@ -31,8 +31,8 @@ _camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG) pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG) -GFX = src/SDL_gfx/SDL_gfxPrimitives.c -#GFX = src/SDL_gfx/SDL_gfxBlitFunc.c src/SDL_gfx/SDL_gfxPrimitives.c +GFX = src/SDL_gfx/SDL_gfxPrimitives.c +#GFX = src/SDL_gfx/SDL_gfxBlitFunc.c src/SDL_gfx/SDL_gfxPrimitives.c gfxdraw src/gfxdraw.c $(SDL) $(GFX) $(DEBUG) diff -r 27ae40361ca5 Lib/idlelib/ChangeLog --- a/Lib/idlelib/ChangeLog Sat Aug 04 16:17:10 2012 +0200 +++ b/Lib/idlelib/ChangeLog Sat Aug 04 22:46:03 2012 +0300 @@ -20,16 +20,16 @@ 2001-07-19 14:49 elguavas * ChangeLog, EditorWindow.py, INSTALLATION, NEWS.txt, README.txt, - TODO.txt, idlever.py: + TODO.txt, idlever.py: minor tidy-ups ready for 0.8.1 alpha tarball release 2001-07-17 15:12 kbk * INSTALLATION, setup.py: INSTALLATION: Remove the coexist.patch instructions - + **************** setup.py: - + Remove the idles script, add some words on IDLE Fork to the long_description, and clean up some line spacing. @@ -42,30 +42,30 @@ * PyShell.py, idle, idles: Implement idle command interface as suggested by GvR [idle-dev] 16 July **************** PyShell: Added functionality: - + usage: idle.py [-c command] [-d] [-i] [-r script] [-s] [-t title] [arg] ... - + idle file(s) (without options) edit the file(s) - + -c cmd run the command in a shell -d enable the debugger -i open an interactive shell -i file(s) open a shell and also an editor window for each file -r script run a file as a script in a shell -s run $IDLESTARTUP or $PYTHONSTARTUP before anything else -t title set title of shell window - + Remaining arguments are applied to the command (-c) or script (-r). - + ****************** idles: Removed the idles script, not needed - + ****************** idle: Removed the IdleConf references, not required anymore 2001-07-16 17:08 kbk * INSTALLATION, coexist.patch: Added installation instructions. - + Added a patch which modifies idlefork so that it can co-exist with "official" IDLE in the site-packages directory. This patch is not necessary if only idlefork IDLE is installed. See INSTALLATION for @@ -74,7 +74,7 @@ 2001-07-16 15:50 kbk * idles: Add a script "idles" which opens a Python Shell window. - + The default behaviour of idlefork idle is to open an editor window instead of a shell. Complex expressions may be run in a fresh environment by selecting "run". There are times, however, when a @@ -90,7 +90,7 @@ * PyShell.py, setup.py: Add a script "idles" which opens a Python Shell window. - + The default behaviour of idlefork idle is to open an editor window instead of a shell. Complex expressions may be run in a fresh environment by selecting "run". There are times, however, when a @@ -110,13 +110,13 @@ * setup.py: Installing Idle to site-packages via Distutils does not copy the Idle help.txt file. - + Ref SF Python Patch 422471 2001-07-14 15:26 kbk * keydefs.py: py-cvs-2001_07_13 (Rev 1.3) merge - + "Make copy, cut and paste events case insensitive. Reported by Patrick K. O'Brien on idle-dev. (Should other bindings follow suit?)" --GvR @@ -124,7 +124,7 @@ 2001-07-14 15:21 kbk * idle.py: py-cvs-2001_07_13 (Rev 1.4) merge - + "Move the action of loading the configuration to the IdleConf module rather than the idle.py script. This has advantages and disadvantages; the biggest advantage being that we can more easily @@ -133,21 +133,21 @@ 2001-07-14 15:18 kbk * extend.txt: py-cvs-2001_07_13 (Rev 1.4) merge - + "Quick update to the extension mechanism (extend.py is gone, long live config.txt)" --GvR 2001-07-14 15:15 kbk * StackViewer.py: py-cvs-2001_07_13 (Rev 1.16) merge - + "Refactored, with some future plans in mind. This now uses the new gotofileline() method defined in FileList.py" --GvR 2001-07-14 15:10 kbk * PyShell.py: py-cvs-2001_07_13 (Rev 1.34) merge - + "Amazing. A very subtle change in policy in descr-branch actually found a bug here. Here's the deal: Class PyShell derives from class OutputWindow. Method PyShell.close() wants to invoke its @@ -166,19 +166,19 @@ 2001-07-14 14:59 kbk * PyParse.py: py-cvs-2001_07_13 (Rel 1.9) merge - + "Taught IDLE's autoident parser that "yield" is a keyword that begins a stmt. Along w/ the preceding change to keyword.py, making all this work w/ a future-stmt just looks harder and harder." --tim_one - - (From Rel 1.8: "Hack to make this still work with Python 1.5.2. + + (From Rel 1.8: "Hack to make this still work with Python 1.5.2. ;-( " --fdrake) 2001-07-14 14:51 kbk * IdleConf.py: py-cvs-2001_07_13 (Rel 1.7) merge - + "Move the action of loading the configuration to the IdleConf module rather than the idle.py script. This has advantages and disadvantages; the biggest advantage being that we can more easily @@ -187,13 +187,13 @@ 2001-07-14 14:45 kbk * FileList.py: py-cvs-2000_07_13 (Rev 1.9) merge - + "Delete goodname() method, which is unused. Add gotofileline(), a convenience method which I intend to use in a variant. Rename test() to _test()." --GvR - + This was an interesting merge. The join completely missed removing - goodname(), which was adjacent, but outside of, a small conflict. + goodname(), which was adjacent, but outside of, a small conflict. I only caught it by comparing the 1.1.3.2/1.1.3.3 diff. CVS ain't infallible. @@ -245,13 +245,13 @@ 2001-07-14 10:13 kbk * PyShell.py: cvs-py-rel2_1 (Rev 1.29 - 1.33) merge - + Merged the following py-cvs revs without conflict: 1.29 Reduce copyright text output at startup 1.30 Delay setting sys.args until Tkinter is fully initialized 1.31 Whitespace normalization 1.32 Turn syntax warning into error when interactive 1.33 Fix warning initialization bug - + Note that module is extensively modified wrt py-cvs 2001-07-14 06:33 kbk @@ -317,14 +317,14 @@ 2001-07-13 13:35 kbk * EditorWindow.py: py-cvs-rel2_1 (Rev 1.33 - 1.37) merge - + VP IDLE version depended on VP's ExecBinding.py and spawn.py to get the path to the Windows Doc directory (relative to python.exe). Removed this conflicting code in favor of py-cvs updates which on Windows use a hard coded path relative to the location of this module. py-cvs updates include support for webbrowser.py. Module still has BrowserControl.py for 1.5.2 support. - + At this point, the differences wrt py-cvs relate to menu functionality. @@ -516,12 +516,12 @@ 2000-08-15 22:51 nowonder - * IDLEFORK.html: + * IDLEFORK.html: corrected email address 2000-08-15 22:47 nowonder - * IDLEFORK.html: + * IDLEFORK.html: added .html file for http://idlefork.sourceforge.net 2000-08-15 11:13 dscherer @@ -1194,7 +1194,7 @@ ====================================================================== Python release 1.5.2b2, IDLE version 0.3 ====================================================================== - + Wed Feb 17 22:47:41 1999 Guido van Rossum * NEWS.txt: News in 0.3. @@ -1330,7 +1330,7 @@ ====================================================================== Python release 1.5.2b1, IDLE version 0.2 ====================================================================== - + Fri Jan 8 17:26:02 1999 Guido van Rossum * README.txt, NEWS.txt: What's new in this release. diff -r 27ae40361ca5 Lib/idlelib/HISTORY.txt --- a/Lib/idlelib/HISTORY.txt Sat Aug 04 16:17:10 2012 +0200 +++ b/Lib/idlelib/HISTORY.txt Sat Aug 04 22:46:03 2012 +0300 @@ -11,7 +11,7 @@ *Release date: 22-Jul-2001* - New tarball released as a result of the 'revitalisation' of the IDLEfork - project. + project. - This release requires python 2.1 or better. Compatibility with earlier versions of python (especially ancient ones like 1.5x) is no longer a @@ -26,8 +26,8 @@ not working, but I believe this was the case with the previous IDLE fork release (0.7.1) as well. -- This release is being made now to mark the point at which IDLEfork is - launching into a new stage of development. +- This release is being made now to mark the point at which IDLEfork is + launching into a new stage of development. - IDLEfork CVS will now be branched to enable further development and exploration of the two "execution in a remote process" patches submitted by @@ -96,7 +96,7 @@ instead of the IDLE help; shift-TAB is now a synonym for unindent. - New modules: - + ExecBinding.py Executes program through loader loader.py Bootstraps user program protocol.py RPC protocol diff -r 27ae40361ca5 Lib/idlelib/README.txt --- a/Lib/idlelib/README.txt Sat Aug 04 16:17:10 2012 +0200 +++ b/Lib/idlelib/README.txt Sat Aug 04 22:46:03 2012 +0300 @@ -14,7 +14,7 @@ There is a Python Shell window which features colorizing and command recall. IDLE executes Python code in a separate process, which is restarted for each -Run (F5) initiated from an editor window. The environment can also be +Run (F5) initiated from an editor window. The environment can also be restarted from the Shell window without restarting IDLE. This enhancement has often been requested, and is now finally available. The diff -r 27ae40361ca5 Lib/idlelib/help.txt --- a/Lib/idlelib/help.txt Sat Aug 04 16:17:10 2012 +0200 +++ b/Lib/idlelib/help.txt Sat Aug 04 22:46:03 2012 +0300 @@ -91,7 +91,7 @@ keybindings, and color themes may be altered. Startup Preferences may be set, and Additional Help Sources can be specified. - + On MacOS X this menu is not present, use menu 'IDLE -> Preferences...' instead. --- diff -r 27ae40361ca5 Lib/lib2to3/Grammar.txt --- a/Lib/lib2to3/Grammar.txt Sat Aug 04 16:17:10 2012 +0200 +++ b/Lib/lib2to3/Grammar.txt Sat Aug 04 22:46:03 2012 +0300 @@ -142,7 +142,7 @@ classdef: 'class' NAME ['(' [arglist] ')'] ':' suite arglist: (argument ',')* (argument [','] - |'*' test (',' argument)* [',' '**' test] + |'*' test (',' argument)* [',' '**' test] |'**' test) argument: test [comp_for] | test '=' test # Really [keyword '='] test diff -r 27ae40361ca5 Lib/test/cfgparser.2 --- a/Lib/test/cfgparser.2 Sat Aug 04 16:17:10 2012 +0200 +++ b/Lib/test/cfgparser.2 Sat Aug 04 22:46:03 2012 +0300 @@ -3,19 +3,19 @@ # here. Samba has a huge number of configurable options (perhaps too # many!) most of which are not shown in this example # -# Any line which starts with a ; (semi-colon) or a # (hash) +# Any line which starts with a ; (semi-colon) or a # (hash) # is a comment and is ignored. In this example we will use a # # for commentry and a ; for parts of the config file that you # may wish to enable # -# NOTE: Whenever you modify this file you should run the command #"testparm" # to check that you have not made any basic syntactic #errors. +# NOTE: Whenever you modify this file you should run the command #"testparm" # to check that you have not made any basic syntactic #errors. # #======================= Global Settings ===================================== [global] # 1. Server Naming Options: # workgroup = NT-Domain-Name or Workgroup-Name - + workgroup = MDKGROUP # netbios name is the name you will see in "Network Neighbourhood", @@ -24,7 +24,7 @@ ; netbios name = # server string is the equivalent of the NT Description field - + server string = Samba Server %v # Message command is run by samba when a "popup" message is sent to it. @@ -36,20 +36,20 @@ # (as cups is now used in linux-mandrake 7.2 by default) # if you want to automatically load your printer list rather # than setting them up individually then you'll need this - + printcap name = lpstat load printers = yes # It should not be necessary to spell out the print system type unless # yours is non-standard. Currently supported print systems include: # bsd, sysv, plp, lprng, aix, hpux, qnx, cups - + printing = cups # Samba 2.2 supports the Windows NT-style point-and-print feature. To # use this, you need to be able to upload print drivers to the samba # server. The printer admins (or root) may install drivers onto samba. -# Note that this feature uses the print$ share, so you will need to +# Note that this feature uses the print$ share, so you will need to # enable it below. # This parameter works like domain admin group: # printer admin = @ @@ -92,7 +92,7 @@ # Use password server option only with security = server or security = # domain # When using security = domain, you should use password server = * -; password server = +; password server = ; password server = * # Password Level allows matching of _n_ characters of the password for @@ -122,7 +122,7 @@ # enable pam password change ; pam password change = yes ; passwd program = /usr/bin/passwd %u -; passwd chat = *New*UNIX*password* %n\n *ReType*new*UNIX*password* +; passwd chat = *New*UNIX*password* %n\n *ReType*new*UNIX*password* # %n\n ;*passwd:*all*authentication*tokens*updated*successfully* @@ -137,7 +137,7 @@ # Options for using winbind. Winbind allows you to do all account and # authentication from a Windows or samba domain controller, creating # accounts on the fly, and maintaining a mapping of Windows RIDs to -# unix uid's +# unix uid's # and gid's. winbind uid and winbind gid are the only required # parameters. # @@ -163,8 +163,8 @@ ; template homedir = /home/%D/%U # When using winbind, you may want to have samba create home -# directories on the fly for authenticated users. Ensure that -# /etc/pam.d/samba is using 'service=system-auth-winbind' in pam_stack +# directories on the fly for authenticated users. Ensure that +# /etc/pam.d/samba is using 'service=system-auth-winbind' in pam_stack # modules, and then enable obedience of pam restrictions below: ; obey pam restrictions = yes @@ -181,7 +181,7 @@ # Configure Samba to use multiple interfaces # If you have multiple network interfaces then you must list them # here. See the man page for details. -; interfaces = 192.168.12.2/24 192.168.13.2/24 +; interfaces = 192.168.12.2/24 192.168.13.2/24 # Configure remote browse list synchronisation here # request announcement to, or browse list sync from: @@ -201,14 +201,14 @@ # Domain Master specifies Samba to be the Domain Master Browser. This # allows Samba to collate browse lists between subnets. Don't use this # if you already have a Windows NT domain controller doing this job -; domain master = yes +; domain master = yes # Preferred Master causes Samba to force a local browser election on # startup and gives it a slightly higher chance of winning the election ; preferred master = yes # 6. Domain Control Options: -# Enable this if you want Samba to be a domain logon server for +# Enable this if you want Samba to be a domain logon server for # Windows95 workstations or Primary Domain Controller for WinNT and # Win2k @@ -232,16 +232,16 @@ ; logon home = \\%L\%U\.profile # The add user script is used by a domain member to add local user -# accounts that have been authenticated by the domain controller, or by -# the domain controller to add local machine accounts when adding +# accounts that have been authenticated by the domain controller, or by +# the domain controller to add local machine accounts when adding # machines to the domain. # The script must work from the command line when replacing the macros, -# or the operation will fail. Check that groups exist if forcing a +# or the operation will fail. Check that groups exist if forcing a # group. # Script for domain controller for adding machines: ; add user script = /usr/sbin/useradd -d /dev/null -g machines –c # 'Machine Account' -s /bin/false -M %u -# Script for domain controller with LDAP backend for adding machines +# Script for domain controller with LDAP backend for adding machines #(please # configure in /etc/samba/smbldap_conf.pm first): ; add user script = /usr/share/samba/scripts/smbldap-useradd.pl -w –d @@ -264,7 +264,7 @@ # LDAP configuration for Domain Controlling: # The account (dn) that samba uses to access the LDAP server # This account needs to have write access to the LDAP tree -# You will need to give samba the password for this dn, by +# You will need to give samba the password for this dn, by # running 'smbpasswd -w mypassword' ; ldap admin dn = cn=root,dc=mydomain,dc=com ; ldap ssl = start_tls @@ -277,16 +277,16 @@ # 7. Name Resolution Options: # All NetBIOS names must be resolved to IP Addresses # 'Name Resolve Order' allows the named resolution mechanism to be -# specified the default order is "host lmhosts wins bcast". "host" -# means use the unix system gethostbyname() function call that will use -# either /etc/hosts OR DNS or NIS depending on the settings of +# specified the default order is "host lmhosts wins bcast". "host" +# means use the unix system gethostbyname() function call that will use +# either /etc/hosts OR DNS or NIS depending on the settings of # /etc/host.config, /etc/nsswitch.conf -# and the /etc/resolv.conf file. "host" therefore is system -# configuration dependant. This parameter is most often of use to +# and the /etc/resolv.conf file. "host" therefore is system +# configuration dependant. This parameter is most often of use to # prevent DNS lookups # in order to resolve NetBIOS names to IP Addresses. Use with care! # The example below excludes use of name resolution for machines that -# are NOT on the local network segment - OR - are not deliberately to +# are NOT on the local network segment - OR - are not deliberately to # be known via lmhosts or via WINS. ; name resolve order = wins lmhosts bcast @@ -296,7 +296,7 @@ ; wins support = yes # WINS Server - Tells the NMBD components of Samba to be a WINS Client -# Note: Samba can be either a WINS Server, or a WINS Client, but +# Note: Samba can be either a WINS Server, or a WINS Client, but # NOT both ; wins server = w.x.y.z @@ -305,11 +305,11 @@ # at least one WINS Server on the network. The default is NO. ; wins proxy = yes -# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS -# names via DNS nslookups. The built-in default for versions 1.9.17 is +# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS +# names via DNS nslookups. The built-in default for versions 1.9.17 is # yes, this has been changed in version 1.9.18 to no. - dns proxy = no + dns proxy = no # 8. File Naming Options: # Case Preservation can be handy - system default is _no_ @@ -325,7 +325,7 @@ # you can match a Windows code page with a UNIX character set. # Windows: 437 (US), 737 (GREEK), 850 (Latin1 - Western European), # 852 (Eastern Eu.), 861 (Icelandic), 932 (Cyrillic - Russian), -# 936 (Japanese - Shift-JIS), 936 (Simpl. Chinese), 949 (Korean +# 936 (Japanese - Shift-JIS), 936 (Simpl. Chinese), 949 (Korean # Hangul), # 950 (Trad. Chin.). # UNIX: ISO8859-1 (Western European), ISO8859-2 (Eastern Eu.), @@ -373,7 +373,7 @@ ; guest ok = yes -# NOTE: If you have a CUPS print system there is no need to +# NOTE: If you have a CUPS print system there is no need to # specifically define each individual printer. # You must configure the samba printers with the appropriate Windows # drivers on your Windows clients. On the Samba server no filtering is @@ -395,9 +395,9 @@ # print command: see above for details. # ===================================== - print command = lpr-cups -P %p -o raw %s -r + print command = lpr-cups -P %p -o raw %s -r # using client side printer drivers. -; print command = lpr-cups -P %p %s +; print command = lpr-cups -P %p %s # using cups own drivers (use generic PostScript on clients). # The following two commands are the samba defaults for printing=cups # change them only if you need different options: @@ -406,11 +406,11 @@ # This share is used for Windows NT-style point-and-print support. # To be able to install drivers, you need to be either root, or listed -# in the printer admin parameter above. Note that you also need write -# access to the directory and share definition to be able to upload the +# in the printer admin parameter above. Note that you also need write +# access to the directory and share definition to be able to upload the # drivers. # For more information on this, please see the Printing Support Section -# of /usr/share/doc/samba-/docs/Samba-HOWTO-Collection.pdf +# of /usr/share/doc/samba-/docs/Samba-HOWTO-Collection.pdf [print$] path = /var/lib/samba/printers @@ -419,7 +419,7 @@ write list = @adm root # A useful application of samba is to make a PDF-generation service -# To streamline this, install windows postscript drivers (preferably +# To streamline this, install windows postscript drivers (preferably # colour)on the samba server, so that clients can automatically install # them. @@ -455,11 +455,11 @@ # Uncomment next line. ; vfs object = /usr/lib/samba/vfs/audit.so -# Other examples. +# Other examples. # # A private printer, usable only by Fred. Spool data will be placed in # Fred's -# home directory. Note that fred must have write access to the spool +# home directory. Note that fred must have write access to the spool # directory, # wherever it is. ;[fredsprn] @@ -473,7 +473,7 @@ ----------------------------------------------------------- -# A private directory, usable only by Fred. Note that Fred requires +# A private directory, usable only by Fred. Note that Fred requires # write access to the directory. ;[fredsdir] @@ -493,8 +493,8 @@ ----------------------------------------------------------- -# a service which has a different directory for each machine that -# connects this allows you to tailor configurations to incoming +# a service which has a different directory for each machine that +# connects this allows you to tailor configurations to incoming # machines. You could also use the %u option to tailor it by user name. # The %m gets replaced with the machine name that is connecting. ;[pchome] @@ -506,10 +506,10 @@ ----------------------------------------------------------- # A publicly accessible directory, read/write to all users. Note that -# all files created in the directory by users will be owned by the -# default user, so any user with access can delete any other user's -# files. Obviously this directory must be writable by the default user. -# Another user could of course be specified, in which case all files +# all files created in the directory by users will be owned by the +# default user, so any user with access can delete any other user's +# files. Obviously this directory must be writable by the default user. +# Another user could of course be specified, in which case all files # would be owned by that user instead. ;[public] @@ -521,10 +521,10 @@ ----------------------------------------------------------- -# The following two entries demonstrate how to share a directory so -# that two users can place files there that will be owned by the -# specific users. In this setup, the directory should be writable by -# both users and should have the sticky bit set on it to prevent abuse. +# The following two entries demonstrate how to share a directory so +# that two users can place files there that will be owned by the +# specific users. In this setup, the directory should be writable by +# both users and should have the sticky bit set on it to prevent abuse. # Obviously this could be extended to as many users as required. ;[myshare] diff -r 27ae40361ca5 Lib/test/cfgparser.3 --- a/Lib/test/cfgparser.3 Sat Aug 04 16:17:10 2012 +0200 +++ b/Lib/test/cfgparser.3 Sat Aug 04 22:46:03 2012 +0300 @@ -1,6 +1,6 @@ # INI with as many tricky parts as possible # Most of them could not be used before 3.2 - + # This will be parsed with the following options # delimiters = {'='} # comment_prefixes = {'#'} @@ -21,7 +21,7 @@ [corruption] - value = that is + value = that is actually still here @@ -45,7 +45,7 @@ [another one!] even if values are indented like this = seriously yes, this still applies to = section "another one!" -this too = are there people with configurations broken as this? +this too = are there people with configurations broken as this? beware, this is going to be a continuation of the value for key "this too" @@ -63,7 +63,7 @@ [tricky interpolation] interpolate = do this lets = %(go)s - + [more interpolation] interpolate = go shopping lets = %(go)s diff -r 27ae40361ca5 Lib/test/sgml_input.html --- a/Lib/test/sgml_input.html Sat Aug 04 16:17:10 2012 +0200 +++ b/Lib/test/sgml_input.html Sat Aug 04 22:46:03 2012 +0300 @@ -22,11 +22,11 @@
@@ -93,15 +93,15 @@ Salida Objetivo Llegada - Orden + Orden 1 - + Espionaje (F) - 3 [2:250:6] Wed Aug 9 18:00:02 @@ -116,11 +116,11 @@ 2 - + Espionaje (V) - 3 [2:250:6] Wed Aug 9 17:59:55 @@ -132,7 +132,7 @@ - +
@@ -146,7 +146,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -166,7 +166,7 @@ - + @@ -176,7 +176,7 @@ - + @@ -186,7 +186,7 @@ - + diff -r 27ae40361ca5 Lib/test/test_email/data/msg_15.txt --- a/Lib/test/test_email/data/msg_15.txt Sat Aug 04 16:17:10 2012 +0200 +++ b/Lib/test/test_email/data/msg_15.txt Sat Aug 04 22:46:03 2012 +0300 @@ -20,7 +20,7 @@ Content-type: text/plain; charset="ISO-8859-1" Content-transfer-encoding: quoted-printable -Some removed test. +Some removed test. --MS_Mac_OE_3071477847_720252_MIME_Part Content-type: text/html; charset="ISO-8859-1" diff -r 27ae40361ca5 Lib/test/test_email/data/msg_38.txt --- a/Lib/test/test_email/data/msg_38.txt Sat Aug 04 16:17:10 2012 +0200 +++ b/Lib/test/test_email/data/msg_38.txt Sat Aug 04 22:46:03 2012 +0300 @@ -17,10 +17,10 @@ Unlike the test test_nested-multiples-with-internal-boundary, this -piece of text not only contains the outer boundary tags -------- =_aaaaaaaaaa1 -and -------- =_aaaaaaaaaa0 +piece of text not only contains the outer boundary tags +------- =_aaaaaaaaaa1 +and +------- =_aaaaaaaaaa0 but puts them at the start of a line! And, to be even nastier, it even includes a couple of end tags, such as this one: @@ -30,7 +30,7 @@ ------- =_aaaaaaaaaa4-- -This will, I'm sure, cause much breakage of MIME parsers. But, as +This will, I'm sure, cause much breakage of MIME parsers. But, as far as I can tell, it's perfectly legal. I have not yet ever seen a case of this in the wild, but I've seen *similar* things. diff -r 27ae40361ca5 Lib/test/tokenize_tests-latin1-coding-cookie-and-utf8-bom-sig.txt --- a/Lib/test/tokenize_tests-latin1-coding-cookie-and-utf8-bom-sig.txt Sat Aug 04 16:17:10 2012 +0200 +++ b/Lib/test/tokenize_tests-latin1-coding-cookie-and-utf8-bom-sig.txt Sat Aug 04 22:46:03 2012 +0300 @@ -1,5 +1,5 @@ # -*- coding: latin1 -*- -# IMPORTANT: this file has the utf-8 BOM signature '\xef\xbb\xbf' +# IMPORTANT: this file has the utf-8 BOM signature '\xef\xbb\xbf' # at the start of it. Make sure this is preserved if any changes # are made! Also note that the coding cookie above conflicts with # the presense of a utf-8 BOM signature -- this is intended. diff -r 27ae40361ca5 Lib/test/tokenize_tests-no-coding-cookie-and-utf8-bom-sig-only.txt --- a/Lib/test/tokenize_tests-no-coding-cookie-and-utf8-bom-sig-only.txt Sat Aug 04 16:17:10 2012 +0200 +++ b/Lib/test/tokenize_tests-no-coding-cookie-and-utf8-bom-sig-only.txt Sat Aug 04 22:46:03 2012 +0300 @@ -1,4 +1,4 @@ -# IMPORTANT: this file has the utf-8 BOM signature '\xef\xbb\xbf' +# IMPORTANT: this file has the utf-8 BOM signature '\xef\xbb\xbf' # at the start of it. Make sure this is preserved if any changes # are made! diff -r 27ae40361ca5 Lib/test/tokenize_tests-utf8-coding-cookie-and-utf8-bom-sig.txt --- a/Lib/test/tokenize_tests-utf8-coding-cookie-and-utf8-bom-sig.txt Sat Aug 04 16:17:10 2012 +0200 +++ b/Lib/test/tokenize_tests-utf8-coding-cookie-and-utf8-bom-sig.txt Sat Aug 04 22:46:03 2012 +0300 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# IMPORTANT: this file has the utf-8 BOM signature '\xef\xbb\xbf' +# IMPORTANT: this file has the utf-8 BOM signature '\xef\xbb\xbf' # at the start of it. Make sure this is preserved if any changes # are made! diff -r 27ae40361ca5 Lib/test/tokenize_tests.txt --- a/Lib/test/tokenize_tests.txt Sat Aug 04 16:17:10 2012 +0200 +++ b/Lib/test/tokenize_tests.txt Sat Aug 04 22:46:03 2012 +0300 @@ -1,5 +1,5 @@ # Tests for the 'tokenize' module. -# Large bits stolen from test_grammar.py. +# Large bits stolen from test_grammar.py. # Comments "#" diff -r 27ae40361ca5 Lib/test/xmltestdata/test.xml --- a/Lib/test/xmltestdata/test.xml Sat Aug 04 16:17:10 2012 +0200 +++ b/Lib/test/xmltestdata/test.xml Sat Aug 04 22:46:03 2012 +0300 @@ -2,14 +2,14 @@ Introduction to XSL

Introduction to XSL

- - + +

Overview

    - +
  • 1.Intro
  • 2.History
    • @@ -28,16 +28,16 @@
- - - + + +

Intro

    - +
  • Who am I?
  • Who are you?
    • @@ -46,16 +46,16 @@
- - - + + +

History: XML and SGML

    - +
  • XML is a subset of SGML.
  • SGML allows the separation of abstract content from formatting.
    • @@ -64,16 +64,16 @@
- - - + + +

History: What are stylesheets?

    - +
  • Stylesheets specify the formatting of SGML/XML documents.
  • Stylesheets put the "style" back into documents.
    • @@ -82,16 +82,16 @@
- - - + + +

History: FOSI

    - +
  • FOSI: "Formatted Output Specification Instance"
    • MIL-STD-28001 @@ -108,8 +108,8 @@
    - - + + diff -r 27ae40361ca5 Lib/test/xmltestdata/test.xml.out --- a/Lib/test/xmltestdata/test.xml.out Sat Aug 04 16:17:10 2012 +0200 +++ b/Lib/test/xmltestdata/test.xml.out Sat Aug 04 22:46:03 2012 +0300 @@ -2,14 +2,14 @@ Introduction to XSL

    Introduction to XSL

    - - + +

    Overview

      - +
    • 1.Intro
    • 2.History
      • @@ -28,16 +28,16 @@
    - - - + + +

    Intro

      - +
    • Who am I?
    • Who are you?
      • @@ -46,16 +46,16 @@
    - - - + + +

    History: XML and SGML

      - +
    • XML is a subset of SGML.
    • SGML allows the separation of abstract content from formatting.
      • @@ -64,16 +64,16 @@
    - - - + + +

    History: What are stylesheets?

      - +
    • Stylesheets specify the formatting of SGML/XML documents.
    • Stylesheets put the "style" back into documents.
      • @@ -82,16 +82,16 @@
    - - - + + +

    History: FOSI

      - +
    • FOSI: "Formatted Output Specification Instance"
      • MIL-STD-28001 @@ -108,8 +108,8 @@
      - - + + \ No newline at end of file diff -r 27ae40361ca5 Lib/turtledemo/demohelp.txt --- a/Lib/turtledemo/demohelp.txt Sat Aug 04 16:17:10 2012 +0200 +++ b/Lib/turtledemo/demohelp.txt Sat Aug 04 22:46:03 2012 +0300 @@ -60,11 +60,11 @@ be executed by the viewer (see provided example scripts) main() may return a string which will be displayed in the Label below the source code window (when execution - has finished.) + has finished.) !! For programs, which are EVENT DRIVEN, main must return !! the string "EVENTLOOP". This informs the viewer, that the !! script is still running and must be stopped by the user! - - + + diff -r 27ae40361ca5 Mac/BuildScript/README.txt --- a/Mac/BuildScript/README.txt Sat Aug 04 16:17:10 2012 +0200 +++ b/Mac/BuildScript/README.txt Sat Aug 04 22:46:03 2012 +0300 @@ -2,10 +2,10 @@ ======================================= The ``build-install.py`` script creates Python distributions, including -certain third-party libraries as necessary. It builds a complete -framework-based Python out-of-tree, installs it in a funny place with -$DESTROOT, massages that installation to remove .pyc files and such, creates -an Installer package from the installation plus other files in ``resources`` +certain third-party libraries as necessary. It builds a complete +framework-based Python out-of-tree, installs it in a funny place with +$DESTROOT, massages that installation to remove .pyc files and such, creates +an Installer package from the installation plus other files in ``resources`` and ``scripts`` and placed that on a ``.dmg`` disk image. As of Python 2.7.x and 3.2, PSF practice is to build two installer variants @@ -17,7 +17,7 @@ python build-installer.py \ --sdk-path=/Developer/SDKs/MacOSX10.4u.sdk \ --universal-archs=32-bit \ - --dep-target=10.3 + --dep-target=10.3 # These are the current default options - builds the following third-party libraries @@ -32,7 +32,7 @@ - requires ActiveState ``Tcl/Tk 8.4`` (currently 8.4.19) to be installed for building - current target build environment: - + * Mac OS X 10.5.8 PPC or Intel * Xcode 3.1.4 (or later) * ``MacOSX10.4u`` SDK (later SDKs do not support PPC G3 processors) @@ -54,14 +54,14 @@ --dep-target=10.6 - uses system-supplied versions of third-party libraries - + * readline module links with Apple BSD editline (libedit) * builds Oracle Sleepycat DB 4.8 (Python 2.x only) - requires ActiveState Tcl/Tk 8.5.9 (or later) to be installed for building - current target build environment: - + * Mac OS X 10.6.6 (or later) * Xcode 3.2.5 (or later) * ``MacOSX10.6`` SDK @@ -106,7 +106,7 @@ Building other universal installers ................................... -It is also possible to build a 4-way universal installer that runs on +It is also possible to build a 4-way universal installer that runs on OS X Leopard or later:: python 2.6 /build-installer.py \ @@ -133,13 +133,13 @@ Ideally, the resulting binaries should be installed and the test suite run on all supported OS X releases and architectures. As a practical matter, that is generally not possible. At a minimum, variant 1 should be run on -at least one Intel, one PPC G4, and one PPC G3 system and one each of +at least one Intel, one PPC G4, and one PPC G3 system and one each of OS X 10.6, 10.5, 10.4, and 10.3.9. Not all tests run on 10.3.9. Variant 2 should be run on 10.6 in both 32-bit and 64-bit modes.:: - arch -i386 /usr/local/bin/pythonn.n -m test.regrtest -w -u all + arch -i386 /usr/local/bin/pythonn.n -m test.regrtest -w -u all arch -X86_64 /usr/local/bin/pythonn.n -m test.regrtest -w -u all - + Certain tests will be skipped and some cause the interpreter to fail which will likely generate ``Python quit unexpectedly`` alert messages to be generated at several points during a test run. These can diff -r 27ae40361ca5 Mac/BuildScript/resources/ReadMe.txt --- a/Mac/BuildScript/resources/ReadMe.txt Sat Aug 04 16:17:10 2012 +0200 +++ b/Mac/BuildScript/resources/ReadMe.txt Sat Aug 04 22:46:03 2012 +0300 @@ -15,7 +15,7 @@ Python programs. **** IMPORTANT **** - + Before using IDLE or other programs using the tkinter graphical user interface toolkit, visit http://www.python.org/download/mac/tcltk/ for current information about supported and recommended versions diff -r 27ae40361ca5 Mac/Makefile.in --- a/Mac/Makefile.in Sat Aug 04 16:17:10 2012 +0200 +++ b/Mac/Makefile.in Sat Aug 04 22:46:03 2012 +0300 @@ -1,5 +1,5 @@ -# This file can be invoked from the various frameworkinstall... targets in the -# main Makefile. The next couple of variables are overridden on the +# This file can be invoked from the various frameworkinstall... targets in the +# main Makefile. The next couple of variables are overridden on the # commandline in that case. VERSION=@VERSION@ @@ -61,7 +61,7 @@ endif # -# Install unix tools in /usr/local/bin. These are just aliases for the +# Install unix tools in /usr/local/bin. These are just aliases for the # actual installation inside the framework. # installunixtools: diff -r 27ae40361ca5 Mac/PythonLauncher/English.lproj/MainMenu.nib/classes.nib --- a/Mac/PythonLauncher/English.lproj/MainMenu.nib/classes.nib Sat Aug 04 16:17:10 2012 +0200 +++ b/Mac/PythonLauncher/English.lproj/MainMenu.nib/classes.nib Sat Aug 04 22:46:03 2012 +0300 @@ -1,12 +1,12 @@ { IBClasses = ( - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, { - ACTIONS = {showPreferences = id; }; - CLASS = MyAppDelegate; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; + ACTIONS = {showPreferences = id; }; + CLASS = MyAppDelegate; + LANGUAGE = ObjC; + SUPERCLASS = NSObject; } - ); - IBVersion = 1; + ); + IBVersion = 1; } \ No newline at end of file diff -r 27ae40361ca5 Mac/PythonLauncher/English.lproj/MyDocument.nib/classes.nib --- a/Mac/PythonLauncher/English.lproj/MyDocument.nib/classes.nib Sat Aug 04 16:17:10 2012 +0200 +++ b/Mac/PythonLauncher/English.lproj/MyDocument.nib/classes.nib Sat Aug 04 22:46:03 2012 +0300 @@ -1,26 +1,26 @@ { IBClasses = ( - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, { - ACTIONS = {"do_apply" = id; "do_cancel" = id; "do_reset" = id; "do_run" = id; }; - CLASS = MyDocument; - LANGUAGE = ObjC; + ACTIONS = {"do_apply" = id; "do_cancel" = id; "do_reset" = id; "do_run" = id; }; + CLASS = MyDocument; + LANGUAGE = ObjC; OUTLETS = { - commandline = NSTextField; - debug = NSButton; - honourhashbang = NSButton; - inspect = NSButton; - interpreter = NSTextField; - nosite = NSButton; - optimize = NSButton; - others = NSTextField; - scriptargs = NSTextField; - tabs = NSButton; - verbose = NSButton; - "with_terminal" = NSButton; - }; - SUPERCLASS = NSDocument; + commandline = NSTextField; + debug = NSButton; + honourhashbang = NSButton; + inspect = NSButton; + interpreter = NSTextField; + nosite = NSButton; + optimize = NSButton; + others = NSTextField; + scriptargs = NSTextField; + tabs = NSButton; + verbose = NSButton; + "with_terminal" = NSButton; + }; + SUPERCLASS = NSDocument; } - ); - IBVersion = 1; + ); + IBVersion = 1; } \ No newline at end of file diff -r 27ae40361ca5 Mac/PythonLauncher/English.lproj/PreferenceWindow.nib/classes.nib --- a/Mac/PythonLauncher/English.lproj/PreferenceWindow.nib/classes.nib Sat Aug 04 16:17:10 2012 +0200 +++ b/Mac/PythonLauncher/English.lproj/PreferenceWindow.nib/classes.nib Sat Aug 04 22:46:03 2012 +0300 @@ -1,26 +1,26 @@ { IBClasses = ( - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, { - ACTIONS = {"do_apply" = id; "do_filetype" = id; "do_reset" = id; }; - CLASS = PreferencesWindowController; - LANGUAGE = ObjC; + ACTIONS = {"do_apply" = id; "do_filetype" = id; "do_reset" = id; }; + CLASS = PreferencesWindowController; + LANGUAGE = ObjC; OUTLETS = { - commandline = NSTextField; - debug = NSButton; - filetype = NSPopUpButton; - honourhashbang = NSButton; - inspect = NSButton; - interpreter = NSTextField; - nosite = NSButton; - optimize = NSButton; - others = NSTextField; - tabs = NSButton; - verbose = NSButton; - "with_terminal" = NSButton; - }; - SUPERCLASS = NSWindowController; + commandline = NSTextField; + debug = NSButton; + filetype = NSPopUpButton; + honourhashbang = NSButton; + inspect = NSButton; + interpreter = NSTextField; + nosite = NSButton; + optimize = NSButton; + others = NSTextField; + tabs = NSButton; + verbose = NSButton; + "with_terminal" = NSButton; + }; + SUPERCLASS = NSWindowController; } - ); - IBVersion = 1; + ); + IBVersion = 1; } \ No newline at end of file diff -r 27ae40361ca5 Mac/PythonLauncher/FileSettings.m --- a/Mac/PythonLauncher/FileSettings.m Sat Aug 04 16:17:10 2012 +0200 +++ b/Mac/PythonLauncher/FileSettings.m Sat Aug 04 22:46:03 2012 +0300 @@ -14,7 +14,7 @@ { static FileSettings *fsdefault_py, *fsdefault_pyw, *fsdefault_pyc; FileSettings **curdefault; - + if ([filetype isEqualToString: @"Python Script"]) { curdefault = &fsdefault_py; } else if ([filetype isEqualToString: @"Python GUI Script"]) { @@ -36,7 +36,7 @@ { static FileSettings *default_py, *default_pyw, *default_pyc; FileSettings **curdefault; - + if ([filetype isEqualToString: @"Python Script"]) { curdefault = &default_py; } else if ([filetype isEqualToString: @"Python GUI Script"]) { @@ -57,7 +57,7 @@ + (id)newSettingsForFileType: (NSString *)filetype { FileSettings *cur; - + cur = [FileSettings new]; [cur initForFileType: filetype]; return [cur retain]; @@ -67,7 +67,7 @@ { self = [super init]; if (!self) return self; - + interpreter = [source->interpreter retain]; honourhashbang = source->honourhashbang; debug = source->debug; @@ -81,14 +81,14 @@ with_terminal = source->with_terminal; prefskey = source->prefskey; if (prefskey) [prefskey retain]; - + return self; } - (id)initForFileType: (NSString *)filetype { FileSettings *defaults; - + defaults = [FileSettings getDefaultsForFileType: filetype]; self = [self initWithFileSettings: defaults]; origsource = [defaults retain]; @@ -107,10 +107,10 @@ NSString *filename; NSDictionary *dict; static NSDictionary *factorySettings; - + self = [super init]; if (!self) return self; - + if (factorySettings == NULL) { NSBundle *bdl = [NSBundle mainBundle]; NSString *path = [ bdl pathForResource: @"factorySettings" @@ -149,18 +149,18 @@ { NSUserDefaults *defaults; NSDictionary *dict; - + defaults = [NSUserDefaults standardUserDefaults]; dict = [defaults dictionaryForKey: filetype]; if (!dict) return; [self applyValuesFromDict: dict]; } - + - (id)initForDefaultFileType: (NSString *)filetype { FileSettings *fsdefaults; - + fsdefaults = [FileSettings getFactorySettingsForFileType: filetype]; self = [self initWithFileSettings: fsdefaults]; if (!self) return self; @@ -220,7 +220,7 @@ - (void)applyValuesFromDict: (NSDictionary *)dict { id value; - + value = [dict objectForKey: @"interpreter"]; if (value) interpreter = [value retain]; value = [dict objectForKey: @"honourhashbang"]; @@ -265,7 +265,7 @@ script_dir = [script substringToIndex: [script length]-[[script lastPathComponent] length]]; - + if (honourhashbang && (fp=fopen([script fileSystemRepresentation], "r")) && fgets(hashbangbuf, sizeof(hashbangbuf), fp) && @@ -278,7 +278,7 @@ } if (!cur_interp) cur_interp = interpreter; - + return [NSString stringWithFormat: @"cd '%@' && '%@'%s%s%s%s%s%s %@ '%@' %@ %s", [self _replaceSingleQuotes:script_dir], @@ -297,7 +297,7 @@ - (NSArray *) interpreters { return interpreters;}; -// FileSettingsSource protocol +// FileSettingsSource protocol - (NSString *) interpreter { return interpreter;}; - (BOOL) honourhashbang { return honourhashbang; }; - (BOOL) debug { return debug;}; diff -r 27ae40361ca5 Mac/PythonLauncher/Makefile.in --- a/Mac/PythonLauncher/Makefile.in Sat Aug 04 16:17:10 2012 +0200 +++ b/Mac/PythonLauncher/Makefile.in Sat Aug 04 22:46:03 2012 +0300 @@ -15,7 +15,7 @@ PYTHONFRAMEWORK=@PYTHONFRAMEWORK@ # Deployment target selected during configure, to be checked -# by distutils +# by distutils MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@ @EXPORT_MACOSX_DEPLOYMENT_TARGET@export MACOSX_DEPLOYMENT_TARGET @@ -54,7 +54,7 @@ --plist Info.plist \ build find "Python Launcher.app" -name '.svn' -print0 | xargs -0 rm -r - + FileSettings.o: $(srcdir)/FileSettings.m $(CC) $(CFLAGS) -o $@ -c $(srcdir)/FileSettings.m diff -r 27ae40361ca5 Mac/PythonLauncher/MyAppDelegate.m --- a/Mac/PythonLauncher/MyAppDelegate.m Sat Aug 04 16:17:10 2012 +0200 +++ b/Mac/PythonLauncher/MyAppDelegate.m Sat Aug 04 22:46:03 2012 +0300 @@ -33,7 +33,7 @@ - (BOOL)shouldShowUI { - // if this call comes before applicationDidFinishLaunching: we + // if this call comes before applicationDidFinishLaunching: we // should terminate immedeately after starting the script. if (!initial_action_done) should_terminate = YES; @@ -62,7 +62,7 @@ static NSString *extensions[] = { @"py", @"pyw", @"pyc", NULL}; NSString **ext_p; int i; - + if ([[NSUserDefaults standardUserDefaults] boolForKey: @"SkipFileBindingTest"]) return; ourUrl = [NSURL fileURLWithPath: [[NSBundle mainBundle] bundlePath]]; @@ -92,5 +92,5 @@ } } } - + @end diff -r 27ae40361ca5 Mac/PythonLauncher/MyDocument.m --- a/Mac/PythonLauncher/MyDocument.m Sat Aug 04 16:17:10 2012 +0200 +++ b/Mac/PythonLauncher/MyDocument.m Sat Aug 04 22:46:03 2012 +0300 @@ -16,7 +16,7 @@ { self = [super init]; if (self) { - + // Add your subclass-specific initialization here. // If an error occurs here, send a [self dealloc] message and return nil. script = [@".py" retain]; @@ -50,7 +50,7 @@ - (void)update_display { // [[self window] setTitle: script]; - + [interpreter setStringValue: [settings interpreter]]; [honourhashbang setState: [settings honourhashbang]]; [debug setState: [settings debug]]; @@ -62,7 +62,7 @@ [others setStringValue: [settings others]]; [scriptargs setStringValue: [settings scriptargs]]; [with_terminal setState: [settings with_terminal]]; - + [commandline setStringValue: [settings commandLineForScript: script]]; } @@ -75,7 +75,7 @@ { const char *cmdline; int sts; - + cmdline = [[settings commandLineForScript: script] cString]; if ([settings with_terminal]) { sts = doscript(cmdline); @@ -107,8 +107,8 @@ { // Insert code here to read your document from the given data. You can also choose to override -loadFileWrapperRepresentation:ofType: or -readFromFile:ofType: instead. BOOL show_ui; - - // ask the app delegate whether we should show the UI or not. + + // ask the app delegate whether we should show the UI or not. show_ui = [[[NSApplication sharedApplication] delegate] shouldShowUI]; [script release]; script = [fileName retain]; @@ -152,7 +152,7 @@ [self update_display]; } -// FileSettingsSource protocol +// FileSettingsSource protocol - (NSString *) interpreter { return [interpreter stringValue];}; - (BOOL) honourhashbang { return [honourhashbang state];}; - (BOOL) debug { return [debug state];}; diff -r 27ae40361ca5 Mac/PythonLauncher/PreferencesWindowController.m --- a/Mac/PythonLauncher/PreferencesWindowController.m Sat Aug 04 16:17:10 2012 +0200 +++ b/Mac/PythonLauncher/PreferencesWindowController.m Sat Aug 04 22:46:03 2012 +0300 @@ -5,7 +5,7 @@ + getPreferencesWindow { static PreferencesWindowController *_singleton; - + if (!_singleton) _singleton = [[PreferencesWindowController alloc] init]; [_singleton showWindow: _singleton]; @@ -21,14 +21,14 @@ - (void)load_defaults { NSString *title = [filetype titleOfSelectedItem]; - + settings = [FileSettings getDefaultsForFileType: title]; } - (void)update_display { // [[self window] setTitle: script]; - + [interpreter reloadData]; [interpreter setStringValue: [settings interpreter]]; [honourhashbang setState: [settings honourhashbang]]; @@ -41,7 +41,7 @@ [others setStringValue: [settings others]]; [with_terminal setState: [settings with_terminal]]; // Not scriptargs, it isn't for preferences - + [commandline setStringValue: [settings commandLineForScript: @""]]; } @@ -75,7 +75,7 @@ [self update_display]; } -// FileSettingsSource protocol +// FileSettingsSource protocol - (NSString *) interpreter { return [interpreter stringValue];}; - (BOOL) honourhashbang { return [honourhashbang state]; }; - (BOOL) debug { return [debug state];}; diff -r 27ae40361ca5 Mac/PythonLauncher/doscript.m --- a/Mac/PythonLauncher/doscript.m Sat Aug 04 16:17:10 2012 +0200 +++ b/Mac/PythonLauncher/doscript.m Sat Aug 04 22:46:03 2012 +0300 @@ -11,7 +11,7 @@ #import #import "doscript.h" -extern int +extern int doscript(const char *command) { char *bundleID = "com.apple.Terminal"; diff -r 27ae40361ca5 Mac/README --- a/Mac/README Sat Aug 04 16:17:10 2012 +0200 +++ b/Mac/README Sat Aug 04 22:46:03 2012 +0300 @@ -16,7 +16,7 @@ If this argument is specified the build will create a Python.framework rather than a traditional Unix install. See the section - _`Building and using a framework-based Python on Mac OS X` for more + _`Building and using a framework-based Python on Mac OS X` for more information on frameworks. If the optional directory argument is specified the framework is installed @@ -50,7 +50,7 @@ * ``--with-univeral-archs=VALUE`` - Specify the kind of universal binary that should be created. This option is + Specify the kind of universal binary that should be created. This option is only valid when ``--enable-universalsdk`` is specified. The default is ``32-bit`` if a building with a SDK that supports PPC, otherwise defaults to ``intel``. @@ -153,14 +153,14 @@ -------------------------------------------------------------------------- The main reason is because you want to create GUI programs in Python. With the -exception of X11/XDarwin-based GUI toolkits all GUI programs need to be run +exception of X11/XDarwin-based GUI toolkits all GUI programs need to be run from a Mac OSX application bundle (".app"). While it is technically possible to create a .app without using frameworks you will have to do the work yourself if you really want this. A second reason for using frameworks is that they put Python-related items in -only two places: "/Library/Framework/Python.framework" and +only two places: "/Library/Framework/Python.framework" and "/Applications/Python " where ```` can be e.g. "3.3", "2.7", etc. This simplifies matters for users installing Python from a binary distribution if they want to get rid of it again. Moreover, @@ -179,10 +179,10 @@ 3. Do I need extra packages? ---------------------------- -Yes, probably. If you want Tkinter support you need to get the OSX AquaTk +Yes, probably. If you want Tkinter support you need to get the OSX AquaTk distribution, this is installed by default on Mac OS X 10.4 or later. If you want wxPython you need to get that. If you want Cocoa you need to get -PyObjC. +PyObjC. 4. How do I build a framework Python? ------------------------------------- @@ -200,11 +200,11 @@ 1. ./configure --enable-framework 2. make - + 3. make install This sequence will put the framework in ``/Library/Framework/Python.framework``, -the applications in ``/Applications/Python `` and the unix tools in +the applications in ``/Applications/Python `` and the unix tools in ``/usr/local/bin``. Installing in another place, for instance ``$HOME/Library/Frameworks`` if you @@ -266,7 +266,7 @@ use your normal build directory nor does it install into /. Because of the way the script locates the files it needs you have to run it -from within the BuildScript directory. The script accepts a number of +from within the BuildScript directory. The script accepts a number of command-line arguments, run it with --help for more information. Configure warnings @@ -278,7 +278,7 @@ configure: WARNING: libintl.h: check for missing prerequisite headers? configure: WARNING: libintl.h: see the Autoconf documentation configure: WARNING: libintl.h: section "Present But Cannot Be Compiled" - configure: WARNING: libintl.h: proceeding with the preprocessor's result + configure: WARNING: libintl.h: proceeding with the preprocessor's result configure: WARNING: libintl.h: in the future, the compiler will take precedence configure: WARNING: ## -------------------------------------- ## configure: WARNING: ## Report this to http://bugs.python.org/ ## diff -r 27ae40361ca5 Misc/HISTORY --- a/Misc/HISTORY Sat Aug 04 16:17:10 2012 +0200 +++ b/Misc/HISTORY Sat Aug 04 22:46:03 2012 +0300 @@ -158,7 +158,7 @@ - Issue #1210: Fixed imaplib and its documentation. -- Issue #4233: Changed semantic of ``_fileio.FileIO``'s ``close()`` +- Issue #4233: Changed semantic of ``_fileio.FileIO``'s ``close()`` method on file objects with closefd=False. The file descriptor is still kept open but the file object behaves like a closed file. The ``FileIO`` object also got a new readonly attribute ``closefd``. @@ -302,13 +302,13 @@ cyclic garbage collection. - Issue #3668: Fix a memory leak with the "s*" argument parser in - PyArg_ParseTuple and friends, which occurred when the argument for "s*" + PyArg_ParseTuple and friends, which occurred when the argument for "s*" was correctly parsed but parsing of subsequent arguments failed. - Issue #3611: An exception __context__ could be cleared in a complex pattern involving a __del__ method re-raising an exception. -- Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to +- Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to match Python 2.5 speed despite the __instancecheck__ / __subclasscheck__ mechanism. In the process, fix a bug where isinstance() and issubclass(), when given a tuple of classes as second argument, were looking up @@ -386,7 +386,7 @@ - The deprecation warnings for the camelCase threading API names were removed. -- Issue #3110: multiprocessing fails to compiel on solaris 10 due to missing +- Issue #3110: multiprocessing fails to compiel on solaris 10 due to missing SEM_VALUE_MAX. Extension Modules @@ -12099,7 +12099,7 @@ - Improved BeOS support. -- Support dynamic loading of shared libraries on NetBSD platforms that +- Support dynamic loading of shared libraries on NetBSD platforms that use ELF (i.e., MIPS and Alpha systems). Configuration/build changes @@ -12316,7 +12316,7 @@ higher-level classes in code.py. - turtle.py is a new module for simple turtle graphics. I'm still -working on it; let me know if you use this to teach Python to children +working on it; let me know if you use this to teach Python to children or other novices without prior programming experience. Obsoleted library modules @@ -12448,7 +12448,7 @@ Changes to tools ---------------- -- New, improved version of Barry Warsaw's Misc/python-mode.el (editing +- New, improved version of Barry Warsaw's Misc/python-mode.el (editing support for Emacs). - tabnanny.py: added a -q ('quiet') option to tabnanny, which causes @@ -12723,7 +12723,7 @@ ----------------- - Install zlib.dll in the DLLs directory instead of in the win32 -system directory, to avoid conflicts with other applications that have +system directory, to avoid conflicts with other applications that have their own zlib.dll. Test Suite @@ -12803,7 +12803,7 @@ so that a symlink to a symlink can work. - Added a hack so that when you type 'quit' or 'exit' at the -interpreter, you get a friendly explanation of how to press Ctrl-D (or +interpreter, you get a friendly explanation of how to press Ctrl-D (or Ctrl-Z) to exit. - New and improved Misc/python-mode.el (Python mode for Emacs). @@ -12976,13 +12976,13 @@ range. Also, randint(a, b) is now redefined as randrange(a, b+1), adding extra range and type checking to its arguments! -- Add some semi-thread-safety to random.gauss() (it used to be able to +- Add some semi-thread-safety to random.gauss() (it used to be able to crash when invoked from separate threads; now the worst it can do is give a duplicate result occasionally). - Some restructuring and generalization done to cmd.py. -- Major upgrade to ConfigParser.py; converted to using 're', added new +- Major upgrade to ConfigParser.py; converted to using 're', added new exceptions, support underscore in section header and option name. No longer add 'name' option to every section; instead, add '__name__'. @@ -13179,7 +13179,7 @@ ----------------- - The registry key used is now "1.5" instead of "1.5.x" -- so future -versions of 1.5 and Mark Hammond's win32all installer don't need to be +versions of 1.5 and Mark Hammond's win32all installer don't need to be resynchronized. Windows Tools @@ -13246,7 +13246,7 @@ dynamically add one or many entries to the table of built-in modules. - New macro Py_InitModule3(name, methods, doc) which calls -Py_InitModule4() with appropriate arguments. (The -4 variant requires +Py_InitModule4() with appropriate arguments. (The -4 variant requires you to pass an obscure version number constant which is always the same.) - New APIs PySys_WriteStdout() and PySys_WriteStderr() to write to @@ -13318,7 +13318,7 @@ Syntax change ------------- -- The raise statement can now be used without arguments, to re-raise +- The raise statement can now be used without arguments, to re-raise a previously set exception. This should be used after catching an exception with an except clause only, either in the except clause or later in the same function. @@ -13377,7 +13377,7 @@ Demo/tkinter/guido/paint.py -- Dave Mitchell Demo/sockets/unixserver.py -- Piet van Oostrum - + - Much better freeze support. The freeze script can now freeze hierarchical module names (with a corresponding change to import.c), @@ -13516,7 +13516,7 @@ - New command supported by the ftplib module: rmd(); also fixed some minor bugs. -- The profile module now uses a different timer function by default -- +- The profile module now uses a different timer function by default -- time.clock() is generally better than os.times(). This makes it work better on Windows NT, too. @@ -13555,14 +13555,14 @@ - In the multifile module, support the optional second parameter to seek() when possible. -- Several fixes to the gopherlib module by Lars Marius Garshol. Also, +- Several fixes to the gopherlib module by Lars Marius Garshol. Also, urlparse now correctly handles Gopher URLs with query strings. - Fixed a tiny bug in format_exception() in the traceback module. Also rewrite tb_lineno() to be compatible with JPython (and not disturb the current exception!); by Jim Hugunin. -- The httplib module is more robust when servers send a short response +- The httplib module is more robust when servers send a short response -- courtesy Tim O'Malley. Tkinter and friends @@ -13577,7 +13577,7 @@ no longer use the default root. - The interfaces for the bind*() and unbind() widget methods have been -redesigned; the bind*() methods now return the name of the Tcl command +redesigned; the bind*() methods now return the name of the Tcl command created for the callback, and this can be passed as a optional argument to unbind() in order to delete the command (normally, such commands are automatically unbound when the widget is destroyed, but @@ -13613,7 +13613,7 @@ dictionary to allow recursive container types to detect recursion in their repr(), str() and print implementations. -- New function PyObject_Not(x) calculates (not x) according to Python's +- New function PyObject_Not(x) calculates (not x) according to Python's standard rules (basically, it negates the outcome PyObject_IsTrue(x). - New function _PyModule_Clear(), which clears a module's dictionary @@ -13774,7 +13774,7 @@ instances with copy.py. The cPickle.c changes and some pickle.py changes are courtesy Jim Fulton. -- Locale support in he "re" (Perl regular expressions) module. Use +- Locale support in he "re" (Perl regular expressions) module. Use the flag re.L (or re.LOCALE) to enable locale-specific matching rules for \w and \b. The in-line syntax for this flag is (?L). @@ -13840,7 +13840,7 @@ - Some improvements to the _tkinter build line suggested by Case Roole. -- A full suite of platform specific files for NetBSD 1.x, submitted by +- A full suite of platform specific files for NetBSD 1.x, submitted by Anders Andersen. - New Solaris specific header STROPTS.py. @@ -13910,7 +13910,7 @@ if there are lots of duplicates, and otherwise at least as good. - Added "uue" as an alias for "uuencode" to mimetools.py. (Hm, the -uudecode bug where it complaints about trailing garbage is still there +uudecode bug where it complaints about trailing garbage is still there :-( ). - pickle.py requires integers in text mode to be in decimal notation @@ -14686,7 +14686,7 @@ The Python/C API for frames is changed (you shouldn't be using this anyway). -- Significant speedup by inlining some common opcodes for common operand +- Significant speedup by inlining some common opcodes for common operand types (e.g. i+i, i-i, and list[i]). Fredrik Lundh. - Small speedup by reordering the method tables of some common @@ -14712,34 +14712,34 @@ printing the documentation now kills fewer trees -- the margins have been reduced. -- I have started documenting the Python/C API. Unfortunately this project -hasn't been completed yet. It will be complete before the final release of -Python 1.5, though. At the moment, it's better to read the LaTeX source +- I have started documenting the Python/C API. Unfortunately this project +hasn't been completed yet. It will be complete before the final release of +Python 1.5, though. At the moment, it's better to read the LaTeX source than to attempt to run it through LaTeX and print the resulting dvi file. -- The posix module (and hence os.py) now has doc strings! Thanks to Neil -Schemenauer. I received a few other contributions of doc strings. In most +- The posix module (and hence os.py) now has doc strings! Thanks to Neil +Schemenauer. I received a few other contributions of doc strings. In most other places, doc strings are still wishful thinking... Language changes ---------------- -- Private variables with leading double underscore are now a permanent -feature of the language. (These were experimental in release 1.4. I have -favorable experience using them; I can't label them "experimental" +- Private variables with leading double underscore are now a permanent +feature of the language. (These were experimental in release 1.4. I have +favorable experience using them; I can't label them "experimental" forever.) -- There's new string literal syntax for "raw strings". Prefixing a string -literal with the letter r (or R) disables all escape processing in the -string; for example, r'\n' is a two-character string consisting of a -backslash followed by the letter n. This combines with all forms of string -quotes; it is actually useful for triple quoted doc strings which might -contain references to \n or \t. An embedded quote prefixed with a -backslash does not terminate the string, but the backslash is still -included in the string; for example, r'\'' is a two-character string -consisting of a backslash and a quote. (Raw strings are also -affectionately known as Robin strings, after their inventor, Robin +- There's new string literal syntax for "raw strings". Prefixing a string +literal with the letter r (or R) disables all escape processing in the +string; for example, r'\n' is a two-character string consisting of a +backslash followed by the letter n. This combines with all forms of string +quotes; it is actually useful for triple quoted doc strings which might +contain references to \n or \t. An embedded quote prefixed with a +backslash does not terminate the string, but the backslash is still +included in the string; for example, r'\'' is a two-character string +consisting of a backslash and a quote. (Raw strings are also +affectionately known as Robin strings, after their inventor, Robin Friedrich.) - There's a simple assert statement, and a new exception @@ -14768,10 +14768,10 @@ - The obsolete exception ConflictError (presumably used by the long obsolete access statement) has been deleted. -- There's a new function sys.exc_info() which returns the tuple +- There's a new function sys.exc_info() which returns the tuple (sys.exc_type, sys.exc_value, sys.exc_traceback) in a thread-safe way. -- There's a new variable sys.executable, pointing to the executable file +- There's a new variable sys.executable, pointing to the executable file for the Python interpreter. - The sort() methods for lists no longer uses the C library qsort(); I @@ -14797,11 +14797,11 @@ returning from a function that caught an exception. - There's a new "buffer" interface. Certain objects (e.g. strings and -arrays) now support the "buffer" protocol. Buffer objects are acceptable -whenever formerly a string was required for a write operation; mutable +arrays) now support the "buffer" protocol. Buffer objects are acceptable +whenever formerly a string was required for a write operation; mutable buffer objects can be the target of a read operation using the call -f.readinto(buffer). A cool feature is that regular expression matching now -also work on array objects. Contribution by Jack Jansen. (Needs +f.readinto(buffer). A cool feature is that regular expression matching now +also work on array objects. Contribution by Jack Jansen. (Needs documentation.) - String interning: dictionary lookups are faster when the lookup @@ -15093,7 +15093,7 @@ of message sequence specifiers without invoking a subprocess. Also added a createmessage() method by Lars Wirzenius. -- The StringIO.StringIO class now supports readline(nbytes). (Lars +- The StringIO.StringIO class now supports readline(nbytes). (Lars Wirzenius.) (Of course, you should be using cStringIO for performance.) - UserDict.py supports the new dictionary methods as well. @@ -15141,8 +15141,8 @@ - Various small fixes to the nntplib.py module that I can't bother to document in detail. -- Sjoerd Mullender's mimify.py module now supports base64 encoding and -includes functions to handle the funny encoding you sometimes see in mail +- Sjoerd Mullender's mimify.py module now supports base64 encoding and +includes functions to handle the funny encoding you sometimes see in mail headers. It is now documented. - mailbox.py: Added BabylMailbox. Improved the way the mailbox is @@ -15493,23 +15493,23 @@ NT (the old VC++ 4.2 Makefile is also still supported, but will eventually be withdrawn due to its bulkiness). -- See the note on the new module search path in the "Miscellaneous" section +- See the note on the new module search path in the "Miscellaneous" section above. - Support for Win32s (the 32-bit Windows API under Windows 3.1) is basically withdrawn. If it still works for you, you're lucky. -- There's a new extension module, msvcrt.c, which provides various -low-level operations defined in the Microsoft Visual C++ Runtime Library. -These include locking(), setmode(), get_osfhandle(), set_osfhandle(), and +- There's a new extension module, msvcrt.c, which provides various +low-level operations defined in the Microsoft Visual C++ Runtime Library. +These include locking(), setmode(), get_osfhandle(), set_osfhandle(), and console I/O functions like kbhit(), getch() and putch(). - The -u option not only sets the standard I/O streams to unbuffered status, but also sets them in binary mode. (This can also be done using msvcrt.setmode(), by the way.) -- The, sys.prefix and sys.exec_prefix variables point to the directory -where Python is installed, or to the top of the source tree, if it was run +- The, sys.prefix and sys.exec_prefix variables point to the directory +where Python is installed, or to the top of the source tree, if it was run from there. - The various os.path modules (posixpath, ntpath, macpath) now support @@ -15517,7 +15517,7 @@ os.path.join(a, b, c) is the same as os.path.join(a, os.path.join(b, c)). -- The ntpath module (normally used as os.path) supports ~ to $HOME +- The ntpath module (normally used as os.path) supports ~ to $HOME expansion in expanduser(). - The freeze tool now works on Windows. @@ -15815,47 +15815,47 @@ - New module whichdb recognizes dbm, gdbm and bsddb/dbhash files. -- The Doc/Makefile targets have been reorganized somewhat to remove the +- The Doc/Makefile targets have been reorganized somewhat to remove the insistence on always generating PostScript. - The texinfo to html filter (Doc/texi2html.py) has been improved somewhat. -- "errors.h" has been renamed to "pyerrors.h" to resolve a long-standing +- "errors.h" has been renamed to "pyerrors.h" to resolve a long-standing name conflict on the Mac. -- Linking a module compiled with a different setting for Py_TRACE_REFS now +- Linking a module compiled with a different setting for Py_TRACE_REFS now generates a linker error rather than a core dump. -- The cgi module has a new convenience function print_exception(), which -formats a python exception using HTML. It also fixes a bug in the -compatibility code and adds a dubious feature which makes it possible to +- The cgi module has a new convenience function print_exception(), which +formats a python exception using HTML. It also fixes a bug in the +compatibility code and adds a dubious feature which makes it possible to have two query strings, one in the URL and one in the POST data. -- A subtle change in the unpickling of class instances makes it possible -to unpickle in restricted execution mode, where the __dict__ attribute is +- A subtle change in the unpickling of class instances makes it possible +to unpickle in restricted execution mode, where the __dict__ attribute is not available (but setattr() is). -- Documentation for os.path.splitext() (== posixpath.splitext()) has been +- Documentation for os.path.splitext() (== posixpath.splitext()) has been cleared up. It splits at the *last* dot. - posixfile locking is now also correctly supported on AIX. -- The tempfile module once again honors an initial setting of tmpdir. It +- The tempfile module once again honors an initial setting of tmpdir. It now works on Windows, too. -- The traceback module has some new functions to extract, format and print +- The traceback module has some new functions to extract, format and print the active stack. -- Some translation functions in the urllib module have been made a little +- Some translation functions in the urllib module have been made a little less sluggish. -- The addtag_* methods for Canvas widgets in Tkinter as well as in the -separate Canvas class have been fixed so they actually do something +- The addtag_* methods for Canvas widgets in Tkinter as well as in the +separate Canvas class have been fixed so they actually do something meaningful. - A tiny _test() function has been added to Tkinter.py. -- A generic Makefile for dynamically loaded modules is provided in the Misc +- A generic Makefile for dynamically loaded modules is provided in the Misc subdirectory (Misc/gMakefile). - A new version of python-mode.el for Emacs is provided. See @@ -15863,25 +15863,25 @@ separate file pyimenu.el is no longer needed, imenu support is folded into python-mode.el. -- The configure script can finally correctly find the readline library in a -non-standard location. The LDFLAGS variable is passed on the Makefiles +- The configure script can finally correctly find the readline library in a +non-standard location. The LDFLAGS variable is passed on the Makefiles from the configure script. -- Shared libraries are now installed as programs (i.e. with executable +- Shared libraries are now installed as programs (i.e. with executable permission). This is required on HP-UX and won't hurt on other systems. -- The objc.c module is no longer part of the distribution. Objective-C +- The objc.c module is no longer part of the distribution. Objective-C support may become available as contributed software on the ftp site. - The sybase module is no longer part of the distribution. A much improved sybase module is available as contributed software from the ftp site. -- _tkinter is now compatible with Tcl 7.5 / Tk 4.1 patch1 on Windows and -Mac (don't use unpatched Tcl/Tk!). The default line in the Setup.in file +- _tkinter is now compatible with Tcl 7.5 / Tk 4.1 patch1 on Windows and +Mac (don't use unpatched Tcl/Tk!). The default line in the Setup.in file now links with Tcl 7.5 / Tk 4.1 rather than 7.4/4.0. -- In Setup, you can now write "*shared*" instead of "*noconfig*", and you +- In Setup, you can now write "*shared*" instead of "*noconfig*", and you can use *.so and *.sl as shared libraries. - Some more fidgeting for AIX shared libraries. @@ -15890,81 +15890,81 @@ (Note -- a complete replacement by Niels Mo"ller, called gpmodule, is available from the contrib directory on the ftp site.) -- A warning is written to sys.stderr when a __del__ method raises an +- A warning is written to sys.stderr when a __del__ method raises an exception (formerly, such exceptions were completely ignored). -- The configure script now defines HAVE_OLD_CPP if the C preprocessor is +- The configure script now defines HAVE_OLD_CPP if the C preprocessor is incapable of ANSI style token concatenation and stringification. -- All source files (except a few platform specific modules) are once again +- All source files (except a few platform specific modules) are once again compatible with K&R C compilers as well as ANSI compilers. In particular, -ANSI-isms have been removed or made conditional in complexobject.c, +ANSI-isms have been removed or made conditional in complexobject.c, getargs.c and operator.c. -- The abstract object API has three new functions, PyObject_DelItem, +- The abstract object API has three new functions, PyObject_DelItem, PySequence_DelItem, and PySequence_DelSlice. -- The operator module has new functions delitem and delslice, and the -functions "or" and "and" are renamed to "or_" and "and_" (since "or" and +- The operator module has new functions delitem and delslice, and the +functions "or" and "and" are renamed to "or_" and "and_" (since "or" and "and" are reserved words). ("__or__" and "__and__" are unchanged.) -- The environment module is no longer supported; putenv() is now a function +- The environment module is no longer supported; putenv() is now a function in posixmodule (also under NT). - Error in filter(, "") has been fixed. - Unrecognized keyword arguments raise TypeError, not KeyError. -- Better portability, fewer bugs and memory leaks, fewer compiler warnings, +- Better portability, fewer bugs and memory leaks, fewer compiler warnings, some more documentation. -- Bug in float power boundary case (0.0 to the negative integer power) +- Bug in float power boundary case (0.0 to the negative integer power) fixed. -- The test of negative number to the float power has been moved from the -built-in pow() functin to floatobject.c (so complex numbers can yield the +- The test of negative number to the float power has been moved from the +built-in pow() functin to floatobject.c (so complex numbers can yield the correct result). -- The bug introduced in beta2 where shared libraries loaded (using +- The bug introduced in beta2 where shared libraries loaded (using dlopen()) from the current directory would fail, has been fixed. -- Modules imported as shared libraries now also have a __file__ attribute, -giving the filename from which they were loaded. The only modules without +- Modules imported as shared libraries now also have a __file__ attribute, +giving the filename from which they were loaded. The only modules without a __file__ attribute now are built-in modules. -- On the Mac, dynamically loaded modules can end in either ".slb" or -"..slb" where is either "CFM68K" or "ppc". The ".slb" +- On the Mac, dynamically loaded modules can end in either ".slb" or +"..slb" where is either "CFM68K" or "ppc". The ".slb" extension should only be used for "fat" binaries. -- C API addition: marshal.c now supports +- C API addition: marshal.c now supports PyMarshal_WriteObjectToString(object). - C API addition: getargs.c now supports PyArg_ParseTupleAndKeywords(args, kwdict, format, kwnames, ...) to parse keyword arguments. -- The PC versioning scheme (sys.winver) has changed once again. the -version number is now "...", where the -first three s are the Python version (e.g. "1.4.0" for Python 1.4, -"1.4.1" for Python 1.4.1 -- the beta level is not included) and +- The PC versioning scheme (sys.winver) has changed once again. the +version number is now "...", where the +first three s are the Python version (e.g. "1.4.0" for Python 1.4, +"1.4.1" for Python 1.4.1 -- the beta level is not included) and is the four-digit PYTHON_API_VERSION (currently 1005). - h2py.py accepts whitespace before the # in CPP directives -- On Solaris 2.5, it should now be possible to use either Posix threads or -Solaris threads (XXX: how do you select which is used???). (Note: the -Python pthreads interface doesn't fully support semaphores yet -- anyone +- On Solaris 2.5, it should now be possible to use either Posix threads or +Solaris threads (XXX: how do you select which is used???). (Note: the +Python pthreads interface doesn't fully support semaphores yet -- anyone care to fix this?) -- Thread support should now work on AIX, using either DCE threads or +- Thread support should now work on AIX, using either DCE threads or pthreads. - New file Demo/sockets/unicast.py -- Working Mac port, with CFM68K support, with Tk 4.1 support (though not +- Working Mac port, with CFM68K support, with Tk 4.1 support (though not both) (XXX) -- New project setup for PC port, now compatible with PythonWin, with +- New project setup for PC port, now compatible with PythonWin, with _tkinter and NumPy support (XXX) - New module site.py (XXX) @@ -15981,7 +15981,7 @@ - string.atoi c.s. now raise an exception for an empty input string. -- At last, it is no longer necessary to define HAVE_CONFIG_H in order to +- At last, it is no longer necessary to define HAVE_CONFIG_H in order to have config.h included at various places. - Unrecognized keyword arguments now raise TypeError rather than KeyError. @@ -15989,25 +15989,25 @@ - The makesetup script recognizes files with extension .so or .sl as (shared) libraries. -- 'access' is no longer a reserved word, and all code related to its -implementation is gone (or at least #ifdef'ed out). This should make +- 'access' is no longer a reserved word, and all code related to its +implementation is gone (or at least #ifdef'ed out). This should make Python a little speedier too! -- Performance enhancements suggested by Sjoerd Mullender. This includes -the introduction of two new optional function pointers in type object, -getattro and setattro, which are like getattr and setattr but take a +- Performance enhancements suggested by Sjoerd Mullender. This includes +the introduction of two new optional function pointers in type object, +getattro and setattro, which are like getattr and setattr but take a string object instead of a C string pointer. -- New operations in string module: lstrip(s) and rstrip(s) strip whitespace -only on the left or only on the right, A new optional third argument to -split() specifies the maximum number of separators honored (so -splitfields(s, sep, n) returns a list of at most n+1 elements). (Since +- New operations in string module: lstrip(s) and rstrip(s) strip whitespace +only on the left or only on the right, A new optional third argument to +split() specifies the maximum number of separators honored (so +splitfields(s, sep, n) returns a list of at most n+1 elements). (Since 1.3, splitfields(s, None) is totally equivalent to split(s).) -string.capwords() has an optional second argument specifying the +string.capwords() has an optional second argument specifying the separator (which is passed to split()). -- regsub.split() has the same addition as string.split(). regsub.splitx(s, -sep, maxsep) implements the functionality that was regsub.split(s, 1) in +- regsub.split() has the same addition as string.split(). regsub.splitx(s, +sep, maxsep) implements the functionality that was regsub.split(s, 1) in 1.4beta2 (return a list containing the delimiters as well as the words). - Final touch for AIX loading, rewritten Misc/AIX-NOTES. @@ -16051,11 +16051,11 @@ meaningful value (a few things were botched in beta 1). Lib/dos_8x3 is now a standard part of the distribution (alas). -- More improvements to the installation procedure. Typing "make install" -now inserts the version number in the pathnames of almost everything -installed, and creates the machine dependent modules (FCNTL.py etc.) if not -supplied by the distribution. (XXX There's still a problem with the latter -because the "regen" script requires that Python is installed. Some manual +- More improvements to the installation procedure. Typing "make install" +now inserts the version number in the pathnames of almost everything +installed, and creates the machine dependent modules (FCNTL.py etc.) if not +supplied by the distribution. (XXX There's still a problem with the latter +because the "regen" script requires that Python is installed. Some manual intervention may still be required.) (This has been fixed in 1.4beta3.) - New modules: errno, operator (XXX). @@ -16118,8 +16118,8 @@ - Added sys.platform and sys.exec_platform for Bill Janssen. -- Installation has been completely overhauled. "make install" now installs -everything, not just the python binary. Installation uses the install-sh +- Installation has been completely overhauled. "make install" now installs +everything, not just the python binary. Installation uses the install-sh script (borrowed from X11) to install each file. - New functions in the posix module: mkfifo, plock, remove (== unlink), @@ -16129,59 +16129,59 @@ - Shared library support for FreeBSD. -- The --with-readline option can now be used without a DIRECTORY argument, -for systems where libreadline.* is in one of the standard places. It is +- The --with-readline option can now be used without a DIRECTORY argument, +for systems where libreadline.* is in one of the standard places. It is also possible for it to be a shared library. -- The extension tkinter has been renamed to _tkinter, to avoid confusion -with Tkinter.py oncase insensitive file systems. It now supports Tk 4.1 as +- The extension tkinter has been renamed to _tkinter, to avoid confusion +with Tkinter.py oncase insensitive file systems. It now supports Tk 4.1 as well as 4.0. -- Author's change of address from CWI in Amsterdam, The Netherlands, to +- Author's change of address from CWI in Amsterdam, The Netherlands, to CNRI in Reston, VA, USA. -- The math.hypot() function is now always available (if it isn't found in +- The math.hypot() function is now always available (if it isn't found in the C math library, Python provides its own implementation). -- The latex documentation is now compatible with latex2e, thanks to David +- The latex documentation is now compatible with latex2e, thanks to David Ascher. - The expression x**y is now equivalent to pow(x, y). - The indexing expression x[a, b, c] is now equivalent to x[(a, b, c)]. -- Complex numbers are now supported. Imaginary constants are written with -a 'j' or 'J' prefix, general complex numbers can be formed by adding a real -part to an imaginary part, like 3+4j. Complex numbers are always stored in -floating point form, so this is equivalent to 3.0+4.0j. It is also -possible to create complex numbers with the new built-in function -complex(re, [im]). For the footprint-conscious, complex number support can +- Complex numbers are now supported. Imaginary constants are written with +a 'j' or 'J' prefix, general complex numbers can be formed by adding a real +part to an imaginary part, like 3+4j. Complex numbers are always stored in +floating point form, so this is equivalent to 3.0+4.0j. It is also +possible to create complex numbers with the new built-in function +complex(re, [im]). For the footprint-conscious, complex number support can be disabled by defining the symbol WITHOUT_COMPLEX. - New built-in function list() is the long-awaited counterpart of tuple(). -- There's a new "cmath" module which provides the same functions as the -"math" library but with complex arguments and results. (There are very -good reasons why math.sqrt(-1) still raises an exception -- you have to use +- There's a new "cmath" module which provides the same functions as the +"math" library but with complex arguments and results. (There are very +good reasons why math.sqrt(-1) still raises an exception -- you have to use cmath.sqrt(-1) to get 1j for an answer.) -- The Python.h header file (which is really the same as allobjects.h except -it disables support for old style names) now includes several more files, +- The Python.h header file (which is really the same as allobjects.h except +it disables support for old style names) now includes several more files, so you have to have fewer #include statements in the average extension. -- The NDEBUG symbol is no longer used. Code that used to be dependent on -the presence of NDEBUG is now present on the absence of DEBUG. TRACE_REFS -and REF_DEBUG have been renamed to Py_TRACE_REFS and Py_REF_DEBUG, -respectively. At long last, the source actually compiles and links without +- The NDEBUG symbol is no longer used. Code that used to be dependent on +the presence of NDEBUG is now present on the absence of DEBUG. TRACE_REFS +and REF_DEBUG have been renamed to Py_TRACE_REFS and Py_REF_DEBUG, +respectively. At long last, the source actually compiles and links without errors when this symbol is defined. -- Several symbols that didn't follow the new naming scheme have been -renamed (usually by adding to rename2.h) to use a Py or _Py prefix. There -are no external symbols left without a Py or _Py prefix, not even those -defined by sources that were incorporated from elsewhere (regexpr.c, +- Several symbols that didn't follow the new naming scheme have been +renamed (usually by adding to rename2.h) to use a Py or _Py prefix. There +are no external symbols left without a Py or _Py prefix, not even those +defined by sources that were incorporated from elsewhere (regexpr.c, md5c.c). (Macros are a different story...) -- There are now typedefs for the structures defined in config.c and +- There are now typedefs for the structures defined in config.c and frozen.c. - New PYTHON_API_VERSION value and .pyc file magic number. @@ -16195,125 +16195,125 @@ - The binhex and binascii modules now actually work. - The cgi module has been almost totally rewritten and documented. -It now supports file upload and a new data type to handle forms more +It now supports file upload and a new data type to handle forms more flexibly. - The formatter module (for use with htmllib) has been overhauled (again). - The ftplib module now supports passive mode and has doc strings. -- In (ideally) all places where binary files are read or written, the file -is now correctly opened in binary mode ('rb' or 'wb') so the code will work +- In (ideally) all places where binary files are read or written, the file +is now correctly opened in binary mode ('rb' or 'wb') so the code will work on Mac or PC. -- Dummy versions of os.path.expandvars() and expanduser() are now provided +- Dummy versions of os.path.expandvars() and expanduser() are now provided on non-Unix platforms. -- Module urllib now has two new functions url2pathname and pathname2url -which turn local filenames into "file:..." URLs using the same rules as -Netscape (why be different). it also supports urlretrieve() with a -pathname parameter, and honors the proxy environment variables (http_proxy +- Module urllib now has two new functions url2pathname and pathname2url +which turn local filenames into "file:..." URLs using the same rules as +Netscape (why be different). it also supports urlretrieve() with a +pathname parameter, and honors the proxy environment variables (http_proxy etc.). The URL parsing has been improved somewhat, too. -- Micro improvements to urlparse. Added urlparse.urldefrag() which +- Micro improvements to urlparse. Added urlparse.urldefrag() which removes a trailing ``#fragment'' if any. - The mailbox module now supports MH style message delimiters as well. -- The mhlib module contains some new functionality: setcontext() to set the -current folder and parsesequence() to parse a sequence as commonly passed +- The mhlib module contains some new functionality: setcontext() to set the +current folder and parsesequence() to parse a sequence as commonly passed to MH commands (e.g. 1-10 or last:5). -- New module mimify for conversion to and from MIME format of email +- New module mimify for conversion to and from MIME format of email messages. -- Module ni now automatically installs itself when first imported -- this -is against the normal rule that modules should define classes and functions -but not invoke them, but appears more useful in the case that two +- Module ni now automatically installs itself when first imported -- this +is against the normal rule that modules should define classes and functions +but not invoke them, but appears more useful in the case that two different, independent modules want to use ni's features. - Some small performance enhancements in module pickle. -- Small interface change to the profile.run*() family of functions -- more +- Small interface change to the profile.run*() family of functions -- more sensible handling of return values. -- The officially registered Mac creator for Python files is 'Pyth'. This +- The officially registered Mac creator for Python files is 'Pyth'. This replaces 'PYTH' which was used before but never registered. - Added regsub.capwords(). (XXX) -- Added string.capwords(), string.capitalize() and string.translate(). +- Added string.capwords(), string.capitalize() and string.translate(). (XXX) -- Fixed an interface bug in the rexec module: it was impossible to pass a -hooks instance to the RExec class. rexec now also supports the dynamic -loading of modules from shared libraries. Some other interfaces have been +- Fixed an interface bug in the rexec module: it was impossible to pass a +hooks instance to the RExec class. rexec now also supports the dynamic +loading of modules from shared libraries. Some other interfaces have been added too. -- Module rfc822 now caches the headers in a dictionary for more efficient +- Module rfc822 now caches the headers in a dictionary for more efficient lookup. -- The sgmllib module now understands a limited number of SGML "shorthands" +- The sgmllib module now understands a limited number of SGML "shorthands" like .... (It's not clear that this was a good idea...) -- The tempfile module actually tries a number of different places to find a -usable temporary directory. (This was prompted by certain Linux -installations that appear to be missing a /usr/tmp directory.) [A bug in -the implementation that would ignore a pre-existing tmpdir global has been +- The tempfile module actually tries a number of different places to find a +usable temporary directory. (This was prompted by certain Linux +installations that appear to be missing a /usr/tmp directory.) [A bug in +the implementation that would ignore a pre-existing tmpdir global has been fixed in beta3.] - Much improved and enhanved FileDialog module for Tkinter. -- Many small changes to Tkinter, to bring it more in line with Tk 4.0 (as +- Many small changes to Tkinter, to bring it more in line with Tk 4.0 (as well as Tk 4.1). -- New socket interfaces include ntohs(), ntohl(), htons(), htonl(), and -s.dup(). Sockets now work correctly on Windows. On Windows, the built-in -extension is called _socket and a wrapper module win/socket.py provides -"makefile()" and "dup()" functionality. On Windows, the select module +- New socket interfaces include ntohs(), ntohl(), htons(), htonl(), and +s.dup(). Sockets now work correctly on Windows. On Windows, the built-in +extension is called _socket and a wrapper module win/socket.py provides +"makefile()" and "dup()" functionality. On Windows, the select module works only with socket objects. - Bugs in bsddb module fixed (e.g. missing default argument values). - The curses extension now includes when available. -- The gdbm module now supports opening databases in "fast" mode by +- The gdbm module now supports opening databases in "fast" mode by specifying 'f' as the second character or the mode string. -- new variables sys.prefix and sys.exec_prefix pass corresponding +- new variables sys.prefix and sys.exec_prefix pass corresponding configuration options / Makefile variables to the Python programmer. -- The ``new'' module now supports creating new user-defined classes as well +- The ``new'' module now supports creating new user-defined classes as well as instances thereof. -- The soundex module now sports get_soundex() to get the soundex value for an -arbitrary string (formerly it would only do soundex-based string +- The soundex module now sports get_soundex() to get the soundex value for an +arbitrary string (formerly it would only do soundex-based string comparison) as well as doc strings. -- New object type "cobject" to safely wrap void pointers for passing them +- New object type "cobject" to safely wrap void pointers for passing them between various extension modules. - More efficient computation of float**smallint. -- The mysterious bug whereby "x.x" (two occurrences of the same -one-character name) typed from the commandline would sometimes fail +- The mysterious bug whereby "x.x" (two occurrences of the same +one-character name) typed from the commandline would sometimes fail mysteriously. -- The initialization of the readline function can now be invoked by a C +- The initialization of the readline function can now be invoked by a C extension through PyOS_ReadlineInit(). -- There's now an externally visible pointer PyImport_FrozenModules which +- There's now an externally visible pointer PyImport_FrozenModules which can be changed by an embedding application. -- The argument parsing functions now support a new format character 'D' to +- The argument parsing functions now support a new format character 'D' to specify complex numbers. - Various memory leaks plugged and bugs fixed. -- Improved support for posix threads (now that real implementations are +- Improved support for posix threads (now that real implementations are beginning to apepar). Still no fully functioning semaphores. -- Some various and sundry improvements and new entries in the Tools +- Some various and sundry improvements and new entries in the Tools directory. @@ -17923,7 +17923,7 @@ The limit on the size of the *run-time* stack has completely been removed -- this means that tuple or list displays can contain any number of elements (formerly more than 50 would crash the -interpreter). +interpreter). Changes to existing built-in functions and methods diff -r 27ae40361ca5 Misc/Porting --- a/Misc/Porting Sat Aug 04 16:17:10 2012 +0200 +++ b/Misc/Porting Sat Aug 04 22:46:03 2012 +0300 @@ -27,7 +27,7 @@ support. Start with Modules/config.c.in. Finally, you'll run into some things that aren't supported on your -target platform. Forget about the posix module for now -- simply take +target platform. Forget about the posix module for now -- simply take it out of the config.c file. Bang on it until you get a >>> prompt. (You may have to disable the diff -r 27ae40361ca5 Misc/RPM/python-3.3.spec --- a/Misc/RPM/python-3.3.spec Sat Aug 04 16:17:10 2012 +0200 +++ b/Misc/RPM/python-3.3.spec Sat Aug 04 22:46:03 2012 +0300 @@ -269,7 +269,7 @@ if [ ! -z "%{binsuffix}" ] then rm -f $RPM_BUILD_ROOT%{__prefix}/bin/python[0-9a-zA-Z]* - ( cd $RPM_BUILD_ROOT%{__prefix}/bin; + ( cd $RPM_BUILD_ROOT%{__prefix}/bin; for file in *; do mv "$file" "$file"%{binsuffix}; done ) ( cd $RPM_BUILD_ROOT%{_mandir}/man1; mv python.1 python%{binsuffix}.1 ) fi diff -r 27ae40361ca5 Misc/Vim/python.vim --- a/Misc/Vim/python.vim Sat Aug 04 16:17:10 2012 +0200 +++ b/Misc/Vim/python.vim Sat Aug 04 22:46:03 2012 +0300 @@ -38,10 +38,10 @@ syn region pythonString matchgroup=Normal start=+[uU]\="+ end=+"+ skip=+\\\\\|\\"+ contains=pythonEscape syn region pythonString matchgroup=Normal start=+[uU]\="""+ end=+"""+ contains=pythonEscape syn region pythonString matchgroup=Normal start=+[uU]\='''+ end=+'''+ contains=pythonEscape -syn region pythonString matchgroup=Normal start=+[uU]\=[rR]'+ end=+'+ skip=+\\\\\|\\'+ -syn region pythonString matchgroup=Normal start=+[uU]\=[rR]"+ end=+"+ skip=+\\\\\|\\"+ -syn region pythonString matchgroup=Normal start=+[uU]\=[rR]"""+ end=+"""+ -syn region pythonString matchgroup=Normal start=+[uU]\=[rR]'''+ end=+'''+ +syn region pythonString matchgroup=Normal start=+[uU]\=[rR]'+ end=+'+ skip=+\\\\\|\\'+ +syn region pythonString matchgroup=Normal start=+[uU]\=[rR]"+ end=+"+ skip=+\\\\\|\\"+ +syn region pythonString matchgroup=Normal start=+[uU]\=[rR]"""+ end=+"""+ +syn region pythonString matchgroup=Normal start=+[uU]\=[rR]'''+ end=+'''+ syn match pythonEscape +\\[abfnrtv\'"\\]+ contained syn match pythonEscape "\\\o\{1,3}" contained @@ -73,7 +73,7 @@ syn keyword pythonBuiltin max min object oct open ord pow property quit syn keyword pythonBuiltin range reload repr reversed round syn keyword pythonBuiltin set setattr slice sorted staticmethod str sum - syn keyword pythonBuiltin super trunc tuple type unicode vars + syn keyword pythonBuiltin super trunc tuple type unicode vars syn keyword pythonBuiltin zip endif diff -r 27ae40361ca5 Misc/Vim/vimrc --- a/Misc/Vim/vimrc Sat Aug 04 16:17:10 2012 +0200 +++ b/Misc/Vim/vimrc Sat Aug 04 22:46:03 2012 +0300 @@ -29,7 +29,7 @@ if search('^\t', 'n', 150) set shiftwidth=8 set noexpandtab - el + el set shiftwidth=4 set expandtab en @@ -46,7 +46,7 @@ au BufRead,BufNewFile *.py,*.pyw,*.c,*.h,*.rst match BadWhitespace /\s\+$/ " Wrap text after a certain number of characters -" Python: 79 +" Python: 79 " C: 79 au BufRead,BufNewFile *.py,*.pyw,*.c,*.h set textwidth=79 diff -r 27ae40361ca5 Misc/gdbinit --- a/Misc/gdbinit Sat Aug 04 16:17:10 2012 +0200 +++ b/Misc/gdbinit Sat Aug 04 22:46:03 2012 +0300 @@ -150,10 +150,10 @@ # generally useful macro to print a Unicode string def pu - set $uni = $arg0 + set $uni = $arg0 set $i = 0 while (*$uni && $i++<100) - if (*$uni < 0x80) + if (*$uni < 0x80) print *(char*)$uni++ else print /x *(short*)$uni++ diff -r 27ae40361ca5 Misc/python.man --- a/Misc/python.man Sat Aug 04 16:17:10 2012 +0200 +++ b/Misc/python.man Sat Aug 04 22:46:03 2012 +0300 @@ -23,7 +23,7 @@ .B \-i ] [ -.B \-m +.B \-m .I module-name ] [ @@ -94,10 +94,10 @@ applications. See the internal documentation for hints. .PP -Documentation for installed Python modules and packages can be -viewed by running the +Documentation for installed Python modules and packages can be +viewed by running the .B pydoc -program. +program. .SH COMMAND LINE OPTIONS .TP .B \-B @@ -129,10 +129,10 @@ raises an exception. .TP .BI "\-m " module-name -Searches -.I sys.path -for the named module and runs the corresponding -.I .py +Searches +.I sys.path +for the named module and runs the corresponding +.I .py file as a script. .TP .B \-O @@ -145,7 +145,7 @@ Discard docstrings in addition to the \fB-O\fP optimizations. .TP .B \-q -Do not print the version and copyright messages. These messages are +Do not print the version and copyright messages. These messages are also suppressed in non-interactive mode. .TP .B \-s @@ -171,7 +171,7 @@ .B \-v Print a message each time a module is initialized, showing the place (filename or built-in module) from which it is loaded. When given -twice, print a message for each file that is checked for when +twice, print a message for each file that is checked for when searching for a module. Also provides information on module cleanup at exit. .TP @@ -398,7 +398,7 @@ .IP PYTHONVERBOSE If this is set to a non-empty string it is equivalent to specifying the \fB\-v\fP option. If set to an integer, it is equivalent to -specifying \fB\-v\fP multiple times. +specifying \fB\-v\fP multiple times. .IP PYTHONWARNINGS If this is set to a comma-separated string it is equivalent to specifying the \fB\-W\fP option for each separate value. diff -r 27ae40361ca5 Misc/python.pc.in --- a/Misc/python.pc.in Sat Aug 04 16:17:10 2012 +0200 +++ b/Misc/python.pc.in Sat Aug 04 22:46:03 2012 +0300 @@ -6,7 +6,7 @@ Name: Python Description: Python library -Requires: +Requires: Version: @VERSION@ Libs.private: @LIBS@ Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@ diff -r 27ae40361ca5 Modules/Setup.dist --- a/Modules/Setup.dist Sat Aug 04 16:17:10 2012 +0200 +++ b/Modules/Setup.dist Sat Aug 04 22:46:03 2012 +0300 @@ -102,7 +102,7 @@ # various reasons; therefore they are listed here instead of in the # normal order. -# This only contains the minimal set of modules required to run the +# This only contains the minimal set of modules required to run the # setup.py script in the root of the Python source tree. posix posixmodule.c # posix (UNIX) system calls @@ -115,7 +115,7 @@ _functools _functoolsmodule.c # Tools for working with functions and callable objects operator operator.c # operator.add() and similar goodies _collections _collectionsmodule.c # Container types -itertools itertoolsmodule.c # Functions creating iterators for efficient looping +itertools itertoolsmodule.c # Functions creating iterators for efficient looping # access to ISO C locale support _locale _localemodule.c # -lintl @@ -133,9 +133,9 @@ # The rest of the modules listed in this file are all commented out by # default. Usually they can be detected and built as dynamically # loaded modules by the new setup.py script added in Python 2.1. If -# you're on a platform that doesn't support dynamic loading, want to -# compile modules statically into the Python binary, or need to -# specify some odd set of compiler switches, you can uncomment the +# you're on a platform that doesn't support dynamic loading, want to +# compile modules statically into the Python binary, or need to +# specify some odd set of compiler switches, you can uncomment the # appropriate lines below. # ====================================================================== @@ -185,7 +185,7 @@ # supported...) #fcntl fcntlmodule.c # fcntl(2) and ioctl(2) -#spwd spwdmodule.c # spwd(3) +#spwd spwdmodule.c # spwd(3) #grp grpmodule.c # grp(3) #select selectmodule.c # select(2); not on ancient System V @@ -301,7 +301,7 @@ #_curses _cursesmodule.c -lcurses -ltermcap # Wrapper for the panel library that's part of ncurses and SYSV curses. -#_curses_panel _curses_panel.c -lpanel -lncurses +#_curses_panel _curses_panel.c -lpanel -lncurses # Modules that provide persistent dictionary-like semantics. You will diff -r 27ae40361ca5 Modules/_ctypes/darwin/LICENSE --- a/Modules/_ctypes/darwin/LICENSE Sat Aug 04 16:17:10 2012 +0200 +++ b/Modules/_ctypes/darwin/LICENSE Sat Aug 04 22:46:03 2012 +0300 @@ -1,6 +1,6 @@ Copyright (c) 2002 Jorge Acereda & Peter O'Gorman - + Portions may be copyright others, see the AUTHORS file included with this distribution. diff -r 27ae40361ca5 Modules/_ctypes/darwin/README --- a/Modules/_ctypes/darwin/README Sat Aug 04 16:17:10 2012 +0200 +++ b/Modules/_ctypes/darwin/README Sat Aug 04 22:46:03 2012 +0300 @@ -4,17 +4,17 @@ This is dlcompat, a small library that emulates the dlopen() interface on top of Darwin's dyld API. -dlcompat allows loading a ".dylib" library (as long as the RTLD_LOCAL -flag isn't passed to dlopen()). It can be configured to yield a warning +dlcompat allows loading a ".dylib" library (as long as the RTLD_LOCAL +flag isn't passed to dlopen()). It can be configured to yield a warning when trying to close it (dynamic libraries cannot currently be unloaded). -It automatically searches for modules in several directories when no -absolute path is specified and the module is not found in the current +It automatically searches for modules in several directories when no +absolute path is specified and the module is not found in the current directory. The paths searched are those specified in the environment variables -LD_LIBRARY_PATH and DYLD_LIBRARY_PATH plus /lib, /usr/local/lib and -/usr/lib or the path specified in the environment variable +LD_LIBRARY_PATH and DYLD_LIBRARY_PATH plus /lib, /usr/local/lib and +/usr/lib or the path specified in the environment variable DYLD_FALLBACK_LIBRARY_PATH. In the default install the behavior of dlsym is to automatically prepend @@ -48,7 +48,7 @@ ./configure --enable-debug make sudo make install - + If you want old dlcompat style behavior of not prepending the underscore on calls to dlsym then type: diff -r 27ae40361ca5 Modules/_decimal/README.txt --- a/Modules/_decimal/README.txt Sat Aug 04 16:17:10 2012 +0200 +++ b/Modules/_decimal/README.txt Sat Aug 04 22:46:03 2012 +0300 @@ -37,7 +37,7 @@ NOTE ==== - + decimal.so is not built from a static libmpdec.a since doing so led to failures on AIX (user report) and Windows (mixing static and dynamic CRTs causes locale problems and more). diff -r 27ae40361ca5 Modules/ld_so_aix.in --- a/Modules/ld_so_aix.in Sat Aug 04 16:17:10 2012 +0200 +++ b/Modules/ld_so_aix.in Sat Aug 04 22:46:03 2012 +0300 @@ -5,7 +5,7 @@ # TYPE: executable, uses makexp_aix # SYSTEM: AIX # -# DESCRIPTION: Creates a shareable .o from a set of pre-compiled +# DESCRIPTION: Creates a shareable .o from a set of pre-compiled # (unshared) .o files # # USAGE: ld_so_aix [CC] [arguments] @@ -46,7 +46,7 @@ # 4. Uncommenting the "echo" lines gives detailed output # about the commands executed in the script. # -# +# # HISTORY: Oct-1996 -- Support added for multiple .o files -- # -- and optional arguments processing. -- # Chris Myers (myers@tc.cornell.edu), Keith Kwok @@ -132,7 +132,7 @@ done if test "$objfile" = "libpython@VERSION@@ABIFLAGS@.so"; then - ldsocoremode="true" + ldsocoremode="true" fi if test -z "$objs"; then diff -r 27ae40361ca5 Objects/lnotab_notes.txt --- a/Objects/lnotab_notes.txt Sat Aug 04 16:17:10 2012 +0200 +++ b/Objects/lnotab_notes.txt Sat Aug 04 22:46:03 2012 +0300 @@ -90,16 +90,16 @@ 6 POP_JUMP_IF_FALSE 17 3 9 LOAD_CONST 1 (1) - 12 PRINT_ITEM + 12 PRINT_ITEM - 4 13 BREAK_LOOP + 4 13 BREAK_LOOP 14 JUMP_ABSOLUTE 3 - >> 17 POP_BLOCK + >> 17 POP_BLOCK 6 18 LOAD_CONST 2 (2) - 21 PRINT_ITEM + 21 PRINT_ITEM >> 22 LOAD_CONST 0 (None) - 25 RETURN_VALUE + 25 RETURN_VALUE If 'a' is false, execution will jump to the POP_BLOCK instruction at offset 17 and the co_lnotab will claim that execution has moved to line 4, which is wrong. diff -r 27ae40361ca5 PC/VC6/readme.txt --- a/PC/VC6/readme.txt Sat Aug 04 16:17:10 2012 +0200 +++ b/PC/VC6/readme.txt Sat Aug 04 22:46:03 2012 +0300 @@ -133,11 +133,11 @@ _sqlite3 Python wrapper for SQLite library. - + Get the source code through - + svn export http://svn.python.org/projects/external/sqlite-source-3.3.4 - + To use the extension module in a Python build tree, copy sqlite3.dll into the PC/VC6 folder. @@ -160,12 +160,12 @@ You can install the NASM assembler from http://www.nasm.us/ for x86 builds. Put nasmw.exe anywhere in your PATH. - Note: recent releases of nasm only have nasm.exe. Just rename it to + Note: recent releases of nasm only have nasm.exe. Just rename it to nasmw.exe. You can also install ActivePerl from http://www.activestate.com/activeperl/ - if you like to use the official sources instead of the files from + if you like to use the official sources instead of the files from python's subversion repository. The svn version contains pre-build makefiles and assembly files. diff -r 27ae40361ca5 PC/VS7.1/_ssl.mak --- a/PC/VS7.1/_ssl.mak Sat Aug 04 16:17:10 2012 +0200 +++ b/PC/VS7.1/_ssl.mak Sat Aug 04 22:46:03 2012 +0300 @@ -15,10 +15,10 @@ INCLUDES=-I ../../Include -I ../../PC -I $(SSL_DIR)/inc32 SSL_LIBS=gdi32.lib wsock32.lib user32.lib advapi32.lib /LIBPATH:$(SSL_LIB_DIR) libeay32.lib ssleay32.lib -SSL_SOURCE=../../Modules/_ssl.c +SSL_SOURCE=../../Modules/_ssl.c HASH_LIBS=gdi32.lib user32.lib advapi32.lib /libpath:$(SSL_LIB_DIR) libeay32.lib -HASH_SOURCE=../../Modules/_hashopenssl.c +HASH_SOURCE=../../Modules/_hashopenssl.c all: _ssl$(SUFFIX) _hashlib$(SUFFIX) @@ -32,7 +32,7 @@ _hashlib$(SUFFIX): $(HASH_SOURCE) $(SSL_LIB_DIR)/libeay32.lib ../../PC/*.h ../../Include/*.h @if not exist "$(TEMP)/_hashlib/." mkdir "$(TEMP)/_hashlib" - cl /nologo /c $(HASH_SOURCE) $(CFLAGS) $(EXTRA_CFLAGS) /Fo$(TEMP)\_hashlib\$*.obj $(INCLUDES) + cl /nologo /c $(HASH_SOURCE) $(CFLAGS) $(EXTRA_CFLAGS) /Fo$(TEMP)\_hashlib\$*.obj $(INCLUDES) link /nologo @<< /dll /out:_hashlib$(SUFFIX) $(HASH_LIBS) $(EXTRA_LIBS) $(TEMP)\_hashlib\$*.obj << diff -r 27ae40361ca5 PC/VS7.1/readme.txt --- a/PC/VS7.1/readme.txt Sat Aug 04 16:17:10 2012 +0200 +++ b/PC/VS7.1/readme.txt Sat Aug 04 22:46:03 2012 +0300 @@ -140,11 +140,11 @@ _sqlite3 Python wrapper for SQLite library. - + Get the source code through - + svn export http://svn.python.org/projects/external/sqlite-source-3.3.4 - + To use the extension module in a Python build tree, copy sqlite3.dll into the VS7.1 folder. @@ -304,7 +304,7 @@ read: cc32 = cl.exe link32 = link.exe - include32 = + include32 = The remainder of the build instructions will work as given. bz2 diff -r 27ae40361ca5 PC/bdist_wininst/install.rc --- a/PC/bdist_wininst/install.rc Sat Aug 04 16:17:10 2012 +0200 +++ b/PC/bdist_wininst/install.rc Sat Aug 04 22:46:03 2012 +0300 @@ -55,18 +55,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE DISCARDABLE +1 TEXTINCLUDE DISCARDABLE BEGIN "resource.h\0" END -2 TEXTINCLUDE DISCARDABLE +2 TEXTINCLUDE DISCARDABLE BEGIN "#include ""afxres.h""\r\n" "\0" END -3 TEXTINCLUDE DISCARDABLE +3 TEXTINCLUDE DISCARDABLE BEGIN "\r\n" "\0" @@ -99,7 +99,7 @@ BEGIN LTEXT "This Wizard will install %s on your computer. Click Next to continue or Cancel to exit the Setup Wizard.", IDC_TITLE,125,10,247,20,NOT WS_GROUP - EDITTEXT IDC_INTRO_TEXT,125,31,247,131,ES_MULTILINE | ES_READONLY | + EDITTEXT IDC_INTRO_TEXT,125,31,247,131,ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_HSCROLL | NOT WS_TABSTOP CONTROL 110,IDC_BITMAP,"Static",SS_BITMAP | SS_CENTERIMAGE,6,8, 104,163,WS_EX_CLIENTEDGE @@ -115,14 +115,14 @@ 247,12,NOT WS_GROUP EDITTEXT IDC_PATH,191,136,181,14,ES_AUTOHSCROLL | ES_READONLY LTEXT "Python Directory:",IDC_STATIC,125,137,55,8 - LISTBOX IDC_VERSIONS_LIST,125,24,247,106,LBS_SORT | + LISTBOX IDC_VERSIONS_LIST,125,24,247,106,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP CONTROL 110,IDC_BITMAP,"Static",SS_BITMAP | SS_CENTERIMAGE,6,8, 104,163,WS_EX_CLIENTEDGE - EDITTEXT IDC_INSTALL_PATH,191,157,181,14,ES_AUTOHSCROLL | + EDITTEXT IDC_INSTALL_PATH,191,157,181,14,ES_AUTOHSCROLL | ES_READONLY LTEXT "Installation Directory:",IDC_STATIC,125,158,66,8 - PUSHBUTTON "Find other ...",IDC_OTHERPYTHON,322,7,50,14,NOT + PUSHBUTTON "Find other ...",IDC_OTHERPYTHON,322,7,50,14,NOT WS_VISIBLE END @@ -149,7 +149,7 @@ IDC_TITLE,125,10,247,31,NOT WS_GROUP CONTROL 110,IDC_BITMAP,"Static",SS_BITMAP | SS_CENTERIMAGE,6,8, 104,163,WS_EX_CLIENTEDGE - EDITTEXT IDC_INFO,125,40,247,131,ES_MULTILINE | ES_READONLY | + EDITTEXT IDC_INFO,125,40,247,131,ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_HSCROLL | NOT WS_TABSTOP END @@ -160,7 +160,7 @@ // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE +GUIDELINES DESIGNINFO DISCARDABLE BEGIN IDD_INTRO, DIALOG BEGIN diff -r 27ae40361ca5 PC/bdist_wininst/resource.h --- a/PC/bdist_wininst/resource.h Sat Aug 04 16:17:10 2012 +0200 +++ b/PC/bdist_wininst/resource.h Sat Aug 04 22:46:03 2012 +0300 @@ -36,7 +36,7 @@ #define IDC_OTHERPYTHON 1026 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 112 diff -r 27ae40361ca5 PC/example_nt/readme.txt --- a/PC/example_nt/readme.txt Sat Aug 04 16:17:10 2012 +0200 +++ b/PC/example_nt/readme.txt Sat Aug 04 22:46:03 2012 +0300 @@ -3,7 +3,7 @@ This directory contains everything needed (except for the Python distribution!) to build a Python extension module using Microsoft VC++. -Notice that you need to use the same compiler version that was used to build +Notice that you need to use the same compiler version that was used to build Python itself. The simplest way to build this example is to use the distutils script @@ -16,7 +16,7 @@ % python -c "import example; example.foo()" Hello, world -See setup.py for more details. alternatively, see below for instructions on +See setup.py for more details. alternatively, see below for instructions on how to build inside the Visual Studio environment. Visual Studio Build Instructions @@ -27,8 +27,8 @@ version. In general, it is recommended you use the 'setup.py' instructions above. -It has been tested with VC++ 7.1 on Python 2.4. You can also use earlier -versions of VC to build Python extensions, but the sample VC project file +It has been tested with VC++ 7.1 on Python 2.4. You can also use earlier +versions of VC to build Python extensions, but the sample VC project file (example.dsw in this directory) is in VC 7.1 format. COPY THIS DIRECTORY! @@ -129,7 +129,7 @@ (This is an annoying little file with only two lines. An alternative approach is to forget about the .def file, and add the option "/export:initspam" somewhere to the Link settings, by manually editing the -"Project -> Properties -> Linker -> Command Line -> Additional Options" +"Project -> Properties -> Linker -> Command Line -> Additional Options" box). You are now all set to build your extension, unless it requires other @@ -142,13 +142,13 @@ Use the File -> New -> Project... dialog to create a new Project Workspace. Select "Visual C++ Projects/Win32/ -Win32 Project", enter the name ("spam"), and make sure the "Location" is -set to parent of the spam directory you have created (which should be a direct -subdirectory of the Python build tree, a sibling of Include and PC). +Win32 Project", enter the name ("spam"), and make sure the "Location" is +set to parent of the spam directory you have created (which should be a direct +subdirectory of the Python build tree, a sibling of Include and PC). In "Application Settings", select "DLL", and "Empty Project". Click OK. You should now create the file spam.def as instructed in the previous -section. Add the source files (including the .def file) to the project, +section. Add the source files (including the .def file) to the project, using "Project", "Add Existing Item". Now open the @@ -174,7 +174,7 @@ Select "Debug" in the "Settings for:" dropdown list, and append "python24_d.lib" to the list in the Additional Dependencies" box. Then -click on the C/C++ tab, select "Code Generation", and select +click on the C/C++ tab, select "Code Generation", and select "Multi-threaded Debug DLL" from the "Runtime library" dropdown list. Select "Release" again from the "Settings for:" dropdown list. diff -r 27ae40361ca5 PC/os2emx/Makefile --- a/PC/os2emx/Makefile Sat Aug 04 16:17:10 2012 +0200 +++ b/PC/os2emx/Makefile Sat Aug 04 22:46:03 2012 +0300 @@ -12,7 +12,7 @@ # the interpreter. When embedding Python within another program, only # Python26.DLL is needed. We also build python_s.a static library (which # can be converted into OMF (.lib) format using emxomf tool) and both -# python.a and python.lib import libraries. Then the optional +# python.a and python.lib import libraries. Then the optional # extension modules, which are OS/2 DLLs renamed with a PYD file extension. # # Recommended build order: @@ -41,7 +41,7 @@ # Do you have the Tcl/Tk library installed? HAVE_TCLTK= no # Do you have the GNU readline library installed? -# NOTE: I'm using a modified version of Kai Uwe Rommel's port that +# NOTE: I'm using a modified version of Kai Uwe Rommel's port that # - is compiled with multithreading enabled # - is linked statically # I have had no success trying to use a DLL version, even when @@ -53,7 +53,7 @@ # (there is a structure member called errno, used for shadowing the # real errno, which conflicts with the errno redefinition of -Zmt) HAVE_BSDDB= no -# Do you have the ncurses library installed? EMX's BSD curses aren't enough! +# Do you have the ncurses library installed? EMX's BSD curses aren't enough! HAVE_NCURSES= no # Do you have the GDBM library installed? HAVE_GDBM= no @@ -245,7 +245,7 @@ LDMODE.EXE= -Zomf else PYTHON.EXEIMP= $(PYTHON_LIB).a - LDMODE.EXE = + LDMODE.EXE = endif PYTHON.DLL= $(PYTHON_LIB).dll PYTHON.DEF= $(PYTHON_LIB).def @@ -431,7 +431,7 @@ fpetest \ parser \ pwd \ - select + select # Python modules to be dynamically loaded that need explicit build rules # (either multiple source files and/or non-standard module naming) @@ -561,7 +561,7 @@ $(PGEN.EXE): $(OBJ.PGEN) $(OUT)pgen.def -# Explicit building instructions for those external modules that require +# Explicit building instructions for those external modules that require # awkward handling (due e.g. to non-std naming, or multiple source files) # - standard modules diff -r 27ae40361ca5 PC/os2emx/README.os2emx --- a/PC/os2emx/README.os2emx Sat Aug 04 16:17:10 2012 +0200 +++ b/PC/os2emx/README.os2emx Sat Aug 04 22:46:03 2012 +0300 @@ -10,30 +10,30 @@ Licenses and info about Python and EMX -------------------------------------- -Please read the file README.Python-2.6 included in this package for -information about Python 2.6. This file is the README file from the -Python 2.6 source distribution available via http://www.python.org/ -and its mirrors. The file LICENCE.Python-2.6 is the text of the Licence +Please read the file README.Python-2.6 included in this package for +information about Python 2.6. This file is the README file from the +Python 2.6 source distribution available via http://www.python.org/ +and its mirrors. The file LICENCE.Python-2.6 is the text of the Licence from the Python 2.6 source distribution. -Note that the EMX package that this package depends on is released under -the GNU General Public Licence. Please refer to the documentation -accompanying the EMX Runtime libraries for more information about the -implications of this. A copy of version 2 of the GPL is included as the +Note that the EMX package that this package depends on is released under +the GNU General Public Licence. Please refer to the documentation +accompanying the EMX Runtime libraries for more information about the +implications of this. A copy of version 2 of the GPL is included as the file COPYING.gpl2. -Readline and GDBM are covered by the GNU General Public Licence. I think -Eberhard Mattes' porting changes to BSD DB v1.85 are also GPL'ed (BSD DB -itself is BSD Licenced). ncurses and expat appear to be covered by MIT -style licences - please refer to the source distributions for more detail. -zlib is distributable under a very free license. GNU UFC is under the +Readline and GDBM are covered by the GNU General Public Licence. I think +Eberhard Mattes' porting changes to BSD DB v1.85 are also GPL'ed (BSD DB +itself is BSD Licenced). ncurses and expat appear to be covered by MIT +style licences - please refer to the source distributions for more detail. +zlib is distributable under a very free license. GNU UFC is under the GNU LGPL (see file COPYING.lib). -My patches to the Python-2.x source distributions, and any other packages +My patches to the Python-2.x source distributions, and any other packages used in this port, are placed in the public domain. This software is provided 'as-is', without any express or implied warranty. -In no event will the author be held liable for any damages arising from the +In no event will the author be held liable for any damages arising from the use of the software. I do hope however that it proves useful to someone. @@ -44,19 +44,19 @@ There have been ports of previous versions of Python to OS/2. -The best known would be that by Jeff Rush, most recently of version -1.5.2. Jeff used IBM's Visual Age C++ (v3) for his ports, and his +The best known would be that by Jeff Rush, most recently of version +1.5.2. Jeff used IBM's Visual Age C++ (v3) for his ports, and his patches have been included in the Python 2.6 source distribution. -Andy Zabolotny implemented a port of Python v1.5.2 using the EMX -development tools. His patches against the Python v1.5.2 source -distribution have become the core of this port, and without his efforts -this port wouldn't exist. Andy's port also appears to have been -compiled with his port of gcc 2.95.2 to EMX, which I have but have -chosen not to use for the binary distribution of this port (see item 16 +Andy Zabolotny implemented a port of Python v1.5.2 using the EMX +development tools. His patches against the Python v1.5.2 source +distribution have become the core of this port, and without his efforts +this port wouldn't exist. Andy's port also appears to have been +compiled with his port of gcc 2.95.2 to EMX, which I have but have +chosen not to use for the binary distribution of this port (see item 16 of the "YOU HAVE BEEN WARNED" section below). -It is possible to have these earlier ports still usable after installing +It is possible to have these earlier ports still usable after installing this port - see the README.os2emx.multiple_versions file, contributed by Dr David Mertz, for a suggested approach to achieving this. @@ -64,9 +64,9 @@ Software requirements --------------------- -This package requires the EMX Runtime package, available from the -Hobbes (http://hobbes.nmsu.edu/) and LEO (http://archiv.leo.org/) -archives of OS/2 software. I have used EMX version 0.9d fix04 in +This package requires the EMX Runtime package, available from the +Hobbes (http://hobbes.nmsu.edu/) and LEO (http://archiv.leo.org/) +archives of OS/2 software. I have used EMX version 0.9d fix04 in developing this port. My development system is running OS/2 v4 with fixpack 12. @@ -83,67 +83,67 @@ About this port --------------- -I have attempted to make this port as complete and functional as I can, +I have attempted to make this port as complete and functional as I can, notwithstanding the issues in the "YOU HAVE BEEN WARNED" section below. Core components: -Python.exe is linked as an a.out executable, ie using EMX method E1 -to compile & link the executable. This is so that fork() works (see +Python.exe is linked as an a.out executable, ie using EMX method E1 +to compile & link the executable. This is so that fork() works (see "YOU HAVE BEEN WARNED" item 1). -Python26.dll is created as a normal OMF DLL, with an OMF import -library and module definition file. There is also an a.out (.a) import -library to support linking the DLL to a.out executables. The DLL +Python26.dll is created as a normal OMF DLL, with an OMF import +library and module definition file. There is also an a.out (.a) import +library to support linking the DLL to a.out executables. The DLL requires the EMX runtime DLLs. This port has been built with complete support for multithreading. Modules: -With the exception of modules that have a significant code size, or are -not recommended or desired for normal use, the standard modules are now -built into the core DLL rather than configured as dynamically loadable -modules. This is for both reasons of performance (startup time) and +With the exception of modules that have a significant code size, or are +not recommended or desired for normal use, the standard modules are now +built into the core DLL rather than configured as dynamically loadable +modules. This is for both reasons of performance (startup time) and memory use (lots of small DLLs fragment the address space). -I haven't yet changed the building of Python's dynamically loadable +I haven't yet changed the building of Python's dynamically loadable modules over to using the DistUtils. -See "YOU HAVE BEEN WARNED" item 3 for notes about the fcntl module, and +See "YOU HAVE BEEN WARNED" item 3 for notes about the fcntl module, and "YOU HAVE BEEN WARNED" item 10 for notes about the pwd and grp modules. -This port supports case sensitive module import semantics, matching -the Windows release. This can be deactivated by setting the PYTHONCASEOK -environment variable (the value doesn't matter) - see "YOU HAVE BEEN WARNED" +This port supports case sensitive module import semantics, matching +the Windows release. This can be deactivated by setting the PYTHONCASEOK +environment variable (the value doesn't matter) - see "YOU HAVE BEEN WARNED" item 12. Optional modules: -Where I've been able to locate the required 3rd party packages already +Where I've been able to locate the required 3rd party packages already ported to OS/2, I've built and included them. These include ncurses (_curses, _curses_panel), -GNU GDBM (gdbm, dbm), zlib (zlib), GNU Readline (readline), and GNU UFC +GNU GDBM (gdbm, dbm), zlib (zlib), GNU Readline (readline), and GNU UFC (crypt). -Expat is now included in the Python release sourceball, and the pyexpat +Expat is now included in the Python release sourceball, and the pyexpat module is always built. -I have built these modules statically linked against the 3rd party -libraries. Unfortunately my attempts to use the dll version of GNU -readline have been a dismal failure, in that when the dynamically -linked readline module is active other modules immediately provoke a +I have built these modules statically linked against the 3rd party +libraries. Unfortunately my attempts to use the dll version of GNU +readline have been a dismal failure, in that when the dynamically +linked readline module is active other modules immediately provoke a core dump when imported. -Only the BSD DB package (part of the BSD package distributed with EMX) -needs source modifications to be used for this port, pertaining to use +Only the BSD DB package (part of the BSD package distributed with EMX) +needs source modifications to be used for this port, pertaining to use of errno with multithreading. -The other packages, except for ncurses and zlib, needed Makefile changes +The other packages, except for ncurses and zlib, needed Makefile changes for multithreading support but no source changes. -The _curses_panel module is a potential problem - see "YOU HAVE BEEN +The _curses_panel module is a potential problem - see "YOU HAVE BEEN WARNED" item 13. Upstream source patches: @@ -152,33 +152,33 @@ Library and other distributed Python code: -The Python standard library lives in the Lib directory. All the standard -library code included with the Python 2.6 source distribution is included -in the binary archive, with the exception of the dos-8x3 and tkinter -subdirectories which have been omitted to reduce the size of the binary -archive - the dos-8x3 components are unnecessary duplicates and Tkinter -is not supported by this port (yet). All the plat-* subdirectories in the -source distribution have also been omitted, except for the plat-os2emx +The Python standard library lives in the Lib directory. All the standard +library code included with the Python 2.6 source distribution is included +in the binary archive, with the exception of the dos-8x3 and tkinter +subdirectories which have been omitted to reduce the size of the binary +archive - the dos-8x3 components are unnecessary duplicates and Tkinter +is not supported by this port (yet). All the plat-* subdirectories in the +source distribution have also been omitted, except for the plat-os2emx subdirectory. -The Tools and Demo directories contain a collection of Python scripts. -To reduce the size of the binary archive, the Demo/sgi, Demo/Tix, -Demo/tkinter, Tools/audiopy and Tools/IDLE subdirectories have been -omitted as not being supported by this port. The Misc directory has +The Tools and Demo directories contain a collection of Python scripts. +To reduce the size of the binary archive, the Demo/sgi, Demo/Tix, +Demo/tkinter, Tools/audiopy and Tools/IDLE subdirectories have been +omitted as not being supported by this port. The Misc directory has also been omitted. -All subdirectories omitted from the binary archive can be reconstituted +All subdirectories omitted from the binary archive can be reconstituted from the Python 2.6 source distribution, if desired. Support for building Python extensions: -The Config subdirectory contains the files describing the configuration -of the interpreter and the Makefile, import libraries for the Python DLL, -and the module definition file used to create the Python DLL. The -Include subdirectory contains all the standard Python header files +The Config subdirectory contains the files describing the configuration +of the interpreter and the Makefile, import libraries for the Python DLL, +and the module definition file used to create the Python DLL. The +Include subdirectory contains all the standard Python header files needed for building extensions. -As I don't have the Visual Age C++ compiler, I've made no attempt to +As I don't have the Visual Age C++ compiler, I've made no attempt to have this port support extensions built with that compiler. @@ -189,49 +189,49 @@ - python-2.6-os2emx-bin-03????.zip (binaries, library modules) - python-2.6-os2emx-src-03???? (patches+makefiles for non-Python code) -As all the Python specific patches for the port are now part of the -Python release tarball, only the patches and makefiles involved in -building external libraries for optional extensions are included in +As all the Python specific patches for the port are now part of the +Python release tarball, only the patches and makefiles involved in +building external libraries for optional extensions are included in the source archive. -Documentation for the Python language, as well as the Python 2.6 -source distibution, can be obtained from the Python website -(http://www.python.org/) or the Python project pages at Sourceforge +Documentation for the Python language, as well as the Python 2.6 +source distibution, can be obtained from the Python website +(http://www.python.org/) or the Python project pages at Sourceforge (http://sf.net/projects/python/). Installation ------------ -Obtain and install, as per the included instructions, the EMX runtime +Obtain and install, as per the included instructions, the EMX runtime package. -Unpack this archive, preserving the subdirectories, in the root directory +Unpack this archive, preserving the subdirectories, in the root directory of the drive where you want Python to live. -Add the Python directory (eg C:\Python26) to the PATH and LIBPATH +Add the Python directory (eg C:\Python26) to the PATH and LIBPATH variables in CONFIG.SYS. -You should then set the PYTHONHOME and PYTHONPATH environment variables +You should then set the PYTHONHOME and PYTHONPATH environment variables in CONFIG.SYS. -PYTHONHOME should be set to Python's top level directory. PYTHONPATH -should be set to the semicolon separated list of principal Python library +PYTHONHOME should be set to Python's top level directory. PYTHONPATH +should be set to the semicolon separated list of principal Python library directories. I use: SET PYTHONHOME=F:/Python26 SET PYTHONPATH=F:/Python26/Lib;F:/Python26/Lib/plat-os2emx; F:/Python26/Lib/lib-dynload;F:/Python26/Lib/site-packages -NOTE!: the PYTHONPATH setting above is linewrapped for this document - it +NOTE!: the PYTHONPATH setting above is linewrapped for this document - it should all be on one line in CONFIG.SYS! -If you wish to use the curses module, you should set the TERM and TERMINFO +If you wish to use the curses module, you should set the TERM and TERMINFO environment variables appropriately. -If you don't already have ncurses installed, I have included a copy of the -EMX subset of the Terminfo database included with the ncurses-5.2 source -distribution. This can be used by setting the TERMINFO environment variable +If you don't already have ncurses installed, I have included a copy of the +EMX subset of the Terminfo database included with the ncurses-5.2 source +distribution. This can be used by setting the TERMINFO environment variable to the path of the Terminfo subdirectory below the Python home directory. On my system this looks like: SET TERMINFO=F:/Python26/Terminfo @@ -241,16 +241,16 @@ SET TERM=os2 SET TERM=window -You will have to reboot your system for these changes to CONFIG.SYS to take +You will have to reboot your system for these changes to CONFIG.SYS to take effect. -If you wish to compile all the included Python library modules to bytecode, -you can change into the Python home directory and run the COMPILEALL.CMD +If you wish to compile all the included Python library modules to bytecode, +you can change into the Python home directory and run the COMPILEALL.CMD batch file. -You can execute the regression tests included with the Python 2.6 source -distribution by changing to the Python 2.6 home directory and executing the -REGRTEST.CMD batch file. The following tests are known to fail at this +You can execute the regression tests included with the Python 2.6 source +distribution by changing to the Python 2.6 home directory and executing the +REGRTEST.CMD batch file. The following tests are known to fail at this time: - test_mhlib (I don't know of any port of MH to OS/2); - test_strptime (see "YOU HAVE BEEN WARNED" item 22); @@ -267,16 +267,16 @@ Building from source -------------------- -With the EMX port now checked into Python's CVS repository, the build +With the EMX port now checked into Python's CVS repository, the build infrastructure is part of the Python release sourceball. Prerequisites -First and foremost, you need an operational EMX development installation - -EMX v0.9d with fix04 (the latest at time of writing) & the gcc 2.8.1 +First and foremost, you need an operational EMX development installation - +EMX v0.9d with fix04 (the latest at time of writing) & the gcc 2.8.1 compiler released by Eberhard Mattes is the recommended setup. -If you have a different version of gcc installed, see "YOU HAVE BEEN +If you have a different version of gcc installed, see "YOU HAVE BEEN WARNED" item 16. Other items of software required:- @@ -288,32 +288,32 @@ Procedure -0. all changes mentioned apply to files in the PC/os2emx subdirectory - of the Python release source tree. make is also executed from this +0. all changes mentioned apply to files in the PC/os2emx subdirectory + of the Python release source tree. make is also executed from this directory, so change into this directory before proceeding. 1. decide if you need to change the location of the Python installation. - If you wish to do this, set the value of the Makefile variable LIB_DIR - to the directory you wish to use for PYTHONHOME + If you wish to do this, set the value of the Makefile variable LIB_DIR + to the directory you wish to use for PYTHONHOME (eg /usr/local/lib/python2.6). - If you want Python to find its library without the PYTHONHOME - environment variable set, set the value of the Makefile variable + If you want Python to find its library without the PYTHONHOME + environment variable set, set the value of the Makefile variable FIXED_PYHOME to "yes" (uncomment the appropriate line). -2. If you wish the Python executables (python.exe, pythonpm.exe & pgen.exe) - to be installed in a directory other than the PYTHONHOME directory, set +2. If you wish the Python executables (python.exe, pythonpm.exe & pgen.exe) + to be installed in a directory other than the PYTHONHOME directory, set the value of the Makefile variable EXE_DIR to the appropriate directory. -3. If you wish the Python core DLL (python33.dll) to be installed in a - directory other than the directory in which the Python executables are - installed (by default, the PYTHONHOME directory), set the value of the - Makefile variable DLL_DIR to the appropriate directory. This DLL must - be placed in a directory on the system's LIBPATH, or that gets set +3. If you wish the Python core DLL (python33.dll) to be installed in a + directory other than the directory in which the Python executables are + installed (by default, the PYTHONHOME directory), set the value of the + Makefile variable DLL_DIR to the appropriate directory. This DLL must + be placed in a directory on the system's LIBPATH, or that gets set with BEGINLIBPATH or ENDLIBPATH. -4. If you have installed any of the libraries that can be used to build - optional Python modules, set the value of the relevant HAVE_ +4. If you have installed any of the libraries that can be used to build + optional Python modules, set the value of the relevant HAVE_ Makefile variable to "yes". The Makefile currently supports: library Makefile variable @@ -327,37 +327,37 @@ libbz2 HAVE_BZ2 OpenSSL HAVE_OPENSSL - Please note that you need to check that what you have installed - is compatible with Python's build options. In particular, the - BSD DB v1.85 library needs to be rebuilt with a source patch for - multithread support (doesn't change the library's reentrant status - but allows it to be linked to Python which is multithreaded). - Widely available binary packages of other librarys & DLLs are + Please note that you need to check that what you have installed + is compatible with Python's build options. In particular, the + BSD DB v1.85 library needs to be rebuilt with a source patch for + multithread support (doesn't change the library's reentrant status + but allows it to be linked to Python which is multithreaded). + Widely available binary packages of other librarys & DLLs are not built/linked with multithread support. Beware! - Also note that the Makefile currently expects any libraries to be - found with the default library search path. You may need to add - -L switches to the LDFLAGS Makefile variable if you have installed - libraries in directories not in the default search path (which can + Also note that the Makefile currently expects any libraries to be + found with the default library search path. You may need to add + -L switches to the LDFLAGS Makefile variable if you have installed + libraries in directories not in the default search path (which can be controlled by the LIBRARY_PATH environment variable used by EMX). 5. make - It is usually a good idea to redirect the stdout and stderr streams - of the make process to log files, so that you can review any messages. + It is usually a good idea to redirect the stdout and stderr streams + of the make process to log files, so that you can review any messages. 6. make test - This runs the Python regression tests, and completion is a sign of - a usable build. You should check the list of skipped modules to - ensure that any optional modules you selected have been built; - checking the list of failures against the list of known failures + This runs the Python regression tests, and completion is a sign of + a usable build. You should check the list of skipped modules to + ensure that any optional modules you selected have been built; + checking the list of failures against the list of known failures elsewhere in this document is also prudent. 7. make install - >>>>>> NOT YET COMPLETE <<<<<< + >>>>>> NOT YET COMPLETE <<<<<< -8. change to a directory outside the Python source tree and start Python. +8. change to a directory outside the Python source tree and start Python. Check the version and build date to confirm satisfactory installation. @@ -366,52 +366,52 @@ I know about a number of nasties in this port. -1. Eberhard Mattes, author of EMX, writes in his documentation that fork() -is very inefficient in the OS/2 environment. It also requires that the -executable be linked in a.out format rather than OMF. Use the os.exec +1. Eberhard Mattes, author of EMX, writes in his documentation that fork() +is very inefficient in the OS/2 environment. It also requires that the +executable be linked in a.out format rather than OMF. Use the os.exec and/or the os.spawn family of functions where possible. -2. In the absence of GNU Readline, terminating the interpreter requires a -control-Z (^Z) followed by a carriage return. Jeff Rush documented this -problem in his Python 1.5.2 port. With Readline, a control-D (^D) works +2. In the absence of GNU Readline, terminating the interpreter requires a +control-Z (^Z) followed by a carriage return. Jeff Rush documented this +problem in his Python 1.5.2 port. With Readline, a control-D (^D) works as per the standard Unix environment. -3. EMX only has a partial implementation of fcntl(). The fcntl module -in this port supports what EMX supports. If fcntl is important to you, -please review the EMX C Library Reference (included in .INF format in the +3. EMX only has a partial implementation of fcntl(). The fcntl module +in this port supports what EMX supports. If fcntl is important to you, +please review the EMX C Library Reference (included in .INF format in the EMXVIEW.ZIP archive as part of the complete EMX development tools suite). -Because of other side-effects I have modified the test_fcntl.py test +Because of other side-effects I have modified the test_fcntl.py test script to deactivate the exercising of the missing functionality. -4. The readline module has been linked against ncurses rather than the +4. The readline module has been linked against ncurses rather than the termcap library supplied with EMX. -5. I have configured this port to use "/" as the preferred path separator -character, rather than "\" ('\\'), in line with the convention supported -by EMX. Backslashes are still supported of course, and still appear in +5. I have configured this port to use "/" as the preferred path separator +character, rather than "\" ('\\'), in line with the convention supported +by EMX. Backslashes are still supported of course, and still appear in unexpected places due to outside sources that don't get normalised. -6. While the DistUtils components are now functional, other +6. While the DistUtils components are now functional, other packaging/binary handling tools and utilities such as those included in -the Demo and Tools directories - freeze in particular - are unlikely to +the Demo and Tools directories - freeze in particular - are unlikely to work. If you do get them going, I'd like to know about your success. -7. I haven't set out to support the [BEGIN|END]LIBPATH functionality +7. I haven't set out to support the [BEGIN|END]LIBPATH functionality supported by one of the earlier ports (Rush's??). If it works let me know. -8. As a result of the limitations imposed by EMX's library routines, the -standard extension module pwd only synthesises a simple passwd database, +8. As a result of the limitations imposed by EMX's library routines, the +standard extension module pwd only synthesises a simple passwd database, and the grp module cannot be supported at all. -I have written pure Python substitutes for pwd and grp, which can process -real passwd and group files for those applications (such as MailMan) that -require more than EMX emulates. I have placed pwd.py and grp.py in -Lib/plat-os2emx, which is usually before Lib/lib-dynload (which contains -pwd.pyd) in the PYTHONPATH. If you have become attached to what pwd.pyd -supports, you can put Lib/lib-dynload before Lib/plat-os2emx in PYTHONPATH +I have written pure Python substitutes for pwd and grp, which can process +real passwd and group files for those applications (such as MailMan) that +require more than EMX emulates. I have placed pwd.py and grp.py in +Lib/plat-os2emx, which is usually before Lib/lib-dynload (which contains +pwd.pyd) in the PYTHONPATH. If you have become attached to what pwd.pyd +supports, you can put Lib/lib-dynload before Lib/plat-os2emx in PYTHONPATH or delete/rename pwd.py & grp.py. -pwd.py & grp.py support locating their data files by looking in the +pwd.py & grp.py support locating their data files by looking in the environment for them in the following sequence: pwd.py: $ETC_PASSWD (%ETC_PASSWD%) $ETC/passwd (%ETC%/passwd) @@ -420,43 +420,43 @@ $ETC/group (%ETC%/group) $PYTHONHOME/Etc/group (%PYTHONHOME%/Etc/group) -The ETC_PASSWD and ETC_GROUP environment variables are intended to allow -support for multiple passwd/grp files, where other applications may not -support as wide a variety of input variations (drive remappings, +The ETC_PASSWD and ETC_GROUP environment variables are intended to allow +support for multiple passwd/grp files, where other applications may not +support as wide a variety of input variations (drive remappings, separators etc). -Both modules support using either the ":" character (Unix standard) or -";" (OS/2, DOS, Windows standard) field separator character, and pwd.py -implements the following drive letter conversions for the home_directory and +Both modules support using either the ":" character (Unix standard) or +";" (OS/2, DOS, Windows standard) field separator character, and pwd.py +implements the following drive letter conversions for the home_directory and shell fields (for the ":" separator only): $x -> x: x; -> x: -Example versions of passwd and group are in the Etc subdirectory. The -regression tests (test_pwd and test_grp) will fail if valid password and +Example versions of passwd and group are in the Etc subdirectory. The +regression tests (test_pwd and test_grp) will fail if valid password and group files cannot be found, but should pass otherwise. -Be aware that Python's pwd & group modules are for reading password and +Be aware that Python's pwd & group modules are for reading password and group information only. -11. EMX's termios routines don't support all of the functionality now -exposed by the termios module - refer to the EMX documentation to find +11. EMX's termios routines don't support all of the functionality now +exposed by the termios module - refer to the EMX documentation to find out what is supported. -12. The case sensitive import semantics introduced in Python 2.1 for other -case insensitive but case preserving file/operating systems (Windows etc), -have been incorporated into this port, and are active by default. Setting -the PYTHONCASEOK environment variable (to any value) reverts to the -previous (case insensitive) semantics. This can be an issue with some +12. The case sensitive import semantics introduced in Python 2.1 for other +case insensitive but case preserving file/operating systems (Windows etc), +have been incorporated into this port, and are active by default. Setting +the PYTHONCASEOK environment variable (to any value) reverts to the +previous (case insensitive) semantics. This can be an issue with some file management utilities that do not preserve the case of file and directory names. -13. Because I am statically linking ncurses, the _curses_panel +13. Because I am statically linking ncurses, the _curses_panel module has potential problems arising from separate library data areas. -To avoid this, I have configured the _curses_.pyd (imported as -"_curses_panel") to import the ncurses symbols it needs from _curses.dll -(which is the curses module, but with a .dll extension rather than .pyd -so that the dynamic loader can actually import the symbols from it as a +To avoid this, I have configured the _curses_.pyd (imported as +"_curses_panel") to import the ncurses symbols it needs from _curses.dll +(which is the curses module, but with a .dll extension rather than .pyd +so that the dynamic loader can actually import the symbols from it as a DLL). The site module (Lib/site.py) has code added to tweak BEGINLIBPATH so @@ -464,99 +464,99 @@ problems attempting to use the _curses_panel support please let me know, and I'll have another look at this. -14. sys.platform reports "os2emx" instead of "os2". os.name still -reports "os2". This change was to make it easier to distinguish between -the VAC++ build (formerly maintained by Michael Muller) and the EMX build +14. sys.platform reports "os2emx" instead of "os2". os.name still +reports "os2". This change was to make it easier to distinguish between +the VAC++ build (formerly maintained by Michael Muller) and the EMX build (this port), principally for DistUtils. -15. it appears that the %W substitution in the EMX strftime() routine has -an off-by-one bug. strftime was listed as passing the regression tests -in previous releases, but this fact appears to have been an oversight in -the regression test suite. To fix this really requires a portable -strftime routine - I'm looking into using one from FreeBSD, but its not +15. it appears that the %W substitution in the EMX strftime() routine has +an off-by-one bug. strftime was listed as passing the regression tests +in previous releases, but this fact appears to have been an oversight in +the regression test suite. To fix this really requires a portable +strftime routine - I'm looking into using one from FreeBSD, but its not ready yet. -16. I have successfully built this port with Andy Zabolotny's ports of +16. I have successfully built this port with Andy Zabolotny's ports of pgcc 2.95 and gcc 3.2.1, in addition to EM's gcc 2.8.1. -I have not attempted to compile Python with any version of gcc prior to +I have not attempted to compile Python with any version of gcc prior to v2.8.1. -This release sees the default optimisation change to -"-O3 -fomit-frame-pointer -mprobe". This works fine too for pgcc 2.95 +This release sees the default optimisation change to +"-O3 -fomit-frame-pointer -mprobe". This works fine too for pgcc 2.95 but not for gcc 3.2.1. -With gcc 3.2.1, -O3 causes 2 unexpected test failures: test_format and -test_unicode. Both these tests pass if -O2 is instead of -O3 with this -compiler, and the performance difference is negligible (in contrast to -gcc 2.8.1 and pgcc 2.95, where the performance difference between the +With gcc 3.2.1, -O3 causes 2 unexpected test failures: test_format and +test_unicode. Both these tests pass if -O2 is instead of -O3 with this +compiler, and the performance difference is negligible (in contrast to +gcc 2.8.1 and pgcc 2.95, where the performance difference between the 2 optimisation settings approaches 10%). -17. os.spawnv() and os.spawnve() expose EMX's library routines rather +17. os.spawnv() and os.spawnve() expose EMX's library routines rather than use the emulation in os.py. -In order to make use of some of the features this makes available in -the OS/2 environment, you should peruse the relevant EMX documentation -(EMXLIB.INF in the EMXVIEW.ZIP archive accompanying the EMX archives -on Hobbes or LEO). Be aware that I have exposed all the "mode" options -supported by EMX, but there are combinations that either cannot be -practically used by/in Python or have the potential to compromise your +In order to make use of some of the features this makes available in +the OS/2 environment, you should peruse the relevant EMX documentation +(EMXLIB.INF in the EMXVIEW.ZIP archive accompanying the EMX archives +on Hobbes or LEO). Be aware that I have exposed all the "mode" options +supported by EMX, but there are combinations that either cannot be +practically used by/in Python or have the potential to compromise your system's stability. -18. pythonpm.exe used to be just python.exe with the WINDOWAPI linker -option set in the pythonpm.def file. In practice, this turns out to do +18. pythonpm.exe used to be just python.exe with the WINDOWAPI linker +option set in the pythonpm.def file. In practice, this turns out to do nothing useful. -I have written a replacement which wraps the Python DLL in a genuine -Presentation Manager application. This version actually runs the -Python interpreter in a separate thread from the PM shell, in order +I have written a replacement which wraps the Python DLL in a genuine +Presentation Manager application. This version actually runs the +Python interpreter in a separate thread from the PM shell, in order that PythonPM has a functioning message queue as good PM apps should. -In its current state, PythonPM's window is hidden. It can be displayed, -although it will have no content as nothing is ever written to the -window. Only the "hide" button is available. Although the code -has support for shutting PythonPM down when the Python interpreter is -still busy (via the "control" menu), this is not well tested and given -comments I've come across in EMX documentation suggesting that the -thread killing operation has problems I would suggest caution in +In its current state, PythonPM's window is hidden. It can be displayed, +although it will have no content as nothing is ever written to the +window. Only the "hide" button is available. Although the code +has support for shutting PythonPM down when the Python interpreter is +still busy (via the "control" menu), this is not well tested and given +comments I've come across in EMX documentation suggesting that the +thread killing operation has problems I would suggest caution in relying on this capability. -PythonPM processes commandline parameters normally. The standard input, -output and error streams are only useful if redirected, as PythonPM's -window is not a console in any form and so cannot accept or display +PythonPM processes commandline parameters normally. The standard input, +output and error streams are only useful if redirected, as PythonPM's +window is not a console in any form and so cannot accept or display anything. This means that the -i option is ineffective. -Because the Python thread doesn't create its own message queue, creating -PM Windows and performing most PM operations is not possible from within -this thread. How this will affect supporting PM extensions (such as -Tkinter using a PM port of Tcl/Tk, or wxPython using the PM port of +Because the Python thread doesn't create its own message queue, creating +PM Windows and performing most PM operations is not possible from within +this thread. How this will affect supporting PM extensions (such as +Tkinter using a PM port of Tcl/Tk, or wxPython using the PM port of WxWindows) is still being researched. -Note that os.fork() _DOES_NOT_WORK_ in PythonPM - SYS3175s are the result -of trying. os.spawnv() _does_ work. PythonPM passes all regression tests -that the standard Python interpreter (python.exe) passes, with the exception +Note that os.fork() _DOES_NOT_WORK_ in PythonPM - SYS3175s are the result +of trying. os.spawnv() _does_ work. PythonPM passes all regression tests +that the standard Python interpreter (python.exe) passes, with the exception of test_fork1 and test_socket which both attempt to use os.fork(). -I very much want feedback on the performance, behaviour and utility of -PythonPM. I would like to add a PM console capability to it, but that -will be a non-trivial effort. I may be able to leverage the code in +I very much want feedback on the performance, behaviour and utility of +PythonPM. I would like to add a PM console capability to it, but that +will be a non-trivial effort. I may be able to leverage the code in Illya Vaes' Tcl/Tk port, which would make it easier. -19. os.chdir() uses EMX's _chdir2(), which supports changing both drive -and directory at once. Similarly, os.getcwd() uses EMX's _getcwd() +19. os.chdir() uses EMX's _chdir2(), which supports changing both drive +and directory at once. Similarly, os.getcwd() uses EMX's _getcwd() which returns drive as well as path. -20. pyconfig.h is installed in the Include subdirectory with all +20. pyconfig.h is installed in the Include subdirectory with all other include files. -21. the default build explicitly sets the number of file handles -available to a Python process to 250. EMX default is 40, which is -insufficient for the tempfile regression test (test_tempfile) which +21. the default build explicitly sets the number of file handles +available to a Python process to 250. EMX default is 40, which is +insufficient for the tempfile regression test (test_tempfile) which tries to create 100 temporary files. This setting can be overridden via the EMXOPT environment variable: set EMXOPT=-h250 -is equivalent to the setting currently used. The emxbind utility (if you -have it installed) can also be used to permanently change the setting in +is equivalent to the setting currently used. The emxbind utility (if you +have it installed) can also be used to permanently change the setting in python.exe - please refer to the EMX documentation for more information. 22. a pure python strptime module is now part of the Python standard @@ -580,16 +580,16 @@ I think it suffices to say that BitTorrent is a fair stress test of a system's networking capability. -25. In the absence of an EMX implementation of the link() function, I've -implemented a crude Python emulation, in the file -Lib/plat-os2emx/_emx_link.py. This is imported into the os module, and +25. In the absence of an EMX implementation of the link() function, I've +implemented a crude Python emulation, in the file +Lib/plat-os2emx/_emx_link.py. This is imported into the os module, and becomes available as os.link() in the normal way. -The emulation copies the source file in binary mode, and will fail if -disk space is exhausted. The call fails if the target already exists. +The emulation copies the source file in binary mode, and will fail if +disk space is exhausted. The call fails if the target already exists. There are no guarantees to thread safety with this emulation - beware! -The emulation was written to support a link() based file locking system +The emulation was written to support a link() based file locking system used in GNU Mailman. 26. AF_UNIX sockets, otherwise known as Unix domain sockets, are now @@ -600,7 +600,7 @@ - unlike Unix, the socket endpoints don't exist in the filesystem; - by default, sockets are in binary mode. -27. As of Python 2.4, the mpz, rotor and xreadlines modules have been +27. As of Python 2.4, the mpz, rotor and xreadlines modules have been dropped from the Python source tree. 28. The subprocess module was added to the standard library relatively @@ -616,16 +616,16 @@ a commented out definition for 128kB thread stacks). I have seen references to heavy Zope/Plone usage requiring 1MB thread stacks on FreeBSD and Linux, but doubt that for most likely usage on OS/2 that -more than 256kB is necessary. The size of the required stacks (main +more than 256kB is necessary. The size of the required stacks (main and thread) can vary significantly depending on which version of gcc is used along with the compiler optimisations selected. Note that the main thread stack size is set during linking and is currently 2MB. ... probably other issues that I've not encountered, or don't remember :-( -If you encounter other difficulties with this port, which can be +If you encounter other difficulties with this port, which can be characterised as peculiar to this port rather than to the Python release, -I would like to hear about them. However I cannot promise to be able to do +I would like to hear about them. However I cannot promise to be able to do anything to resolve such problems. See the Contact section below... @@ -649,11 +649,11 @@ Contact ------- -Constructive feedback, negative or positive, about this port is welcome +Constructive feedback, negative or positive, about this port is welcome and should be addressed to me at the e-mail addresses below. -I have a private mailing list for announcements of fixes & updates to -this port. If you wish to receive such e-mail announcments, please send +I have a private mailing list for announcements of fixes & updates to +this port. If you wish to receive such e-mail announcments, please send me an e-mail requesting that you be added to this list. Andrew MacIntyre diff -r 27ae40361ca5 PC/os2emx/python33.def --- a/PC/os2emx/python33.def Sat Aug 04 16:17:10 2012 +0200 +++ b/PC/os2emx/python33.def Sat Aug 04 22:46:03 2012 +0300 @@ -1,8 +1,8 @@ -LIBRARY python33 INITINSTANCE TERMINSTANCE -DESCRIPTION "Python 2.6 Core DLL" -PROTMODE -DATA MULTIPLE NONSHARED -EXPORTS +LIBRARY python33 INITINSTANCE TERMINSTANCE +DESCRIPTION "Python 2.6 Core DLL" +PROTMODE +DATA MULTIPLE NONSHARED +EXPORTS ; From python33_s.lib(config) "_PyImport_Inittab" diff -r 27ae40361ca5 PC/os2vacpp/makefile --- a/PC/os2vacpp/makefile Sat Aug 04 16:17:10 2012 +0200 +++ b/PC/os2vacpp/makefile Sat Aug 04 22:46:03 2012 +0300 @@ -240,7 +240,7 @@ # /DHAVE_CONFIG_H = Causes Use of CONFIG.H Settings # /DUSE_SOCKET = Enables Building In of Socket API -_OUT = +_OUT = # /Fb = Embed Browser Recs # /Gh = Generate Code for Profiler Hooks # /Fl = Output C/C++ Listing Files diff -r 27ae40361ca5 PC/os2vacpp/makefile.omk --- a/PC/os2vacpp/makefile.omk Sat Aug 04 16:17:10 2012 +0200 +++ b/PC/os2vacpp/makefile.omk Sat Aug 04 22:46:03 2012 +0300 @@ -190,7 +190,7 @@ # termios.obj \ # User Interface: -# _tkinter.obj \ +# _tkinter.obj \ # stdwinmodule.obj \ # cursesmodule.obj \ # tclNotify.obj \ @@ -246,10 +246,10 @@ # /Tm = Enable Debug Memory Fns # /Tx = Request Full Dump Upon Exception # /DDEBUG = Enable App-Internal Debugging Code - # /DUSE_SOCKET = - # /DUSE_DL_EXPORT = + # /DUSE_SOCKET = + # /DUSE_DL_EXPORT = -_OUT = +_OUT = # /Fb = Embed Browser Recs # /Gh = Generate Code for Profiler Hooks # /Fl = Output C/C++ Listing Files diff -r 27ae40361ca5 PC/os2vacpp/readme.txt --- a/PC/os2vacpp/readme.txt Sat Aug 04 16:17:10 2012 +0200 +++ b/PC/os2vacpp/readme.txt Sat Aug 04 22:46:03 2012 +0300 @@ -8,7 +8,7 @@ By changing the C compiler flag /Gd- in the makefile to /Gd+, you can reduce the size of these by causing Python to dynamically link to the -C runtime DLLs instead of including their bulk in your binaries. +C runtime DLLs instead of including their bulk in your binaries. However, this means that any system on which you run Python must have the VAC++ compiler installed in order to have those DLLs available. @@ -108,10 +108,10 @@ Jeff Rush is no longer supporting the VACPP port :-( -I don't have the VACPP compiler, so can't reliably maintain this port. +I don't have the VACPP compiler, so can't reliably maintain this port. Anyone with VACPP who can contribute patches to keep this port buildable -should upload them to the Python Patch Manager at Sourceforge and +should upload them to the Python Patch Manager at Sourceforge and assign them to me for review/checkin. Andrew MacIntyre diff -r 27ae40361ca5 PC/python_exe.rc --- a/PC/python_exe.rc Sat Aug 04 16:17:10 2012 +0200 +++ b/PC/python_exe.rc Sat Aug 04 22:46:03 2012 +0300 @@ -1,1 +1,1 @@ -1 ICON DISCARDABLE "pycon.ico" +1 ICON DISCARDABLE "pycon.ico" diff -r 27ae40361ca5 PCbuild/pyproject.props --- a/PCbuild/pyproject.props Sat Aug 04 16:17:10 2012 +0200 +++ b/PCbuild/pyproject.props Sat Aug 04 22:46:03 2012 +0300 @@ -5,7 +5,7 @@ $(SolutionDir) $(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\ false - + <_ProjectFileVersion>10.0.30319.1 <_PropertySheetDisplayName>amd64 diff -r 27ae40361ca5 PCbuild/readme.txt --- a/PCbuild/readme.txt Sat Aug 04 16:17:10 2012 +0200 +++ b/PCbuild/readme.txt Sat Aug 04 22:46:03 2012 +0300 @@ -1,7 +1,7 @@ Building Python using VC++ 10.0 ------------------------------ -This directory is used to build Python for Win32 and x64 platforms, e.g. +This directory is used to build Python for Win32 and x64 platforms, e.g. Windows 2000, XP, Vista and Windows Server 2008. In order to build 32-bit debug and release executables, Microsoft Visual C++ 2008 Express Edition is required at the very least. In order to build 64-bit debug and release @@ -27,7 +27,7 @@ The solution is configured to build the projects in the correct order. "Build Solution" or F7 takes care of dependencies except for x64 builds. To make -cross compiling x64 builds on a 32bit OS possible the x64 builds require a +cross compiling x64 builds on a 32bit OS possible the x64 builds require a 32bit version of Python. NOTE: @@ -47,7 +47,7 @@ Legacy support -------------- -You can find build directories for older versions of Visual Studio and +You can find build directories for older versions of Visual Studio and Visual C++ in the PC directory. The legacy build directories are no longer actively maintained and may not work out of the box. @@ -108,7 +108,7 @@ within our pcbuild.sln, which means this module expects to find a pre-built Tcl/Tk in either ..\..\tcltk for 32-bit or ..\..\tcltk64 for 64-bit (relative to this directory). See below for instructions to build - Tcl/Tk. + Tcl/Tk. _bz2 Python wrapper for the libbzip2 compression library. Homepage http://www.bzip.org/ @@ -128,7 +128,7 @@ bzip2-1.0.6\ when you do a clean, so if you want to rebuild bzip2.lib you need to clean up bzip2-1.0.6\ by hand. - All of this managed to build libbz2.lib in + All of this managed to build libbz2.lib in bzip2-1.0.6\$platform-$configuration\, which the Python project links in. _lzma Python wrapper for the liblzma compression library. @@ -155,17 +155,17 @@ You must install the NASM assembler from http://nasm.sf.net for x86 builds. Put nasmw.exe anywhere in your PATH. - Note: recent releases of nasm only have nasm.exe. Just rename it to + Note: recent releases of nasm only have nasm.exe. Just rename it to nasmw.exe. You can also install ActivePerl from http://www.activestate.com/activeperl/ - if you like to use the official sources instead of the files from + if you like to use the official sources instead of the files from python's subversion repository. The svn version contains pre-build makefiles and assembly files. The build process makes sure that no patented algorithms are included. - For now RC5, MDC2 and IDEA are excluded from the build. You may have + For now RC5, MDC2 and IDEA are excluded from the build. You may have to manually remove $(OBJ_D)\i_*.obj from ms\nt.mak if the build process complains about missing files or forbidden IDEA. Again the files provided in the subversion repository are already fixed. @@ -186,16 +186,16 @@ this by hand. The subprojects above wrap external projects Python doesn't control, and as -such, a little more work is required in order to download the relevant source +such, a little more work is required in order to download the relevant source files for each project before they can be built. The buildbots do this each -time they're built, so the easiest approach is to run either external.bat or +time they're built, so the easiest approach is to run either external.bat or external-amd64.bat in the ..\Tools\buildbot directory from ..\, i.e.: C:\..\svn.python.org\projects\python\trunk\PCbuild>cd .. C:\..\svn.python.org\projects\python\trunk>Tools\buildbot\external.bat This extracts all the external subprojects from http://svn.python.org/external -via Subversion (so you'll need an svn.exe on your PATH) and places them in +via Subversion (so you'll need an svn.exe on your PATH) and places them in ..\.. (relative to this directory). The external(-amd64).bat scripts will also build a debug build of Tcl/Tk; there aren't any equivalent batch files for building release versions of Tcl/Tk lying around in the Tools\buildbot @@ -238,7 +238,7 @@ junction as follows (using the directory structure above as an example): C:\..\python\trunk\external <- already exists and has built versions - of the external subprojects + of the external subprojects C:\..\python\branches\py3k>linkd.exe external ..\..\trunk\external Link created at: external @@ -297,16 +297,16 @@ -------------- The solution has no configuration for static libraries. However it is easy -it build a static library instead of a DLL. You simply have to set the +it build a static library instead of a DLL. You simply have to set the "Configuration Type" to "Static Library (.lib)" and alter the preprocessor macro "Py_ENABLE_SHARED" to "Py_NO_ENABLE_SHARED". You may also have to -change the "Runtime Library" from "Multi-threaded DLL (/MD)" to +change the "Runtime Library" from "Multi-threaded DLL (/MD)" to "Multi-threaded (/MT)". Visual Studio properties ------------------------ -The PCbuild solution makes heavy use of Visual Studio property files +The PCbuild solution makes heavy use of Visual Studio property files (*.vsprops). The properties can be viewed and altered in the Property Manager (View -> Other Windows -> Property Manager). diff -r 27ae40361ca5 Parser/Python.asdl --- a/Parser/Python.asdl Sat Aug 04 16:17:10 2012 +0200 +++ b/Parser/Python.asdl Sat Aug 04 22:46:03 2012 +0300 @@ -9,9 +9,9 @@ -- not really an actual node but useful in Jython's typesystem. | Suite(stmt* body) - stmt = FunctionDef(identifier name, arguments args, + stmt = FunctionDef(identifier name, arguments args, stmt* body, expr* decorator_list, expr? returns) - | ClassDef(identifier name, + | ClassDef(identifier name, expr* bases, keyword* keywords, expr? starargs, @@ -77,7 +77,7 @@ | Subscript(expr value, slice slice, expr_context ctx) | Starred(expr value, expr_context ctx) | Name(identifier id, expr_context ctx) - | List(expr* elts, expr_context ctx) + | List(expr* elts, expr_context ctx) | Tuple(expr* elts, expr_context ctx) -- col_offset is the byte offset in the utf8 string the parser uses @@ -85,13 +85,13 @@ expr_context = Load | Store | Del | AugLoad | AugStore | Param - slice = Slice(expr? lower, expr? upper, expr? step) - | ExtSlice(slice* dims) - | Index(expr value) + slice = Slice(expr? lower, expr? upper, expr? step) + | ExtSlice(slice* dims) + | Index(expr value) - boolop = And | Or + boolop = And | Or - operator = Add | Sub | Mult | Div | Mod | Pow | LShift + operator = Add | Sub | Mult | Div | Mod | Pow | LShift | RShift | BitOr | BitXor | BitAnd | FloorDiv unaryop = Invert | Not | UAdd | USub diff -r 27ae40361ca5 Tools/buildbot/README.tcltk-AMD64 --- a/Tools/buildbot/README.tcltk-AMD64 Sat Aug 04 16:17:10 2012 +0200 +++ b/Tools/buildbot/README.tcltk-AMD64 Sat Aug 04 22:46:03 2012 +0300 @@ -22,7 +22,7 @@ cd tcl8.4.12\win REM echo patch the tcl8.4.12\generic\tclExecute.c file - pause + pause REM cl nmakehlp.c /link bufferoverflowU.lib nmake -f makefile.vc MACHINE=AMD64 diff -r 27ae40361ca5 Tools/buildbot/external-amd64.bat --- a/Tools/buildbot/external-amd64.bat Sat Aug 04 16:17:10 2012 +0200 +++ b/Tools/buildbot/external-amd64.bat Sat Aug 04 22:46:03 2012 +0300 @@ -12,7 +12,7 @@ ) if not exist tcltk64\bin\tk85g.dll ( - cd tk-8.5.11.0\win + cd tk-8.5.11.0\win nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.11.0 clean nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.11.0 all nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.11.0 install diff -r 27ae40361ca5 Tools/buildbot/external-common.bat --- a/Tools/buildbot/external-common.bat Sat Aug 04 16:17:10 2012 +0200 +++ b/Tools/buildbot/external-common.bat Sat Aug 04 22:46:03 2012 +0300 @@ -15,7 +15,7 @@ @rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1 @rem if exist db-4.4.20 rd /s/q db-4.4.20 @rem if exist openssl-1.0.1c rd /s/q openssl-1.0.1c -@rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12 +@rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12 @rem bzip if not exist bzip2-1.0.6 ( diff -r 27ae40361ca5 Tools/buildbot/external.bat --- a/Tools/buildbot/external.bat Sat Aug 04 16:17:10 2012 +0200 +++ b/Tools/buildbot/external.bat Sat Aug 04 22:46:03 2012 +0300 @@ -7,7 +7,7 @@ if not exist tcltk\bin\tcl85g.dll ( @rem all and install need to be separate invocations, otherwise nmakehlp is not found on install cd tcl-8.5.11.0\win - nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all + nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk install cd ..\.. ) diff -r 27ae40361ca5 Tools/freeze/README --- a/Tools/freeze/README Sat Aug 04 16:17:10 2012 +0200 +++ b/Tools/freeze/README Sat Aug 04 22:46:03 2012 +0300 @@ -100,8 +100,8 @@ then declare these directories in your frozen Python program using the TCL_LIBRARY, TK_LIBRARY and TIX_LIBRARY environment variables. -For example, assume you will ship your frozen program in the directory -/bin/windows-x86 and will place your Tcl library files +For example, assume you will ship your frozen program in the directory +/bin/windows-x86 and will place your Tcl library files in /lib/tcl8.2 and your Tk library files in /lib/tk8.2. Then placing the following lines in your frozen Python script before importing Tkinter or Tix would set the environment correctly for Tcl/Tk/Tix: @@ -138,8 +138,8 @@ environment variable LD_LIBRARY_PATH and/or the system shared library cache (ld.so). An additional preferred directory for finding the dynamic libraries is built into the .dll or .so files at -compile time - see the LIB_RUNTIME_DIR variable in the Tcl makefile. -The OS must find the dynamic libraries or your frozen program won't start. +compile time - see the LIB_RUNTIME_DIR variable in the Tcl makefile. +The OS must find the dynamic libraries or your frozen program won't start. Usually I make sure that the .so or .dll files are in the same directory as the executable, but this may not be foolproof. @@ -149,8 +149,8 @@ to a temporary location when the program runs; this is currently left as an exercise for the reader. An easier approach is to freeze the Tcl/Tk/Tix code into the dynamic libraries using the Tcl ET code, -or the Tix Stand-Alone-Module code. Of course, you can also simply -require that Tcl/Tk is required on the target installation, but be +or the Tix Stand-Alone-Module code. Of course, you can also simply +require that Tcl/Tk is required on the target installation, but be careful that the version corresponds. There are some caveats using frozen Tkinter applications: @@ -164,7 +164,7 @@ A warning about shared library modules -------------------------------------- -When your Python installation uses shared library modules such as +When your Python installation uses shared library modules such as _tkinter.pyd, these will not be incorporated in the frozen program. Again, the frozen program will work when you test it, but it won't work when you ship it to a site without a Python installation. @@ -275,9 +275,9 @@ are read and the -i option replaced with the parsed params (note - quoting args in this file is NOT supported) --s subsystem: Specify the subsystem (For Windows only.); +-s subsystem: Specify the subsystem (For Windows only.); 'console' (default), 'windows', 'service' or 'com_dll' - + -w: Toggle Windows (NT or 95) behavior. (For debugging only -- on a win32 platform, win32 behavior is automatic.) diff -r 27ae40361ca5 Tools/freeze/extensions_win32.ini --- a/Tools/freeze/extensions_win32.ini Sat Aug 04 16:17:10 2012 +0200 +++ b/Tools/freeze/extensions_win32.ini Sat Aug 04 22:46:03 2012 +0300 @@ -6,7 +6,7 @@ ; This is all setup for all the win32 extension modules ; released by Mark Hammond. -; You must ensure that the environment variable PYTHONEX is set +; You must ensure that the environment variable PYTHONEX is set ; to point to the root win32 extensions directory ; PYTHONPREFIX must point to the Python build root directory @@ -49,7 +49,7 @@ [zlib] dsp=%PYTHONPREFIX%\PCBuild\zlib.dsp -cl=/I %PYTHONPREFIX%\..\zlib-1.1.4 /D _WINDOWS /D WIN32 +cl=/I %PYTHONPREFIX%\..\zlib-1.1.4 /D _WINDOWS /D WIN32 libs=%PYTHONPREFIX%\..\zlib-1.1.4\zlib.lib /nodefaultlib:libc [winreg] @@ -95,7 +95,7 @@ cl=/I %PYTHONEX%\win32\src [win32file] -dsp=%PYTHONEX%\win32\win32file.dsp +dsp=%PYTHONEX%\win32\win32file.dsp cl=/I %PYTHONEX%\win32\src [win32net] @@ -108,7 +108,7 @@ cl=/I %PYTHONEX%\win32\src [win32pipe] -dsp=%PYTHONEX%\win32\win32pipe.dsp +dsp=%PYTHONEX%\win32\win32pipe.dsp cl=/I %PYTHONEX%\win32\src [win32security] diff -r 27ae40361ca5 Tools/msi/README.txt --- a/Tools/msi/README.txt Sat Aug 04 16:17:10 2012 +0200 +++ b/Tools/msi/README.txt Sat Aug 04 22:46:03 2012 +0300 @@ -8,13 +8,13 @@ by adding a file config.py; see the beginning of msi.py for additional customization options. -The packaging process assumes that binaries have been +The packaging process assumes that binaries have been generated according to the instructions in PCBuild/README.txt, and that you have either Visual Studio or the Platform SDK installed. In addition, you need the Python COM extensions, either from PythonWin, or from ActivePython. -To invoke the script, open a cmd.exe window which has +To invoke the script, open a cmd.exe window which has cabarc.exe in its PATH (e.g. "Visual Studio .NET 2003 Command Prompt"). Then invoke diff -r 27ae40361ca5 Tools/pybench/README --- a/Tools/pybench/README Sat Aug 04 16:17:10 2012 +0200 +++ b/Tools/pybench/README Sat Aug 04 22:46:03 2012 +0300 @@ -4,7 +4,7 @@ ________________________________________________________________________ Extendable suite of of low-level benchmarks for measuring - the performance of the Python implementation + the performance of the Python implementation (interpreter, compiler or VM). pybench is a collection of tests that provides a standardized way to @@ -34,11 +34,11 @@ It is usually a good idea to run pybench.py multiple times to see whether the environment, timers and benchmark run-times are suitable -for doing benchmark tests. +for doing benchmark tests. You can use the comparison feature of pybench.py ('pybench.py -c ') to check how well the system behaves in comparison to a -reference run. +reference run. If the differences are well below 10% for each test, then you have a system that is good for doing benchmark testings. Of you get random @@ -232,7 +232,7 @@ # for comparisons of benchmark runs - tests with unequal version # number will not get compared. version = 1.0 - + # The number of abstract operations done in each round of the # test. An operation is the basic unit of what you want to # measure. The benchmark will output the amount of run-time per @@ -264,7 +264,7 @@ # Repeat the operations per round to raise the run-time # per operation significantly above the noise level of the - # for-loop overhead. + # for-loop overhead. # Execute 20 operations (a += 1): a += 1 @@ -358,8 +358,8 @@ - changed the output format a bit to make it look nicer - refactored the APIs somewhat - 1.3+: Steve Holden added the NewInstances test and the filtering - option during the NeedForSpeed sprint; this also triggered a long + 1.3+: Steve Holden added the NewInstances test and the filtering + option during the NeedForSpeed sprint; this also triggered a long discussion on how to improve benchmark timing and finally resulted in the release of 2.0 1.3: initial checkin into the Python SVN repository diff -r 27ae40361ca5 Tools/pynche/README --- a/Tools/pynche/README Sat Aug 04 16:17:10 2012 +0200 +++ b/Tools/pynche/README Sat Aug 04 22:46:03 2012 +0300 @@ -48,7 +48,7 @@ --initfile file -i file - Alternate location of the persistent initialization file. See + Alternate location of the persistent initialization file. See the section on Persistency below. --ignore @@ -80,7 +80,7 @@ pyColorChooser.askcolor() - which will popup Pynche as a modal dialog, and return the selected + which will popup Pynche as a modal dialog, and return the selected color. There are some UI differences when running as a modal @@ -106,7 +106,7 @@ master[*] the master window to use as the parent of the modal - dialog. Without this argument, pyColorChooser will create + dialog. Without this argument, pyColorChooser will create its own Tkinter.Tk instance as the master. This may not be what you want. @@ -170,7 +170,7 @@ Selected chip color exactly matches the Nearest chip color, you will see the color name appear below the color specification for the Selected chip. - + Clicking on the Nearest color chip selects that color. Color distance is calculated in the 3D space of the RGB color solid and if more than one color name is the same distance from the selected @@ -361,7 +361,7 @@ format for both values and names webcolors.txt -- The 140 color names that Tim Peters and his - sister say NS and MSIE both understand (with some controversy over + sister say NS and MSIE both understand (with some controversy over AliceBlue). namedcolors.txt -- an alternative set of Netscape colors. @@ -369,8 +369,8 @@ You can switch between files by choosing "Load palette..." from the "File" menu. This brings up a standard Tk file dialog. Choose the file you want and then click "Ok". If Pynche - understands the format in this file, it will load the database and - update the appropriate windows. If not, it will bring up an error + understands the format in this file, it will load the database and + update the appropriate windows. If not, it will bring up an error dialog. diff -r 27ae40361ca5 Tools/scripts/dutree.doc --- a/Tools/scripts/dutree.doc Sat Aug 04 16:17:10 2012 +0200 +++ b/Tools/scripts/dutree.doc Sat Aug 04 22:46:03 2012 +0300 @@ -34,13 +34,13 @@ : | 1 sm.bak At first I thought I could just keep one local list around -at once, but this seems inherently recursive. Which means +at once, but this seems inherently recursive. Which means I need an real recursive data structure. Maybe you could do it with one of the %assoc arrays Larry uses in the begat programs, but I broke down and got dirty. I think the hardest -part was matching Felix's desired output exactly. It's not +part was matching Felix's desired output exactly. It's not blazingly fast: I should probably inline the &childof routine, -but it *was* faster to write than I could have written the +but it *was* faster to write than I could have written the equivalent C program. diff -r 27ae40361ca5 Tools/unicode/python-mappings/CP1140.TXT --- a/Tools/unicode/python-mappings/CP1140.TXT Sat Aug 04 16:17:10 2012 +0200 +++ b/Tools/unicode/python-mappings/CP1140.TXT Sat Aug 04 22:46:03 2012 +0300 @@ -12,7 +12,7 @@ # (c) Copyright Marc-Andre Lemburg, 2005. # Licensed to PSF under a Contributor Agreement. # -# Based on the file +# Based on the file # ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/EBCDIC/CP037.TXT # which is: # diff -r 27ae40361ca5 Tools/unicode/python-mappings/KOI8-U.TXT --- a/Tools/unicode/python-mappings/KOI8-U.TXT Sat Aug 04 16:17:10 2012 +0200 +++ b/Tools/unicode/python-mappings/KOI8-U.TXT Sat Aug 04 22:46:03 2012 +0300 @@ -12,7 +12,7 @@ # (c) Copyright Marc-Andre Lemburg, 2005. # Licensed to PSF under a Contributor Agreement. # -# Based on the file +# Based on the file # ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/KOI8-R.TXT # which is: # diff -r 27ae40361ca5 Tools/unicode/python-mappings/TIS-620.TXT --- a/Tools/unicode/python-mappings/TIS-620.TXT Sat Aug 04 16:17:10 2012 +0200 +++ b/Tools/unicode/python-mappings/TIS-620.TXT Sat Aug 04 22:46:03 2012 +0300 @@ -14,7 +14,7 @@ # (c) Copyright Marc-Andre Lemburg, 2005. # Licensed to PSF under a Contributor Agreement. # -# Based on the file +# Based on the file # ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-11.TXT # which is: # diff -r 27ae40361ca5 Tools/unittestgui/README.txt --- a/Tools/unittestgui/README.txt Sat Aug 04 16:17:10 2012 +0200 +++ b/Tools/unittestgui/README.txt Sat Aug 04 22:46:03 2012 +0300 @@ -1,5 +1,5 @@ -unittestgui.py is GUI framework and application for use with Python unit -testing framework. It executes tests written using the framework provided +unittestgui.py is GUI framework and application for use with Python unit +testing framework. It executes tests written using the framework provided by the 'unittest' module. Based on the original by Steve Purcell, from: diff -r 27ae40361ca5 configure.ac --- a/configure.ac Sat Aug 04 16:17:10 2012 +0200 +++ b/configure.ac Sat Aug 04 22:46:03 2012 +0300 @@ -63,7 +63,7 @@ dnl Last slash shouldn't be stripped if prefix=/ if test "$prefix" != "/"; then prefix=`echo "$prefix" | sed -e 's/\/$//g'` -fi +fi dnl This is for stuff that absolutely must end up in pyconfig.h. dnl Please use pyport.h instead, if possible. @@ -155,7 +155,7 @@ fi ;; esac - + ],[ UNIVERSALSDK= enable_universalsdk= @@ -215,7 +215,7 @@ AS_HELP_STRING([--enable-framework@<:@=INSTALLDIR@:>@], [Build (MacOSX|Darwin) framework]), [ case $enableval in - yes) + yes) enableval=/Library/Frameworks esac case $enableval in @@ -270,7 +270,7 @@ FRAMEWORKINSTALLAPPSPREFIX="${MDIR}/Applications" if test "${prefix}" = "NONE"; then - # User hasn't specified the + # User hasn't specified the # --prefix option, but wants to install # the framework in a non-default location, # ensure that the compatibility links get @@ -396,7 +396,7 @@ esac _PYTHON_HOST_PLATFORM="$MACHDEP${_host_cpu:+-$_host_cpu}" fi - + # Some systems cannot stand _XOPEN_SOURCE being defined at all; they # disable features if it is defined, without any means to access these # features as extensions. For these systems, we skip the definition of @@ -413,7 +413,7 @@ # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish. # In addition, Stefan Krah confirms that issue #1244610 exists through # OpenBSD 4.6, but is fixed in 4.7. - OpenBSD/2.* | OpenBSD/3.* | OpenBSD/4.@<:@0123456@:>@) + OpenBSD/2.* | OpenBSD/3.* | OpenBSD/4.@<:@0123456@:>@) define_xopen_source=no # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is # also defined. This can be overridden by defining _BSD_SOURCE @@ -451,12 +451,12 @@ # with _XOPEN_SOURCE and __BSD_VISIBLE does not re-enable them. FreeBSD/4.*) define_xopen_source=no;; - # On MacOS X 10.2, a bug in ncurses.h means that it craps out if + # On MacOS X 10.2, a bug in ncurses.h means that it craps out if # _XOPEN_EXTENDED_SOURCE is defined. Apparently, this is fixed in 10.3, which # identifies itself as Darwin/7.* # On Mac OS X 10.4, defining _POSIX_C_SOURCE or _XOPEN_SOURCE # disables platform specific features beyond repair. - # On Mac OS X 10.3, defining _POSIX_C_SOURCE or _XOPEN_SOURCE + # On Mac OS X 10.3, defining _POSIX_C_SOURCE or _XOPEN_SOURCE # has no effect, don't bother defining them Darwin/@<:@6789@:>@.*) define_xopen_source=no;; @@ -630,7 +630,7 @@ AS_HELP_STRING([--with-cxx-main=], [compile main() and link python executable with C++ compiler]), [ - + case $withval in no) with_cxx_main=no MAINCC='$(CC)';; @@ -763,7 +763,7 @@ # systems without shared libraries, LDLIBRARY is the same as LIBRARY # (defined in the Makefiles). On Cygwin LDLIBRARY is the import library, # DLLLIBRARY is the shared (i.e., DLL) library. -# +# # RUNSHARED is used to run shared python without installed libraries # # INSTSONAME is the name of the shared library that will be use to install @@ -791,7 +791,7 @@ # If CXX is set, and if it is needed to link a main function that was # compiled with CXX, LINKCC is CXX instead. Always using CXX is undesirable: # python might then depend on the C++ runtime -# This is altered for AIX in order to build the export list before +# This is altered for AIX in order to build the export list before # linking. AC_SUBST(LINKCC) AC_MSG_CHECKING(LINKCC) @@ -845,7 +845,7 @@ AS_HELP_STRING([--enable-shared], [disable/enable building shared python library])) if test -z "$enable_shared" -then +then case $ac_sys_system in CYGWIN*) enable_shared="yes";; @@ -890,7 +890,7 @@ BLDLIBRARY='' else BLDLIBRARY='$(LDLIBRARY)' -fi +fi # Other platforms follow if test $enable_shared = "yes"; then @@ -1019,14 +1019,14 @@ # Check for --with-pydebug AC_MSG_CHECKING(for --with-pydebug) -AC_ARG_WITH(pydebug, +AC_ARG_WITH(pydebug, AS_HELP_STRING([--with-pydebug], [build with Py_DEBUG defined]), [ if test "$withval" != no -then - AC_DEFINE(Py_DEBUG, 1, - [Define if you want to build an interpreter with many run-time checks.]) - AC_MSG_RESULT(yes); +then + AC_DEFINE(Py_DEBUG, 1, + [Define if you want to build an interpreter with many run-time checks.]) + AC_MSG_RESULT(yes); Py_DEBUG='true' ABIFLAGS="${ABIFLAGS}d" else AC_MSG_RESULT(no); Py_DEBUG='false' @@ -1181,7 +1181,7 @@ AC_MSG_CHECKING(which compiler should be used) case "${UNIVERSALSDK}" in */MacOSX10.4u.sdk) - # Build using 10.4 SDK, force usage of gcc when the + # Build using 10.4 SDK, force usage of gcc when the # compiler is gcc, otherwise the user will get very # confusing error messages when building on OSX 10.6 CC=gcc-4.0 @@ -1242,9 +1242,9 @@ cur_target=10.3 if test ${enable_universalsdk}; then if test "${UNIVERSAL_ARCHS}" = "all"; then - # Ensure that the default platform for a - # 4-way universal build is OSX 10.5, - # that's the first OS release where + # Ensure that the default platform for a + # 4-way universal build is OSX 10.5, + # that's the first OS release where # 4-way builds make sense. cur_target='10.5' @@ -1267,8 +1267,8 @@ fi fi CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}} - - # Make sure that MACOSX_DEPLOYMENT_TARGET is set in the + + # Make sure that MACOSX_DEPLOYMENT_TARGET is set in the # environment with a value that is the same as what we'll use # in the Makefile to ensure that we'll get the same compiler # environment during configure and build time. @@ -1349,7 +1349,7 @@ AC_MSG_RESULT($ac_cv_pthread_is_default) -if test $ac_cv_pthread_is_default = yes +if test $ac_cv_pthread_is_default = yes then ac_cv_kpthread=no else @@ -1445,14 +1445,14 @@ if test "$ac_cv_kpthread" = "yes" then - CXX="$CXX -Kpthread" + CXX="$CXX -Kpthread" ac_cv_cxx_thread=yes elif test "$ac_cv_kthread" = "yes" then CXX="$CXX -Kthread" ac_cv_cxx_thread=yes elif test "$ac_cv_pthread" = "yes" -then +then CXX="$CXX -pthread" ac_cv_cxx_thread=yes fi @@ -1594,11 +1594,11 @@ # These may affect some typedefs case $ac_sys_system/$ac_sys_release in AIX*) - AC_DEFINE(_LARGE_FILES, 1, + AC_DEFINE(_LARGE_FILES, 1, [This must be defined on AIX systems to enable large file support.]) ;; esac -AC_DEFINE(_LARGEFILE_SOURCE, 1, +AC_DEFINE(_LARGEFILE_SOURCE, 1, [This must be defined on some systems to enable large file support.]) AC_DEFINE(_FILE_OFFSET_BITS, 64, [This must be set to 64 on some systems to enable large file support.]) @@ -1642,7 +1642,7 @@ AC_MSG_CHECKING(for long long support) have_long_long=no AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[long long x; x = (long long)0;]])],[ - AC_DEFINE(HAVE_LONG_LONG, 1, [Define this if you have the type long long.]) + AC_DEFINE(HAVE_LONG_LONG, 1, [Define this if you have the type long long.]) have_long_long=yes ],[]) AC_MSG_RESULT($have_long_long) @@ -1653,7 +1653,7 @@ AC_MSG_CHECKING(for long double support) have_long_double=no AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[long double x; x = (long double)0;]])],[ - AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define this if you have the type long double.]) + AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define this if you have the type long double.]) have_long_double=yes ],[]) AC_MSG_RESULT($have_long_double) @@ -1665,7 +1665,7 @@ AC_MSG_CHECKING(for _Bool support) have_c99_bool=no AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[_Bool x; x = (_Bool)0;]])],[ - AC_DEFINE(HAVE_C99_BOOL, 1, [Define this if you have the type _Bool.]) + AC_DEFINE(HAVE_C99_BOOL, 1, [Define this if you have the type _Bool.]) have_c99_bool=yes ],[]) AC_MSG_RESULT($have_c99_bool) @@ -1673,8 +1673,8 @@ AC_CHECK_SIZEOF(_Bool, 1) fi -AC_CHECK_TYPES(uintptr_t, - [AC_CHECK_SIZEOF(uintptr_t, 4)], +AC_CHECK_TYPES(uintptr_t, + [AC_CHECK_SIZEOF(uintptr_t, 4)], [], [#ifdef HAVE_STDINT_H #include #endif @@ -1693,7 +1693,7 @@ then if test "$ac_cv_sizeof_off_t" -gt "$ac_cv_sizeof_long" -a \ "$ac_cv_sizeof_long_long" -ge "$ac_cv_sizeof_off_t"; then - AC_DEFINE(HAVE_LARGEFILE_SUPPORT, 1, + AC_DEFINE(HAVE_LARGEFILE_SUPPORT, 1, [Defined to enable large file support when an off_t is bigger than a long and long long is available and at least as big as an off_t. You may need to add some flags for configuration and compilation to enable this mode. @@ -1742,7 +1742,7 @@ AC_SUBST(OTHER_LIBTOOL_OPT) case $ac_sys_system/$ac_sys_release in - Darwin/@<:@01567@:>@\..*) + Darwin/@<:@01567@:>@\..*) OTHER_LIBTOOL_OPT="-prebind -seg1addr 0x10000000" ;; Darwin/*) @@ -1754,7 +1754,7 @@ ARCH_RUN_32BIT="" AC_SUBST(LIBTOOL_CRUFT) case $ac_sys_system/$ac_sys_release in - Darwin/@<:@01567@:>@\..*) + Darwin/@<:@01567@:>@\..*) LIBTOOL_CRUFT="-framework System -lcc_dynamic" if test "${enable_universalsdk}"; then : @@ -1768,7 +1768,7 @@ if test ${gcc_version} '<' 4.0 then LIBTOOL_CRUFT="-lcc_dynamic" - else + else LIBTOOL_CRUFT="" fi AC_RUN_IFELSE([AC_LANG_SOURCE([[ @@ -1782,14 +1782,14 @@ } } ]])],[ac_osx_32bit=yes],[ac_osx_32bit=no],[ac_osx_32bit=yes]) - + if test "${ac_osx_32bit}" = "yes"; then case `/usr/bin/arch` in - i386) - MACOSX_DEFAULT_ARCH="i386" + i386) + MACOSX_DEFAULT_ARCH="i386" ;; - ppc) - MACOSX_DEFAULT_ARCH="ppc" + ppc) + MACOSX_DEFAULT_ARCH="ppc" ;; *) AC_MSG_ERROR([Unexpected output of 'arch' on OSX]) @@ -1797,11 +1797,11 @@ esac else case `/usr/bin/arch` in - i386) - MACOSX_DEFAULT_ARCH="x86_64" + i386) + MACOSX_DEFAULT_ARCH="x86_64" ;; - ppc) - MACOSX_DEFAULT_ARCH="ppc64" + ppc) + MACOSX_DEFAULT_ARCH="ppc64" ;; *) AC_MSG_ERROR([Unexpected output of 'arch' on OSX]) @@ -1820,9 +1820,9 @@ if test "$enable_framework" then BASECFLAGS="$BASECFLAGS -fno-common -dynamic" - # -F. is needed to allow linking to the framework while + # -F. is needed to allow linking to the framework while # in the build location. - AC_DEFINE(WITH_NEXT_FRAMEWORK, 1, + AC_DEFINE(WITH_NEXT_FRAMEWORK, 1, [Define if you want to produce an OpenStep/Rhapsody framework (shared library plus accessory files).]) AC_MSG_RESULT(yes) @@ -1837,7 +1837,7 @@ AC_MSG_CHECKING(for dyld) case $ac_sys_system/$ac_sys_release in Darwin/*) - AC_DEFINE(WITH_DYLD, 1, + AC_DEFINE(WITH_DYLD, 1, [Define if you want to use the new-style (Openstep, Rhapsody, MacOS) dynamic linker (dyld) instead of the old-style (NextStep) dynamic linker (rld). Dyld is necessary to support frameworks.]) @@ -1871,7 +1871,7 @@ ;; IRIX/5*) LDSHARED="ld -shared";; IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";; - SunOS/5*) + SunOS/5*) if test "$GCC" = "yes" ; then LDSHARED='$(CC) -shared' LDCXXSHARED='$(CXX) -shared' @@ -2043,7 +2043,7 @@ BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";; Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";; # -u libsys_s pulls in all symbols in libsys - Darwin/*) + Darwin/*) LINKFORSHARED="$extra_undefs -framework CoreFoundation" if test "$enable_framework" then @@ -2053,7 +2053,7 @@ OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";; SCO_SV*) LINKFORSHARED="-Wl,-Bexport";; ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";; - FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) + FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) if [[ "`$CC -dM -E - ]], [[getpgrp(0);]])], [AC_DEFINE(GETPGRP_HAVE_ARG, 1, [Define if getpgrp() must be called as getpgrp(0).])], []) @@ -3035,7 +3035,7 @@ [AC_DEFINE(SETPGRP_HAVE_ARG, 1, [Define if setpgrp() must be called as setpgrp(0, 0).])], []) ) -AC_CHECK_FUNCS(gettimeofday, +AC_CHECK_FUNCS(gettimeofday, AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[gettimeofday((struct timeval*)0,(struct timezone*)0);]])], [], @@ -3079,7 +3079,7 @@ ]) # On OSF/1 V5.1, getaddrinfo is available, but a define -# for [no]getaddrinfo in netdb.h. +# for [no]getaddrinfo in netdb.h. AC_MSG_CHECKING(for getaddrinfo) AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include @@ -3238,7 +3238,7 @@ ]], [[;]])],[ AC_DEFINE(SYS_SELECT_WITH_SYS_TIME, 1, [Define if you can safely include both and - (which you can't on SCO ODT 3.0).]) + (which you can't on SCO ODT 3.0).]) was_it_defined=yes ],[]) AC_MSG_RESULT($was_it_defined) @@ -3289,8 +3289,8 @@ have_prototypes=no AC_MSG_CHECKING(for prototypes) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int foo(int x) { return 0; }]], [[return foo(10);]])], - [AC_DEFINE(HAVE_PROTOTYPES, 1, - [Define if your compiler supports function prototype]) + [AC_DEFINE(HAVE_PROTOTYPES, 1, + [Define if your compiler supports function prototype]) have_prototypes=yes], [] ) @@ -3311,7 +3311,7 @@ ]], [[return foo(10, "", 3.14);]])],[ AC_DEFINE(HAVE_STDARG_PROTOTYPES, 1, [Define if your compiler supports variable length function prototypes - (e.g. void fprintf(FILE *, char *, ...);) *and* ]) + (e.g. void fprintf(FILE *, char *, ...);) *and* ]) works=yes ],[]) AC_MSG_RESULT($works) @@ -3346,7 +3346,7 @@ #include #endif ]], [[va_list list1, list2; list1 = list2;]])],[],[ - AC_DEFINE(VA_LIST_IS_ARRAY, 1, [Define if a va_list is an array of some kind]) + AC_DEFINE(VA_LIST_IS_ARRAY, 1, [Define if a va_list is an array of some kind]) va_list_is_array=yes ]) AC_MSG_RESULT($va_list_is_array) @@ -3441,9 +3441,9 @@ AS_HELP_STRING([--with-fpectl], [enable SIGFPE catching]), [ if test "$withval" != no -then +then AC_DEFINE(WANT_SIGFPE_HANDLER, 1, - [Define if you want SIGFPE handled (see Include/pyfpe.h).]) + [Define if you want SIGFPE handled (see Include/pyfpe.h).]) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) fi], @@ -3801,8 +3801,8 @@ # check for wchar.h AC_CHECK_HEADER(wchar.h, [ - AC_DEFINE(HAVE_WCHAR_H, 1, - [Define if the compiler provides a wchar.h header file.]) + AC_DEFINE(HAVE_WCHAR_H, 1, + [Define if the compiler provides a wchar.h header file.]) wchar_h="yes" ], wchar_h="no" @@ -4094,7 +4094,7 @@ [Define if poll() sets errno on invalid file descriptors.]) fi -# Before we can test tzset, we need to check if struct tm has a tm_zone +# Before we can test tzset, we need to check if struct tm has a tm_zone # (which is not required by ISO C or UNIX spec) and/or if we support # tzname[] AC_STRUCT_TIMEZONE @@ -4120,7 +4120,7 @@ tm->tm_zone does not exist since it is the alternative way of getting timezone info. - Red Hat 6.2 doesn't understand the southern hemisphere + Red Hat 6.2 doesn't understand the southern hemisphere after New Year's Day. */ @@ -4133,7 +4133,7 @@ exit(1); #if HAVE_TZNAME /* For UTC, tzname[1] is sometimes "", sometimes " " */ - if (strcmp(tzname[0], "UTC") || + if (strcmp(tzname[0], "UTC") || (tzname[1][0] != 0 && tzname[1][0] != ' ')) exit(1); #endif @@ -4240,7 +4240,7 @@ if test "$ac_cv_window_has_flags" = yes then - AC_DEFINE(WINDOW_HAS_FLAGS, 1, + AC_DEFINE(WINDOW_HAS_FLAGS, 1, [Define if WINDOW in curses.h offers a field _flags.]) fi @@ -4438,7 +4438,7 @@ if test "$ac_cv_broken_mbstowcs" = yes then AC_DEFINE(HAVE_BROKEN_MBSTOWCS, 1, - [Define if mbstowcs(NULL, "text", 0) does not return the number of + [Define if mbstowcs(NULL, "text", 0) does not return the number of wide chars that would be converted.]) fi @@ -4449,15 +4449,15 @@ [Use computed gotos in evaluation loop (enabled by default on supported compilers)]), [ if test "$withval" = yes -then +then AC_DEFINE(USE_COMPUTED_GOTOS, 1, - [Define if you want to use computed gotos in ceval.c.]) + [Define if you want to use computed gotos in ceval.c.]) AC_MSG_RESULT(yes) fi if test "$withval" = no -then +then AC_DEFINE(USE_COMPUTED_GOTOS, 0, - [Define if you want to use computed gotos in ceval.c.]) + [Define if you want to use computed gotos in ceval.c.]) AC_MSG_RESULT(no) fi ], @@ -4491,7 +4491,7 @@ esac case $ac_sys_system in -AIX*) +AIX*) AC_DEFINE(HAVE_BROKEN_PIPE_BUF, 1, [Define if the system reports an invalid PIPE_BUF value.]) ;; esac
-
Nave pequeña de cargaNave pequeña de carga 10
Nave grande de cargaNave grande de carga 19
CruceroCrucero 6
RecicladorReciclador 1
Sonda de espionajeSonda de espionaje 139