[Python-3000-checkins] r56202 - in python/branches/p3yk: Doc/lib/libsignal.tex Doc/lib/libsmtplib.tex Lib/sre_compile.py Lib/webbrowser.py Modules/_tkinter.c PCbuild8/build.bat

[neal.norwitz]

Author: neal.norwitz
Date: Mon Jul  9 03:30:09 2007
New Revision: 56202

Modified:
   python/branches/p3yk/   (props changed)
   python/branches/p3yk/Doc/lib/libsignal.tex
   python/branches/p3yk/Doc/lib/libsmtplib.tex
   python/branches/p3yk/Lib/sre_compile.py
   python/branches/p3yk/Lib/webbrowser.py
   python/branches/p3yk/Modules/_tkinter.c
   python/branches/p3yk/PCbuild8/build.bat
Log:
Merged revisions 56124-56201 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r56129 | georg.brandl | 2007-06-30 04:01:01 -0700 (Sat, 30 Jun 2007) | 2 lines
  
  Document smtp.SMTPAuthenticationError.
........
  r56137 | georg.brandl | 2007-07-01 01:11:35 -0700 (Sun, 01 Jul 2007) | 2 lines
  
  Fix a few webbrowser.py problems.
........
  r56143 | georg.brandl | 2007-07-02 04:54:28 -0700 (Mon, 02 Jul 2007) | 2 lines
  
  Remove duplicate sentence from alarm() doc.
........
  r56170 | mark.hammond | 2007-07-03 19:03:10 -0700 (Tue, 03 Jul 2007) | 3 lines
  
  copy built files to the PCBuild directory, where tools like
  distutils or external build processes can find them.
........
  r56176 | kurt.kaiser | 2007-07-05 15:03:39 -0700 (Thu, 05 Jul 2007) | 10 lines
  
  Many calls to tk.call involve an arglist containing a single tuple.
  Calls using METH_OLDARGS unpack this tuple; calls using METH_VARARG
  don't.  Tcl's concatenation of args was affected; IDLE doesn't start.
  
  Modify Tkapp_Call() to unpack single tuple arglists.
  
  Bug 1733943
  Ref http://mail.python.org/pipermail/python-checkins/2007-May/060454.html
........
  r56177 | neal.norwitz | 2007-07-05 21:13:39 -0700 (Thu, 05 Jul 2007) | 1 line
  
  Fix typo in comment
........


Modified: python/branches/p3yk/Doc/lib/libsignal.tex
==============================================================================
--- python/branches/p3yk/Doc/lib/libsignal.tex	(original)
+++ python/branches/p3yk/Doc/lib/libsignal.tex	Mon Jul  9 03:30:09 2007
@@ -101,8 +101,7 @@
   be scheduled at any time).  The returned value is then the number of
   seconds before any previously set alarm was to have been delivered.
   If \var{time} is zero, no alarm is scheduled, and any scheduled
-  alarm is canceled.  The return value is the number of seconds
-  remaining before a previously scheduled alarm.  If the return value
+  alarm is canceled.  If the return value
   is zero, no alarm is currently scheduled.  (See the \UNIX{} man page
   \manpage{alarm}{2}.)
   Availability: \UNIX.

Modified: python/branches/p3yk/Doc/lib/libsmtplib.tex
==============================================================================
--- python/branches/p3yk/Doc/lib/libsmtplib.tex	(original)
+++ python/branches/p3yk/Doc/lib/libsmtplib.tex	Mon Jul  9 03:30:09 2007
@@ -113,6 +113,10 @@
   The server refused our \samp{HELO} message.
 \end{excdesc}
 
+\begin{excdesc}{SMTPAuthenticationError}
+  SMTP authentication went wrong.  Most probably the server didn't accept
+  the username/password combination provided.
+\end{excdesc}
 
 \begin{seealso}
   \seerfc{821}{Simple Mail Transfer Protocol}{Protocol definition for

Modified: python/branches/p3yk/Lib/sre_compile.py
==============================================================================
--- python/branches/p3yk/Lib/sre_compile.py	(original)
+++ python/branches/p3yk/Lib/sre_compile.py	Mon Jul  9 03:30:09 2007
@@ -280,7 +280,7 @@
 
 # To represent a big charset, first a bitmap of all characters in the
 # set is constructed. Then, this bitmap is sliced into chunks of 256
-# characters, duplicate chunks are eliminitated, and each chunk is
+# characters, duplicate chunks are eliminated, and each chunk is
 # given a number. In the compiled expression, the charset is
 # represented by a 16-bit word sequence, consisting of one word for
 # the number of different chunks, a sequence of 256 bytes (128 words)

Modified: python/branches/p3yk/Lib/webbrowser.py
==============================================================================
--- python/branches/p3yk/Lib/webbrowser.py	(original)
+++ python/branches/p3yk/Lib/webbrowser.py	Mon Jul  9 03:30:09 2007
@@ -1,5 +1,6 @@
 #! /usr/bin/env python
 """Interfaces for launching and remotely controlling Web browsers."""
+# Maintained by Georg Brandl.
 
 import os
 import shlex
@@ -160,6 +161,7 @@
     def __init__(self, name):
         if isinstance(name, basestring):
             self.name = name
+            self.args = ["%s"]
         else:
             # name should be a list with arguments
             self.name = name[0]

Modified: python/branches/p3yk/Modules/_tkinter.c
==============================================================================
--- python/branches/p3yk/Modules/_tkinter.c	(original)
+++ python/branches/p3yk/Modules/_tkinter.c	Mon Jul  9 03:30:09 2007
@@ -1285,6 +1285,12 @@
 	/* Could add TCL_EVAL_GLOBAL if wrapped by GlobalCall... */
 	int flags = TCL_EVAL_DIRECT;
 
+	/* If args is a single tuple, replace with contents of tuple */
+	if (1 == PyTuple_Size(args)){
+		PyObject* item = PyTuple_GetItem(args, 0);
+		if (PyTuple_Check(item))
+			args = item;
+	}
 #ifdef WITH_THREAD
 	if (self->threaded && self->thread_id != Tcl_GetCurrentThread()) {
 		/* We cannot call the command directly. Instead, we must

Modified: python/branches/p3yk/PCbuild8/build.bat
==============================================================================
--- python/branches/p3yk/PCbuild8/build.bat	(original)
+++ python/branches/p3yk/PCbuild8/build.bat	Mon Jul  9 03:30:09 2007
@@ -14,4 +14,15 @@
 
 set cmd=devenv pcbuild.sln %build% "%conf%|%platf%"
 echo %cmd%
-%cmd%
\ No newline at end of file
+%cmd%
+
+rem Copy whatever was built to the canonical 'PCBuild' directory.
+rem This helps extensions which use distutils etc.
+rem (Don't check if the build was successful - we expect a few failures
+rem due to missing libs)
+echo Copying built files to ..\PCBuild
+if not exist %platf%%conf%\. (echo %platf%%conf% does not exist - nothing copied & goto xit)
+if not exist ..\PCBuild\. (echo ..\PCBuild does not exist - nothing copied & goto xit)
+xcopy /q/y %platf%%conf%\* ..\PCBuild\.
+
+:xit