[Python-checkins] r69058 - in python/branches/py3k-issue1717: Demo/tkinter/README Demo/tkinter/ttk Doc/library/tk.rst Doc/library/tkinter.ttk.rst Lib/test/test_tk_guionly.py Lib/test/test_tk_textonly.py Lib/tkinter/test Lib/tkinter/ttk.py Misc/NEWS PC/dl_nt.c Python/dynload_win.c

mark.dickinson python-checkins at python.org
Wed Jan 28 18:02:57 CET 2009 

Author: mark.dickinson
Date: Wed Jan 28 18:02:31 2009
New Revision: 69058

Log:
Merged revisions 69035,69041,69051,69055 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r69035 | benjamin.peterson | 2009-01-27 21:37:33 +0000 (Tue, 27 Jan 2009) | 28 lines
  
  Blocked revisions 69001,69010,69012,69014,69018,69023 via svnmerge
  
  ........
    r69001 | raymond.hettinger | 2009-01-26 20:58:49 -0600 (Mon, 26 Jan 2009) | 1 line
    
    Promote combinations_with_replacement() from a recipe to a regular itertool.
  ........
    r69010 | raymond.hettinger | 2009-01-27 03:33:06 -0600 (Tue, 27 Jan 2009) | 1 line
    
    Add tests to verify combinatoric relationships.
  ........
    r69012 | raymond.hettinger | 2009-01-27 03:52:35 -0600 (Tue, 27 Jan 2009) | 1 line
    
    Stronger tests for combinatoric relationships.
  ........
    r69014 | raymond.hettinger | 2009-01-27 04:03:04 -0600 (Tue, 27 Jan 2009) | 1 line
    
    Issue 5021: doctest.testfile should set __name__
  ........
    r69018 | raymond.hettinger | 2009-01-27 04:36:14 -0600 (Tue, 27 Jan 2009) | 1 line
    
    More exhaustive combinatoric checks.
  ........
    r69023 | raymond.hettinger | 2009-01-27 07:26:35 -0600 (Tue, 27 Jan 2009) | 1 line
    
    Add more tests for the powerset() recipe.
  ........
................
  r69041 | mark.hammond | 2009-01-27 23:46:57 +0000 (Tue, 27 Jan 2009) | 10 lines
  
  Merged revisions 69038 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r69038 | mark.hammond | 2009-01-28 10:12:23 +1100 (Wed, 28 Jan 2009) | 3 lines
    
    On Windows, use the Python 'Activation Context' when loading extensions
    to avoid problems loading the CRT from a private assembly.  Via bug 4566.
  ........
................
  r69051 | guilherme.polo | 2009-01-28 14:41:10 +0000 (Wed, 28 Jan 2009) | 9 lines
  
  Merged revisions 69050 via svnmerge from 
  svn+ssh://pythondev/python/trunk
  
  ........
    r69050 | guilherme.polo | 2009-01-28 11:09:03 -0200 (Wed, 28 Jan 2009) | 2 lines
    
    Added the ttk module. See issue #2983: Ttk support for Tkinter.
  ........
................
  r69055 | guilherme.polo | 2009-01-28 16:06:51 +0000 (Wed, 28 Jan 2009) | 9 lines
  
  Merged revisions 69053 via svnmerge from 
  svn+ssh://pythondev/python/trunk
  
  ........
    r69053 | guilherme.polo | 2009-01-28 13:56:01 -0200 (Wed, 28 Jan 2009) | 2 lines
    
    Demos for ttk added.
  ........
................


Added:
   python/branches/py3k-issue1717/Demo/tkinter/ttk/
      - copied from r69055, /python/branches/py3k/Demo/tkinter/ttk/
   python/branches/py3k-issue1717/Doc/library/tkinter.ttk.rst
      - copied unchanged from r69055, /python/branches/py3k/Doc/library/tkinter.ttk.rst
   python/branches/py3k-issue1717/Lib/test/test_tk_guionly.py
      - copied unchanged from r69055, /python/branches/py3k/Lib/test/test_tk_guionly.py
   python/branches/py3k-issue1717/Lib/test/test_tk_textonly.py
      - copied unchanged from r69055, /python/branches/py3k/Lib/test/test_tk_textonly.py
   python/branches/py3k-issue1717/Lib/tkinter/test/
      - copied from r69055, /python/branches/py3k/Lib/tkinter/test/
   python/branches/py3k-issue1717/Lib/tkinter/ttk.py
      - copied unchanged from r69055, /python/branches/py3k/Lib/tkinter/ttk.py
Modified:
   python/branches/py3k-issue1717/   (props changed)
   python/branches/py3k-issue1717/Demo/tkinter/README
   python/branches/py3k-issue1717/Doc/library/tk.rst
   python/branches/py3k-issue1717/Misc/NEWS
   python/branches/py3k-issue1717/PC/dl_nt.c
   python/branches/py3k-issue1717/Python/dynload_win.c

Modified: python/branches/py3k-issue1717/Demo/tkinter/README
==============================================================================
--- python/branches/py3k-issue1717/Demo/tkinter/README	(original)
+++ python/branches/py3k-issue1717/Demo/tkinter/README	Wed Jan 28 18:02:31 2009
@@ -8,3 +8,4 @@
 
 guido		my original example set (fairly random collection)
 matt		Matt Conway's examples, to go with his lifesaver document
+ttk         Examples using the ttk module

Modified: python/branches/py3k-issue1717/Doc/library/tk.rst
==============================================================================
--- python/branches/py3k-issue1717/Doc/library/tk.rst	(original)
+++ python/branches/py3k-issue1717/Doc/library/tk.rst	Wed Jan 28 18:02:31 2009
@@ -12,8 +12,8 @@
 
 Tk/Tcl has long been an integral part of Python.  It provides a robust and
 platform independent windowing toolkit, that is available to Python programmers
-using the :mod:`tkinter` package, and its extension, the :mod:`tkinter.tix`
-module.
+using the :mod:`tkinter` package, and its extension, the :mod:`tkinter.tix` and
+the :mod:`tkinter.ttk` modules.
 
 The :mod:`tkinter` package is a thin object-oriented layer on top of Tcl/Tk. To
 use :mod:`tkinter`, you don't need to write Tcl code, but you will need to
@@ -33,6 +33,7 @@
 .. toctree::
 
    tkinter.rst
+   tkinter.ttk.rst
    tkinter.tix.rst
    tkinter.scrolledtext.rst
    turtle.rst

Modified: python/branches/py3k-issue1717/Misc/NEWS
==============================================================================
--- python/branches/py3k-issue1717/Misc/NEWS	(original)
+++ python/branches/py3k-issue1717/Misc/NEWS	Wed Jan 28 18:02:31 2009
@@ -144,6 +144,8 @@
 Library
 -------
 
+- Added the ttk module. See issue #2983: Ttk support for Tkinter.
+
 - Removed isSequenceType(), isMappingType, and isNumberType() from the
   operator module; use the abstract base classes instead.  Also removed
   the repeat() function; use mul() instead.
@@ -349,6 +351,8 @@
 Tools/Demos
 -----------
 
+- Ttk demos added in Demo/tkinter/ttk/
+
 - Issue #4677: add two list comprehension tests to pybench.
 
 

Modified: python/branches/py3k-issue1717/PC/dl_nt.c
==============================================================================
--- python/branches/py3k-issue1717/PC/dl_nt.c	(original)
+++ python/branches/py3k-issue1717/PC/dl_nt.c	Wed Jan 28 18:02:31 2009
@@ -18,6 +18,63 @@
 HMODULE PyWin_DLLhModule = NULL;
 const char *PyWin_DLLVersionString = dllVersionBuffer;
 
+// Windows "Activation Context" work:
+// Our .pyd extension modules are generally built without a manifest (ie,
+// those included with Python and those built with a default distutils.
+// This requires we perform some "activation context" magic when loading our
+// extensions.  In summary:
+// * As our DLL loads we save the context being used.
+// * Before loading our extensions we re-activate our saved context.
+// * After extension load is complete we restore the old context.
+// As an added complication, this magic only works on XP or later - we simply
+// use the existence (or not) of the relevant function pointers from kernel32.
+// See bug 4566 (http://python.org/sf/4566) for more details.
+
+typedef BOOL (WINAPI * PFN_GETCURRENTACTCTX)(HANDLE *);
+typedef BOOL (WINAPI * PFN_ACTIVATEACTCTX)(HANDLE, ULONG_PTR *);
+typedef BOOL (WINAPI * PFN_DEACTIVATEACTCTX)(DWORD, ULONG_PTR);
+typedef BOOL (WINAPI * PFN_ADDREFACTCTX)(HANDLE);
+typedef BOOL (WINAPI * PFN_RELEASEACTCTX)(HANDLE);
+
+// locals and function pointers for this activation context magic.
+static HANDLE PyWin_DLLhActivationContext = NULL; // one day it might be public
+static PFN_GETCURRENTACTCTX pfnGetCurrentActCtx = NULL;
+static PFN_ACTIVATEACTCTX pfnActivateActCtx = NULL;
+static PFN_DEACTIVATEACTCTX pfnDeactivateActCtx = NULL;
+static PFN_ADDREFACTCTX pfnAddRefActCtx = NULL;
+static PFN_RELEASEACTCTX pfnReleaseActCtx = NULL;
+
+void _LoadActCtxPointers()
+{
+	HINSTANCE hKernel32 = GetModuleHandleW(L"kernel32.dll");
+	if (hKernel32)
+		pfnGetCurrentActCtx = (PFN_GETCURRENTACTCTX) GetProcAddress(hKernel32, "GetCurrentActCtx");
+	// If we can't load GetCurrentActCtx (ie, pre XP) , don't bother with the rest.
+	if (pfnGetCurrentActCtx) {
+		pfnActivateActCtx = (PFN_ACTIVATEACTCTX) GetProcAddress(hKernel32, "ActivateActCtx");
+		pfnDeactivateActCtx = (PFN_DEACTIVATEACTCTX) GetProcAddress(hKernel32, "DeactivateActCtx");
+		pfnAddRefActCtx = (PFN_ADDREFACTCTX) GetProcAddress(hKernel32, "AddRefActCtx");
+		pfnReleaseActCtx = (PFN_RELEASEACTCTX) GetProcAddress(hKernel32, "ReleaseActCtx");
+	}
+}
+
+ULONG_PTR _Py_ActivateActCtx()
+{
+	ULONG_PTR ret = 0;
+	if (PyWin_DLLhActivationContext && pfnActivateActCtx)
+		if (!(*pfnActivateActCtx)(PyWin_DLLhActivationContext, &ret)) {
+			OutputDebugString("Python failed to activate the activation context before loading a DLL\n");
+			ret = 0; // no promise the failing function didn't change it!
+		}
+	return ret;
+}
+
+void _Py_DeactivateActCtx(ULONG_PTR cookie)
+{
+	if (cookie && pfnDeactivateActCtx)
+		if (!(*pfnDeactivateActCtx)(0, cookie))
+			OutputDebugString("Python failed to de-activate the activation context\n");
+}
 
 BOOL	WINAPI	DllMain (HANDLE hInst, 
 						ULONG ul_reason_for_call,
@@ -29,9 +86,18 @@
 			PyWin_DLLhModule = hInst;
 			// 1000 is a magic number I picked out of the air.  Could do with a #define, I spose...
 			LoadString(hInst, 1000, dllVersionBuffer, sizeof(dllVersionBuffer));
-			//initall();
+
+			// and capture our activation context for use when loading extensions.
+			_LoadActCtxPointers();
+			if (pfnGetCurrentActCtx && pfnAddRefActCtx)
+				if ((*pfnGetCurrentActCtx)(&PyWin_DLLhActivationContext))
+					if (!(*pfnAddRefActCtx)(PyWin_DLLhActivationContext))
+						OutputDebugString("Python failed to load the default activation context\n");
 			break;
+
 		case DLL_PROCESS_DETACH:
+			if (pfnReleaseActCtx)
+				(*pfnReleaseActCtx)(PyWin_DLLhActivationContext);
 			break;
 	}
 	return TRUE;

Modified: python/branches/py3k-issue1717/Python/dynload_win.c
==============================================================================
--- python/branches/py3k-issue1717/Python/dynload_win.c	(original)
+++ python/branches/py3k-issue1717/Python/dynload_win.c	Wed Jan 28 18:02:31 2009
@@ -11,6 +11,10 @@
 #include "importdl.h"
 #include <windows.h>
 
+// "activation context" magic - see dl_nt.c...
+extern ULONG_PTR _Py_ActivateActCtx();
+void _Py_DeactivateActCtx(ULONG_PTR cookie);
+
 const struct filedescr _PyImport_DynLoadFiletab[] = {
 #ifdef _DEBUG
 	{"_d.pyd", "rb", C_EXTENSION},
@@ -172,6 +176,7 @@
 		char pathbuf[260];
 		LPTSTR dummy;
 		unsigned int old_mode;
+		ULONG_PTR cookie = 0;
 		/* We use LoadLibraryEx so Windows looks for dependent DLLs 
 		    in directory of pathname first.  However, Windows95
 		    can sometimes not work correctly unless the absolute
@@ -184,10 +189,13 @@
 		if (GetFullPathName(pathname,
 				    sizeof(pathbuf),
 				    pathbuf,
-				    &dummy))
+				    &dummy)) {
+			ULONG_PTR cookie = _Py_ActivateActCtx();
 			/* XXX This call doesn't exist in Windows CE */
 			hDLL = LoadLibraryEx(pathname, NULL,
 					     LOAD_WITH_ALTERED_SEARCH_PATH);
+			_Py_DeactivateActCtx(cookie);
+		}
 
 		/* restore old error mode settings */
 		SetErrorMode(old_mode);

More information about the Python-checkins mailing list