pywin32-checkins — CVS checkin notices

[pywin32-checkins] pywin32/isapi install.py,1.23,1.24

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/isapi
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2131

Modified Files:
	install.py 
Log Message:
only set HttpCustomHeaders if headers are specified

Index: install.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/isapi/install.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** install.py	5 Feb 2009 06:59:15 -0000	1.23
--- install.py	13 Mar 2009 00:40:18 -0000	1.24
***************
*** 262,266 ****
          pass
      newDir.AppCreate2(params.AppProtection)
!     newDir.HttpCustomHeaders = params.Headers
  
      log(2, "Setting directory options...")
--- 262,270 ----
          pass
      newDir.AppCreate2(params.AppProtection)
!     # XXX - note that these Headers only work in IIS6 and earlier.  IIS7
!     # only supports them on the w3svc node - not even on individial sites,
!     # let alone individual extensions in the site!
!     if params.Headers:
!         newDir.HttpCustomHeaders = params.Headers
  
      log(2, "Setting directory options...")

[pywin32-checkins] pywin32 Python and Extensions.dsw,1.20,1.21

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9035

Modified Files:
	Python and Extensions.dsw 
Log Message:
Remove references to obsoleted project files

Index: Python and Extensions.dsw
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Python and Extensions.dsw,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Python and Extensions.dsw	10 Jan 2006 06:13:45 -0000	1.20
--- Python and Extensions.dsw	11 Mar 2009 07:46:47 -0000	1.21
***************
*** 178,184 ****
  {{{
      Begin Project Dependency
-     Project_Dep_Name dbi
-     End Project Dependency
-     Begin Project Dependency
      Project_Dep_Name mmapfile
      End Project Dependency
--- 178,181 ----
***************
*** 196,208 ****
      End Project Dependency
      Begin Project Dependency
-     Project_Dep_Name win32event
-     End Project Dependency
-     Begin Project Dependency
-     Project_Dep_Name win32evtlog
-     End Project Dependency
-     Begin Project Dependency
-     Project_Dep_Name win32file
-     End Project Dependency
-     Begin Project Dependency
      Project_Dep_Name win32lz
      End Project Dependency
--- 193,196 ----
***************
*** 220,232 ****
      End Project Dependency
      Begin Project Dependency
-     Project_Dep_Name win32service
-     End Project Dependency
-     Begin Project Dependency
      Project_Dep_Name win32trace
      End Project Dependency
      Begin Project Dependency
-     Project_Dep_Name win32security
-     End Project Dependency
-     Begin Project Dependency
      Project_Dep_Name win32api
      End Project Dependency
--- 208,214 ----
***************
*** 241,250 ****
      End Project Dependency
      Begin Project Dependency
-     Project_Dep_Name win32process
-     End Project Dependency
-     Begin Project Dependency
-     Project_Dep_Name win32gui
-     End Project Dependency
-     Begin Project Dependency
      Project_Dep_Name win32wnet
      End Project Dependency
--- 223,226 ----
***************
*** 280,295 ****
  ###############################################################################
  
- Project: "dbi"=.\win32\dbi.dsp - Package Owner=<4>
- 
- Package=<5>
- {{{
- }}}
- 
- Package=<4>
- {{{
- }}}
- 
- ###############################################################################
- 
  Project: "dde"=.\pythonwin\dde.dsp - Package Owner=<4>
  
--- 256,259 ----
***************
*** 550,613 ****
  ###############################################################################
  
- Project: "win32event"=.\win32\win32event.dsp - Package Owner=<4>
- 
- Package=<5>
- {{{
- }}}
- 
- Package=<4>
- {{{
-     Begin Project Dependency
-     Project_Dep_Name PyWinTypes
-     End Project Dependency
- }}}
- 
- ###############################################################################
- 
- Project: "win32evtlog"=.\win32\win32evtlog.dsp - Package Owner=<4>
- 
- Package=<5>
- {{{
- }}}
- 
- Package=<4>
- {{{
-     Begin Project Dependency
-     Project_Dep_Name PyWinTypes
-     End Project Dependency
- }}}
- 
- ###############################################################################
- 
- Project: "win32file"=.\win32\win32file.dsp - Package Owner=<4>
- 
- Package=<5>
- {{{
- }}}
- 
- Package=<4>
- {{{
-     Begin Project Dependency
-     Project_Dep_Name PyWinTypes
-     End Project Dependency
- }}}
- 
- ###############################################################################
- 
- Project: "win32gui"=.\win32\win32gui.dsp - Package Owner=<4>
- 
- Package=<5>
- {{{
- }}}
- 
- Package=<4>
- {{{
-     Begin Project Dependency
-     Project_Dep_Name PyWinTypes
-     End Project Dependency
- }}}
- 
- ###############################################################################
- 
  Project: "win32help"=.\win32\win32help.dsp - Package Owner=<4>
  
--- 514,517 ----
***************
*** 625,640 ****
  ###############################################################################
  
- Project: "win32inet"=.\win32\win32inet.dsp - Package Owner=<4>
- 
- Package=<5>
- {{{
- }}}
- 
- Package=<4>
- {{{
- }}}
- 
- ###############################################################################
- 
  Project: "win32lz"=.\win32\win32lz.dsp - Package Owner=<4>
  
--- 529,532 ----
***************
*** 724,742 ****
  ###############################################################################
  
- Project: "win32process"=.\win32\win32process.dsp - Package Owner=<4>
- 
- Package=<5>
- {{{
- }}}
- 
- Package=<4>
- {{{
-     Begin Project Dependency
-     Project_Dep_Name PyWinTypes
-     End Project Dependency
- }}}
- 
- ###############################################################################
- 
  Project: "win32ras"=.\win32\win32ras.dsp - Package Owner=<4>
  
--- 616,619 ----
***************
*** 754,787 ****
  ###############################################################################
  
- Project: "win32security"=.\win32\win32security.dsp - Package Owner=<4>
- 
- Package=<5>
- {{{
- }}}
- 
- Package=<4>
- {{{
-     Begin Project Dependency
-     Project_Dep_Name PyWinTypes
-     End Project Dependency
- }}}
- 
- ###############################################################################
- 
- Project: "win32service"=.\win32\win32service.dsp - Package Owner=<4>
- 
- Package=<5>
- {{{
- }}}
- 
- Package=<4>
- {{{
-     Begin Project Dependency
-     Project_Dep_Name PyWinTypes
-     End Project Dependency
- }}}
- 
- ###############################################################################
- 
  Project: "win32trace"=.\win32\win32trace.dsp - Package Owner=<4>
  
--- 631,634 ----

[pywin32-checkins] pywin32/win32 win32event.dsp, 1.7, NONE win32evtlog.dsp, 1.5, NONE win32gui.dsp, 1.9, NONE win32process.dsp, 1.6, NONE win32security.dsp, 1.6, NONE win32service.dsp, 1.4, NONE

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/win32
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6560

Removed Files:
	win32event.dsp win32evtlog.dsp win32gui.dsp win32process.dsp 
	win32security.dsp win32service.dsp 
Log Message:
Remove some project files and dummy .cpp files

--- win32security.dsp DELETED ---

--- win32event.dsp DELETED ---

--- win32gui.dsp DELETED ---

--- win32service.dsp DELETED ---

--- win32evtlog.dsp DELETED ---

--- win32process.dsp DELETED ---

[pywin32-checkins] pywin32/win32/src win32eventmodule.cpp, 1.2, NONE win32guimodule.cpp, 1.2, NONE win32processmodule.cpp, 1.2, NONE

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6560/src

Removed Files:
	win32eventmodule.cpp win32guimodule.cpp win32processmodule.cpp 
Log Message:
Remove some project files and dummy .cpp files

--- win32guimodule.cpp DELETED ---

--- win32processmodule.cpp DELETED ---

--- win32eventmodule.cpp DELETED ---

[pywin32-checkins] pywin32 setup.py,1.106,1.107

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6107

Modified Files:
	setup.py 
Log Message:
Specify sources for swig'ed modules so that project files can be removed

Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** setup.py	2 Mar 2009 06:34:26 -0000	1.106
--- setup.py	11 Mar 2009 07:13:12 -0000	1.107
***************
*** 1449,1455 ****
                win32/src/win32file_comm.cpp
                """),
!         ("win32event", "user32", None),
          ("win32clipboard", "gdi32 user32 shell32", None),
!         ("win32evtlog", "advapi32 oleaut32", None),
          # win32gui handled below
          ("win32job", "user32", True, 0x0500, 'win32/src/win32job.i'),
--- 1449,1458 ----
                win32/src/win32file_comm.cpp
                """),
!         ("win32event", "user32", None, None, "win32/src/win32event.i"),
          ("win32clipboard", "gdi32 user32 shell32", None),
!         ("win32evtlog", "advapi32 oleaut32", None, None, """
!             win32\\src\\win32evtlog_messages.mc
!             win32\\src\\win32evtlog.i
!             """),
          # win32gui handled below
          ("win32job", "user32", True, 0x0500, 'win32/src/win32job.i'),
***************
*** 1464,1468 ****
          ("win32pipe", "", None, None, 'win32/src/win32pipe.i win32/src/win32popen.cpp'),
          ("win32print", "winspool user32 gdi32", None, 0x0500),
!         ("win32process", "advapi32 user32", None, 0x0500),
          ("win32profile", "Userenv", True, None, 'win32/src/win32profilemodule.cpp'),
          ("win32ras", "rasapi32 user32", None, 0x0500),
--- 1467,1471 ----
          ("win32pipe", "", None, None, 'win32/src/win32pipe.i win32/src/win32popen.cpp'),
          ("win32print", "winspool user32 gdi32", None, 0x0500),
!         ("win32process", "advapi32 user32", None, 0x0500, "win32/src/win32process.i"),
          ("win32profile", "Userenv", True, None, 'win32/src/win32profilemodule.cpp'),
          ("win32ras", "rasapi32 user32", None, 0x0500),
***************
*** 1471,1475 ****
              win32/src/win32security_sspi.cpp win32/src/win32security_ds.cpp
              """),
!         ("win32service", "advapi32 oleaut32 user32", True, 0x0501),
          ("win32trace", "advapi32", None),
          ("win32wnet", "netapi32 mpr", None),
--- 1474,1481 ----
              win32/src/win32security_sspi.cpp win32/src/win32security_ds.cpp
              """),
!         ("win32service", "advapi32 oleaut32 user32", True, 0x0501, """
!             win32/src/win32service_messages.mc
!             win32/src/win32service.i
!             """),
          ("win32trace", "advapi32", None),
          ("win32wnet", "netapi32 mpr", None),
***************
*** 1515,1519 ****
             sources = """
                  win32/src/win32dynamicdialog.cpp
!                 win32/src/win32gui.i win32/src/win32guimodule.cpp
                 """.split(),
             windows_h_version=0x0500,
--- 1521,1525 ----
             sources = """
                  win32/src/win32dynamicdialog.cpp
!                 win32/src/win32gui.i
                 """.split(),
             windows_h_version=0x0500,
***************
*** 1526,1530 ****
             sources = """
                  win32/src/winxpgui.rc win32/src/win32dynamicdialog.cpp
!                 win32/src/win32gui.i win32/src/win32guimodule.cpp
                 """.split(),
             libraries="gdi32 user32 comdlg32 comctl32 shell32",
--- 1532,1536 ----
             sources = """
                  win32/src/winxpgui.rc win32/src/win32dynamicdialog.cpp
!                 win32/src/win32gui.i
                 """.split(),
             libraries="gdi32 user32 comdlg32 comctl32 shell32",

[pywin32-checkins] pywin32/Pythonwin win32assoc.h, 1.3, 1.4 win32assoc.cpp, 1.12, 1.13

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28924

Modified Files:
	win32assoc.h win32assoc.cpp 
Log Message:
Add GetAttachedObject to ui_assoc_objects.

Index: win32assoc.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/win32assoc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** win32assoc.h	8 Jan 2009 22:11:52 -0000	1.3
--- win32assoc.h	4 Mar 2009 23:48:56 -0000	1.4
***************
*** 64,67 ****
--- 64,68 ----
  	// methods
  	static PyObject *AttachObject(PyObject *self, PyObject *args);
+ 	static PyObject *GetAttachedObject(PyObject *self, PyObject *args);
  
  	PyObject *virtualInst;

Index: win32assoc.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/win32assoc.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** win32assoc.cpp	8 Jan 2009 22:11:52 -0000	1.12
--- win32assoc.cpp	4 Mar 2009 23:48:57 -0000	1.13
***************
*** 237,243 ****
--- 237,259 ----
  }
  
+ // @pymethod object|PyAssocObject|GetAttachedObject|Returned the attached Python object, or None.
+ PyObject *
+ ui_assoc_object::GetAttachedObject(PyObject *self, PyObject *args)
+ {
+ 	ui_assoc_object *pAssoc = (ui_assoc_object *)self;
+ 	if (pAssoc==NULL) return NULL;
+ 	if (!PyArg_ParseTuple(args, ":GetAttachedObject"))
+ 		return NULL;
+ 	PyObject *ob = pAssoc->virtualInst;
+ 	if (!ob)
+ 		ob = Py_None;
+ 	Py_INCREF(ob);
+ 	return ob;
+ }
+ 
  // @object PyAssocObject|An internal class.
  static struct PyMethodDef PyAssocObject_methods[] = {
  	{"AttachObject",    ui_assoc_object::AttachObject, 1 }, // @pymeth AttachObject|Attaches a Python object for lookup of "virtual" functions.
+ 	{"GetAttachedObject", ui_assoc_object::GetAttachedObject, 1 }, // @pymeth GetAttachedObject|Returned the attached Python object, or None.
  	{NULL, NULL}
  };

[pywin32-checkins] pywin32 setup.py,1.105,1.106

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8120

Modified Files:
	setup.py 
Log Message:
don't build pythonwin if no afxres.h (eg, 'express edition')

Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** setup.py	2 Mar 2009 06:12:57 -0000	1.105
--- setup.py	2 Mar 2009 06:34:26 -0000	1.106
***************
*** 1805,1814 ****
      WinExt_pythonwin("win32ui", extra_compile_args = ['-DBUILD_PYW'],
                       pch_header="stdafx.h", base_address=dll_base_address,
!                      depends=["Pythonwin/stdafx.h", "Pythonwin/win32uiExt.h"]),
      WinExt_pythonwin("win32uiole", pch_header="stdafxole.h",
!                      windows_h_version = 0x500),
      WinExt_pythonwin("dde", pch_header="stdafxdde.h",
                       depends=["win32/src/stddde.h", "pythonwin/ddemodule.h"],
!                      platforms=['win32']),
      ]
  # win32ui is large, so we reserve more bytes than normal
--- 1805,1817 ----
      WinExt_pythonwin("win32ui", extra_compile_args = ['-DBUILD_PYW'],
                       pch_header="stdafx.h", base_address=dll_base_address,
!                      depends=["Pythonwin/stdafx.h", "Pythonwin/win32uiExt.h"],
!                      optional_headers=['afxres.h']),
      WinExt_pythonwin("win32uiole", pch_header="stdafxole.h",
!                      windows_h_version = 0x500,
!                      optional_headers=['afxres.h']),
      WinExt_pythonwin("dde", pch_header="stdafxdde.h",
                       depends=["win32/src/stddde.h", "pythonwin/ddemodule.h"],
!                      platforms=['win32'],
!                      optional_headers=['afxres.h']),
      ]
  # win32ui is large, so we reserve more bytes than normal
***************
*** 1851,1855 ****
                   extra_link_args=["/SUBSYSTEM:CONSOLE"],
                   libraries = "user32 advapi32 ole32 shell32"),
!         WinExt_pythonwin("Pythonwin", extra_link_args=["/SUBSYSTEM:WINDOWS"]),
  ]
  
--- 1854,1859 ----
                   extra_link_args=["/SUBSYSTEM:CONSOLE"],
                   libraries = "user32 advapi32 ole32 shell32"),
!         WinExt_pythonwin("Pythonwin", extra_link_args=["/SUBSYSTEM:WINDOWS"],
!                          optional_headers=['afxres.h']),
  ]
  

[pywin32-checkins] pywin32 setup.py, 1.104, 1.105 MANIFEST.in, 1.16, 1.17

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1829

Modified Files:
	setup.py MANIFEST.in 
Log Message:
remove generated file from sources list

Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** setup.py	16 Feb 2009 13:05:56 -0000	1.104
--- setup.py	2 Mar 2009 06:12:57 -0000	1.105
***************
*** 2091,2095 ****
                  'com/win32com/test/*.js',
                  'com/win32com/test/*.sct',
-                 'com/win32com/test/*.tlb',
                  'com/win32com/test/*.txt',
                  'com/win32com/test/*.vbs',
--- 2091,2094 ----

Index: MANIFEST.in
===================================================================
RCS file: /cvsroot/pywin32/pywin32/MANIFEST.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** MANIFEST.in	16 Feb 2009 05:36:04 -0000	1.16
--- MANIFEST.in	2 Mar 2009 06:12:57 -0000	1.17
***************
*** 37,41 ****
  include com/win32com/test/*.js
  include com/win32com/test/*.sct
- include com/win32com/test/*.tlb
  include com/win32com/test/*.txt
  include com/win32com/test/*.vbs
--- 37,40 ----

[pywin32-checkins] pywin32/com/win32comext/axdebug/src AXDebug.cpp, 1.8, 1.9 PyIActiveScriptDebug.cpp, 1.2, 1.3 stdafx.h, 1.3, 1.4

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32comext/axdebug/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv981/src

Modified Files:
	AXDebug.cpp PyIActiveScriptDebug.cpp stdafx.h 
Log Message:
Avoid use of ATL (ie, remove conversion and assertion macros)


Index: stdafx.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/src/stdafx.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** stdafx.h	29 Jul 2005 05:30:32 -0000	1.3
--- stdafx.h	2 Mar 2009 06:10:40 -0000	1.4
***************
*** 9,15 ****
  #include <modsupport.h>
  
- // Must come after Python headers.
- #include <atlbase.h>
- 
  #include "PythonCOM.h"
  #include "PythonCOMServer.h"
--- 9,12 ----

Index: AXDebug.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/src/AXDebug.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AXDebug.cpp	7 Feb 2009 04:28:59 -0000	1.8
--- AXDebug.cpp	2 Mar 2009 06:10:40 -0000	1.9
***************
*** 161,165 ****
  static PyObject *GetThreadStateHandle(PyObject *self, PyObject *args)
  {
! 	_ASSERTE(sizeof(void *) <= sizeof(long)); // can we hack ptrs into longs?
  	// We _must_ have the thread-lock to be called!
  	PyThreadState *myState = PyThreadState_Swap(NULL);
--- 161,165 ----
  static PyObject *GetThreadStateHandle(PyObject *self, PyObject *args)
  {
! 	assert(sizeof(void *) <= sizeof(long)); // can we hack ptrs into longs?
  	// We _must_ have the thread-lock to be called!
  	PyThreadState *myState = PyThreadState_Swap(NULL);

Index: PyIActiveScriptDebug.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/src/PyIActiveScriptDebug.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PyIActiveScriptDebug.cpp	7 Feb 2009 04:28:59 -0000	1.2
--- PyIActiveScriptDebug.cpp	2 Mar 2009 06:10:40 -0000	1.3
***************
*** 37,49 ****
  	// @pyparm string|pstrDelimiter||See <om PyIActiveScriptParse::ParseScriptText> for a description of this argument.
  	// @pyparm int|dwFlags||See <om PyIActiveScriptParse::ParseScriptText> for a description of this argument.
- 	USES_CONVERSION;
- 	char *szpstrDelimiter;
  	DWORD dwFlags;
  	PyObject *obCode;
! 	if ( !PyArg_ParseTuple(args, "Osi:GetScriptTextAttributes", &obCode, &szpstrDelimiter, &dwFlags) )
  		return NULL;
  	BOOL bPythonIsHappy = TRUE;
! 	const OLECHAR *pstrDelimiter = A2COLE(szpstrDelimiter);
  	BSTR bstr;
  	if (!PyCom_BstrFromPyObject(obCode, &bstr)) bPythonIsHappy = FALSE;
  	if (!bPythonIsHappy) return NULL;
--- 37,49 ----
  	// @pyparm string|pstrDelimiter||See <om PyIActiveScriptParse::ParseScriptText> for a description of this argument.
  	// @pyparm int|dwFlags||See <om PyIActiveScriptParse::ParseScriptText> for a description of this argument.
  	DWORD dwFlags;
  	PyObject *obCode;
! 	PyObject *obDelim;
! 	if ( !PyArg_ParseTuple(args, "OOi:GetScriptTextAttributes", &obCode, &obDelim, &dwFlags) )
  		return NULL;
  	BOOL bPythonIsHappy = TRUE;
! 	WCHAR *pstrDelimiter;
  	BSTR bstr;
+ 	if (!PyWinObject_AsWCHAR(obDelim, &pstrDelimiter)) bPythonIsHappy = FALSE;
  	if (!PyCom_BstrFromPyObject(obCode, &bstr)) bPythonIsHappy = FALSE;
  	if (!bPythonIsHappy) return NULL;
***************
*** 54,57 ****
--- 54,58 ----
  	PY_INTERFACE_POSTCALL;
  	SysFreeString(bstr);
+ 	PyWinObject_FreeWCHAR(pstrDelimiter);
  	if ( FAILED(hr) ) {
  		delete [] pattr;
***************
*** 71,83 ****
  	// @pyparm string|pstrDelimiter||See <om PyIActiveScriptParse::ParseScriptText> for a description of this argument.
  	// @pyparm int|dwFlags||See <om PyIActiveScriptParse::ParseScriptText> for a description of this argument.
- 	USES_CONVERSION;
- 	char *szpstrDelimiter;
  	DWORD dwFlags;
! 	PyObject *obCode;
! 	if ( !PyArg_ParseTuple(args, "Osi:GetScriptletTextAttributes", &obCode, &szpstrDelimiter, &dwFlags) )
  		return NULL;
  	BOOL bPythonIsHappy = TRUE;
! 	const OLECHAR *pstrDelimiter = A2COLE(szpstrDelimiter);
  	BSTR bstr;
  	if (!PyCom_BstrFromPyObject(obCode, &bstr)) bPythonIsHappy = FALSE;
  	if (!bPythonIsHappy) return NULL;
--- 72,83 ----
  	// @pyparm string|pstrDelimiter||See <om PyIActiveScriptParse::ParseScriptText> for a description of this argument.
  	// @pyparm int|dwFlags||See <om PyIActiveScriptParse::ParseScriptText> for a description of this argument.
  	DWORD dwFlags;
! 	PyObject *obCode, *obDelim;
! 	if ( !PyArg_ParseTuple(args, "OOi:GetScriptletTextAttributes", &obCode, &obDelim, &dwFlags) )
  		return NULL;
  	BOOL bPythonIsHappy = TRUE;
! 	WCHAR *pstrDelimiter;
  	BSTR bstr;
+ 	if (!PyWinObject_AsWCHAR(obDelim, &pstrDelimiter)) bPythonIsHappy = FALSE;
  	if (!PyCom_BstrFromPyObject(obCode, &bstr)) bPythonIsHappy = FALSE;
  	if (!bPythonIsHappy) return NULL;
***************
*** 88,91 ****
--- 88,92 ----
  	PY_INTERFACE_POSTCALL;
  	SysFreeString(bstr);
+ 	PyWinObject_FreeWCHAR(pstrDelimiter);
  	if ( FAILED(hr) )
  		return SetPythonCOMError(self,hr);

[pywin32-checkins] pywin32/isapi threaded_extension.py,1.5,1.6

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/isapi
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8097

Modified Files:
	threaded_extension.py 
Log Message:
Fix worker shutdown timeout logic and set all threads deamonic

Index: threaded_extension.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/isapi/threaded_extension.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** threaded_extension.py	26 Nov 2008 08:39:33 -0000	1.5
--- threaded_extension.py	2 Mar 2009 04:41:10 -0000	1.6
***************
*** 3,6 ****
--- 3,7 ----
  
  import sys
+ import time
  from isapi import isapicon, ExtensionError
  import isapi.simple
***************
*** 32,35 ****
--- 33,39 ----
          self.extension = extension
          threading.Thread.__init__(self)
+         # We wait 15 seconds for a thread to terminate, but if it fails to,
+         # we don't want the process to hang at exit waiting for it...
+         self.setDaemon(True)
  
      def run(self):
***************
*** 58,62 ****
      "Base class for an ISAPI extension based around a thread-pool"
      max_workers = 20
!     worker_shutdown_wait = 15000 # 15 seconds for workers to quit. XXX - per thread!!! Fix me!
      def __init__(self):
          self.workers = []
--- 62,66 ----
      "Base class for an ISAPI extension based around a thread-pool"
      max_workers = 20
!     worker_shutdown_wait = 15000 # 15 seconds for workers to quit...
      def __init__(self):
          self.workers = []
***************
*** 93,98 ****
          for worker in self.workers:
              PostQueuedCompletionStatus(self.io_req_port, 0, ISAPI_SHUTDOWN, None)
!         for worker in self.workers:
!             worker.join(self.worker_shutdown_wait)
          self.dispatch_map = {} # break circles
          CloseHandle(self.io_req_port)
--- 97,110 ----
          for worker in self.workers:
              PostQueuedCompletionStatus(self.io_req_port, 0, ISAPI_SHUTDOWN, None)
!         # wait for them to terminate - pity we aren't using 'native' threads
!         # as then we could do a smart wait - but now we need to poll....
!         end_time = time.time() + self.worker_shutdown_wait/1000
!         alive = self.workers
!         while alive:
!             if time.time() > end_time:
!                 # xxx - might be nice to log something here.
!                 break
!             time.sleep(0.2)
!             alive = [w for w in alive if w.isAlive()]
          self.dispatch_map = {} # break circles
          CloseHandle(self.io_req_port)

[pywin32-checkins] pywin32/isapi/src PyExtensionObjects.cpp, 1.15, 1.16

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/isapi/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7588

Modified Files:
	PyExtensionObjects.cpp 
Log Message:
autoduck for the IOCompletion callback

Index: PyExtensionObjects.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/isapi/src/PyExtensionObjects.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** PyExtensionObjects.cpp	3 Feb 2009 00:51:42 -0000	1.15
--- PyExtensionObjects.cpp	2 Mar 2009 04:39:37 -0000	1.16
***************
*** 261,264 ****
--- 261,265 ----
  	{NULL}
  };
+ // @pymeth IOCallback|A placeholder for a user-supplied callback function.
  
  PyTypeObject PyECBType =
***************
*** 782,785 ****
--- 783,798 ----
  }
  
+ // *sob* - these autoduck comments should be closer to the actual callback impl,
+ // but autoduck makes life harder than it should be...
+ // @pymethod None|EXTENSION_CONTROL_BLOCK|IOCallback|A placeholder for a user-supplied callback function.
+ // @comm This is not a function you can call, it describes the signature of
+ // the callback function supplied to the <om EXTENSION_CONTROL_BLOCK.IOCompletion>
+ // function.
+ // @pyparm <o EXTENSION_CONTROL_BLOCK>|ecb||The extension control block that is associated with the current, active request.
+ // @pyparm object|arg||The user-supplied argument supplied to the <om EXTENSION_CONTROL_BLOCK.IOCompletion> function.
+ // @pyparm int|cbIO||An integer that contains the number of bytes of I/O in the last call.
+ // @pyparm int|dwError||The error code returned.
+ // @rdesc The result of this function is ignored.
+ 
  // @pymethod int|EXTENSION_CONTROL_BLOCK|IOCompletion|Set a callback that will be used for handling asynchronous I/O operations.
  // @comm If you call this multiple times, the previous callback will be discarded.
***************
*** 797,802 ****
  	PyObject *obArg = NULL;
  	if (!PyArg_ParseTuple(args, "O|O:IOCompletion",
! 	                      &obCallback, // @pyparm callable|func||The function to call.
! 	                      &obArg))
  		return NULL;
  
--- 810,815 ----
  	PyObject *obArg = NULL;
  	if (!PyArg_ParseTuple(args, "O|O:IOCompletion",
! 	                      &obCallback, // @pyparm callable|func||The function to call, as described by the <om EXTENSION_CONTROL_BLOCK.IOCallback> method.
! 	                      &obArg)) // @pyparm object|arg|None|Any object which will be supplied as an argument to the callback function.
  		return NULL;
  

[pywin32-checkins] pywin32/Pythonwin/pywin/framework app.py, 1.16, 1.17

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3501

Modified Files:
	app.py 
Log Message:
Fix GUI input() in Py3k

Index: app.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/app.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** app.py	24 Nov 2008 06:06:44 -0000	1.16
--- app.py	27 Feb 2009 03:34:58 -0000	1.17
***************
*** 381,385 ****
  	# must be py3k
  	import code
! 	code.InteractiveConsole.input=Win32Input
  
  def HaveGoodGUI():
--- 381,385 ----
  	# must be py3k
  	import code
! 	sys.modules['builtins'].input=Win32RawInput
  
  def HaveGoodGUI():

[pywin32-checkins] pywin32/win32/Lib win32serviceutil.py, 1.32, 1.33

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/Lib
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24102

Modified Files:
	win32serviceutil.py 
Log Message:
Exit with an error code when we fail to start the service.  Fixes [2613356] 


Index: win32serviceutil.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32serviceutil.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** win32serviceutil.py	19 Dec 2008 05:49:02 -0000	1.32
--- win32serviceutil.py	18 Feb 2009 21:31:49 -0000	1.33
***************
*** 575,578 ****
--- 575,579 ----
          except win32service.error, exc:
              print "Error starting service: %s" % exc.strerror
+             err = exc.winerror
  
      elif arg=="restart":

[pywin32-checkins] pywin32 setup.py,1.102,1.103

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29949

Modified Files:
	setup.py 
Log Message:
build 213

Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** setup.py	16 Feb 2009 04:49:48 -0000	1.102
--- setup.py	16 Feb 2009 12:10:49 -0000	1.103
***************
*** 1,3 ****
! build_id="212.7" # may optionally include a ".{patchno}" suffix.
  # Putting buildno at the top prevents automatic __doc__ assignment, and
  # I *want* the build number at the top :)
--- 1,3 ----
! build_id="213" # may optionally include a ".{patchno}" suffix.
  # Putting buildno at the top prevents automatic __doc__ assignment, and
  # I *want* the build number at the top :)

[pywin32-checkins] pywin32/Pythonwin/pywin/framework/editor ModuleBrowser.py, 1.9, 1.10

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25428/Pythonwin/pywin/framework/editor

Modified Files:
	ModuleBrowser.py 
Log Message:
Death to cmp (in py3k at least) - long live richcmp

Index: ModuleBrowser.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor/ModuleBrowser.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ModuleBrowser.py	23 Oct 2008 07:39:12 -0000	1.9
--- ModuleBrowser.py	16 Feb 2009 11:35:10 -0000	1.10
***************
*** 35,40 ****
          self.lineno = lineno
          self.suffix = suffix
!     def __cmp__(self, other):
!         return cmp(self.name, other.name)
      def GetText(self):
          return self.name + self.suffix
--- 35,42 ----
          self.lineno = lineno
          self.suffix = suffix
!     def __lt__(self, other):
!         return self.name < other.name
!     def __eq__(self, other):
!         return self.name == other.name
      def GetText(self):
          return self.name + self.suffix
***************
*** 64,74 ****
              self.super = []; self.methods = {}
          HierListCLBRItem.__init__(self, name, file, lineno, suffix)
-     def __cmp__(self,other):
-         ret = cmp(self.name,other.name)
-         if ret==0 and (self is not other) and self.file==other.file:
-             self.methods = other.methods
-             self.super = other.super
-             self.lineno = other.lineno
-         return ret
      def GetSubList(self):
          r1 = []
--- 66,69 ----

[pywin32-checkins] pywin32/com/win32comext/shell/demos/servers shell_view.py, 1.14, 1.15

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/servers
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25428/com/win32comext/shell/demos/servers

Modified Files:
	shell_view.py 
Log Message:
Death to cmp (in py3k at least) - long live richcmp

Index: shell_view.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/servers/shell_view.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** shell_view.py	27 Nov 2008 09:33:22 -0000	1.14
--- shell_view.py	16 Feb 2009 11:35:10 -0000	1.15
***************
*** 148,152 ****
      # Interface methods
      def CompareIDs(self, param, id1, id2):
!         return cmp(id1, id2)
      def GetUIObjectOf(self, hwndOwner, pidls, iid, inout):
          # delegate to the shell.
--- 148,156 ----
      # Interface methods
      def CompareIDs(self, param, id1, id2):
!         if id1 < id2:
!             return -1
!         if id1 == id2:
!             return 0
!         return 1
      def GetUIObjectOf(self, hwndOwner, pidls, iid, inout):
          # delegate to the shell.

[pywin32-checkins] pywin32 setup.py,1.103,1.104

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3881

Modified Files:
	setup.py 
Log Message:
build number now 213.1

Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** setup.py	16 Feb 2009 12:10:49 -0000	1.103
--- setup.py	16 Feb 2009 13:05:56 -0000	1.104
***************
*** 1,3 ****
! build_id="213" # may optionally include a ".{patchno}" suffix.
  # Putting buildno at the top prevents automatic __doc__ assignment, and
  # I *want* the build number at the top :)
--- 1,3 ----
! build_id="213.1" # may optionally include a ".{patchno}" suffix.
  # Putting buildno at the top prevents automatic __doc__ assignment, and
  # I *want* the build number at the top :)

[pywin32-checkins] pywin32/Pythonwin/pywin/tools regedit.py, 1.3, 1.4

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25065/Pythonwin/pywin/tools

Modified Files:
	regedit.py 
Log Message:
use integer division and fix rich comparisons

Index: regedit.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools/regedit.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** regedit.py	2 Oct 2008 13:03:55 -0000	1.3
--- regedit.py	16 Feb 2009 11:32:55 -0000	1.4
***************
*** 26,31 ****
  		frame_rect = self.GetWindowRect()
  		size = ((frame_rect[2] - frame_rect[0]),
! 		        (frame_rect[3] - frame_rect[1])/2)
! 		sub_size = (size[0]/3, size[1])
  		splitter.CreateStatic (self, 1, 2)
  		# CTreeControl view
--- 26,31 ----
  		frame_rect = self.GetWindowRect()
  		size = ((frame_rect[2] - frame_rect[0]),
! 		        (frame_rect[3] - frame_rect[1])//2)
! 		sub_size = (size[0]//3, size[1])
  		splitter.CreateStatic (self, 1, 2)
  		# CTreeControl view
***************
*** 283,293 ****
  		self.userName = userName
  		hierlist.HierListItem.__init__(self)
! 	def __cmp__(self, other):
! 		rc = cmp(self.keyRoot, other.keyRoot)
! 		if rc==0:
! 			rc = cmp(self.keyName, other.keyName)
! 		if rc==0:
! 			rc = cmp(self.userName, other.userName)
! 		return rc
  	def __repr__(self):
  		return "<%s with root=%s, key=%s>" % (self.__class__.__name__, self.keyRoot, self.keyName)
--- 283,292 ----
  		self.userName = userName
  		hierlist.HierListItem.__init__(self)
! 	def __lt__(self, other):
! 		return self.name < other.name
! 	def __eq__(self, other):
! 		return self.keyRoot==other.keyRoot and \
! 		       self.keyName == other.keyName and \
! 		       self.userName == other.userName
  	def __repr__(self):
  		return "<%s with root=%s, key=%s>" % (self.__class__.__name__, self.keyRoot, self.keyName)

[pywin32-checkins] pywin32/Pythonwin/pywin/tools browseProjects.py, 1.6, 1.7 browser.py, 1.16, 1.17 hierlist.py, 1.12, 1.13

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25428/Pythonwin/pywin/tools

Modified Files:
	browseProjects.py browser.py hierlist.py 
Log Message:
Death to cmp (in py3k at least) - long live richcmp

Index: hierlist.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools/hierlist.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** hierlist.py	14 Jan 2009 12:10:06 -0000	1.12
--- hierlist.py	16 Feb 2009 11:35:10 -0000	1.13
***************
*** 314,331 ****
  		return None	# same as other
  	# for py3k/rich-comp sorting compatibility.
- 	def __cmp__(self, other):
- 		# this is always overridden, but to be sure...
- 		return cmp(id(self), id(other))
  	def __lt__(self, other):
! 		try:
! 			return self.__cmp__(other) < 0
! 		except TypeError:
! 			# we want unrelated items to be sortable...
! 			return id(self) < id(other)
  	# for py3k/rich-comp equality compatibility.
  	def __eq__(self, other):
! 		try:
! 			return self.__cmp__(other) == 0
! 		except TypeError:
! 			# unrelated items compare false
! 			return 0
--- 314,321 ----
  		return None	# same as other
  	# for py3k/rich-comp sorting compatibility.
  	def __lt__(self, other):
! 		# we want unrelated items to be sortable...
! 		return id(self) < id(other)
  	# for py3k/rich-comp equality compatibility.
  	def __eq__(self, other):
! 		return False

Index: browser.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools/browser.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** browser.py	25 Jan 2009 03:08:42 -0000	1.16
--- browser.py	16 Feb 2009 11:35:10 -0000	1.17
***************
*** 36,44 ****
  				except (AttributeError, TypeError):
  					self.name="???"
! 	def __cmp__(self, other):
! 		rc = cmp(self.name, other.name)
! 		if rc==0:
! 			rc = cmp(self.myobject, other.myobject)
! 		return rc
  	def __repr__(self):
  		try:
--- 36,43 ----
  				except (AttributeError, TypeError):
  					self.name="???"
! 	def __lt__(self, other):
! 		return self.name < other.name
! 	def __eq__(self, other):
! 		return self.name == other.name
  	def __repr__(self):
  		try:

Index: browseProjects.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools/browseProjects.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** browseProjects.py	5 Jan 2009 10:56:10 -0000	1.6
--- browseProjects.py	16 Feb 2009 11:35:10 -0000	1.7
***************
*** 25,30 ****
  		self.lineno = lineno
  		self.suffix = suffix
! 	def __cmp__(self, other):
! 		return cmp(self.name, other.name)
  	def GetText(self):
  		return self.name + self.suffix
--- 25,32 ----
  		self.lineno = lineno
  		self.suffix = suffix
! 	def __lt__(self, other):
! 		return self.name < other.name
! 	def __eq__(self, other):
! 		return self.name == other.name
  	def GetText(self):
  		return self.name + self.suffix

[pywin32-checkins] pywin32/com/win32com/client selecttlb.py, 1.12, 1.13

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32com/client
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25428/com/win32com/client

Modified Files:
	selecttlb.py 
Log Message:
Death to cmp (in py3k at least) - long live richcmp

Index: selecttlb.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/selecttlb.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** selecttlb.py	7 Jan 2009 04:09:32 -0000	1.12
--- selecttlb.py	16 Feb 2009 11:35:10 -0000	1.13
***************
*** 23,37 ****
  			return self.ver_desc
  		raise IndexError("Cant index me!")
! 	def __cmp__(self, other):
! 		rc = cmp((self.ver_desc or "").lower(), (other.ver_desc or "").lower())
! 		if rc==0:
! 			rc = cmp(self.desc.lower(), other.desc.lower())
! 		if rc==0:
! 			rc = cmp(self.major, other.major)
! 		if rc==0:
! 			rc = cmp(self.major, other.minor)
! 		return rc
  	def __lt__(self, other): # rich-cmp/py3k-friendly version
! 		return self.__cmp__(other) < 0
  
  	def Resolve(self):
--- 23,37 ----
  			return self.ver_desc
  		raise IndexError("Cant index me!")
! 
  	def __lt__(self, other): # rich-cmp/py3k-friendly version
! 		me = (self.ver_desc or "").lower(), (self.desc or "").lower(), self.major, self.minor
! 		them = (other.ver_desc or "").lower(), (other.desc or "").lower(), other.major, other.minor
! 		return me < them
! 
! 	def __eq__(self, other): # rich-cmp/py3k-friendly version
! 		return ((self.ver_desc or "").lower() == (other.ver_desc or "").lower() and
! 			(self.desc or "").lower() == (other.desc or "").lower() and
! 			self.major == other.major and
! 			self.minor == other.minor)
  
  	def Resolve(self):

[pywin32-checkins] pywin32 pywin32_postinstall.py,1.31,1.32

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22072

Modified Files:
	pywin32_postinstall.py 
Log Message:
record the new dbi.pyd.old file we created so it uninstalls

Index: pywin32_postinstall.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/pywin32_postinstall.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** pywin32_postinstall.py	27 Jan 2009 06:25:02 -0000	1.31
--- pywin32_postinstall.py	16 Feb 2009 06:32:20 -0000	1.32
***************
*** 278,281 ****
--- 278,282 ----
                      os.rename(this_pyd, this_dest)
                      print "renamed '%s'->'%s.old'" % (this_pyd, this_pyd)
+                     file_created(this_pyd+".old")
              except os.error, exc:
                  print "FAILED to rename '%s': %s" % (this_pyd, exc)

[pywin32-checkins] pywin32/win32/Lib pywin32_testutil.py,1.2,1.3

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/Lib
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21125/win32/Lib

Modified Files:
	pywin32_testutil.py 
Log Message:
Fix is_admin() and more verbose reporting of skipped tests

Index: pywin32_testutil.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/pywin32_testutil.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pywin32_testutil.py	25 Jan 2009 03:12:18 -0000	1.2
--- pywin32_testutil.py	16 Feb 2009 06:27:22 -0000	1.3
***************
*** 177,183 ****
      if _is_admin is None:
          from win32com.shell.shell import IsUserAnAdmin
          try:
              _is_admin = IsUserAnAdmin()
!         except NotImplementedError:
              # not impl on this platform - must be old - assume is admin
              _is_admin = True
--- 177,186 ----
      if _is_admin is None:
          from win32com.shell.shell import IsUserAnAdmin
+         import pythoncom
          try:
              _is_admin = IsUserAnAdmin()
!         except pythoncom.com_error, exc:
!             if exc.hresult != winerror.E_NOTIMPL:
!                 raise
              # not impl on this platform - must be old - assume is admin
              _is_admin = True
***************
*** 195,199 ****
      def __init__(self, *args, **kw):
          super(TestResult, self).__init__(*args, **kw)
!         self.num_skipped = 0
  
      def addError(self, test, err):
--- 198,202 ----
      def __init__(self, *args, **kw):
          super(TestResult, self).__init__(*args, **kw)
!         self.skips = {} # count of skips for each reason.
  
      def addError(self, test, err):
***************
*** 222,228 ****
  
          if isinstance(exc_val, TestSkipped):
!             self.num_skipped += 1
              if self.showAll:
!                 self.stream.writeln("SKIP")
              elif self.dots:
                  self.stream.write('S')
--- 225,238 ----
  
          if isinstance(exc_val, TestSkipped):
!             reason = exc_val.args[0]
!             # if the reason itself is another exception, get its args.
!             try:
!                 reason = tuple(reason.args)
!             except (AttributeError, TypeError):
!                 pass
!             self.skips.setdefault(reason, 0)
!             self.skips[reason] += 1
              if self.showAll:
!                 self.stream.writeln("SKIP (%s)" % (reason,))
              elif self.dots:
                  self.stream.write('S')
***************
*** 233,238 ****
      def printErrors(self):
          super(TestResult, self).printErrors()
!         if self.num_skipped:
!             self.stream.writeln("SKIPPED: %d tests" % self.num_skipped)
  
  # TestRunner subclass necessary just to get our TestResult hooked up.
--- 243,248 ----
      def printErrors(self):
          super(TestResult, self).printErrors()
!         for reason, num_skipped in self.skips.iteritems():
!             self.stream.writeln("SKIPPED: %d tests - %s" % (num_skipped, reason))
  
  # TestRunner subclass necessary just to get our TestResult hooked up.

[pywin32-checkins] pywin32 MANIFEST.in,1.15,1.16

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15798

Modified Files:
	MANIFEST.in 
Log Message:
add more test files to the source archive

Index: MANIFEST.in
===================================================================
RCS file: /cvsroot/pywin32/pywin32/MANIFEST.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** MANIFEST.in	14 Feb 2009 23:04:55 -0000	1.15
--- MANIFEST.in	16 Feb 2009 05:36:04 -0000	1.16
***************
*** 14,20 ****
--- 14,25 ----
  include win32/scripts/*.py
  include win32/test/*.py
+ include win32/test/win32rcparser/test.rc
+ include win32/test/win32rcparser/test.h
+ include win32/test/win32rcparser/python.ico
+ include win32/test/win32rcparser/python.bmp
  include win32/Demos/*.py
  include win32/Demos/security/*.py
  include win32/Demos/security/sspi/*.py
+ include win32/Demos/images/*.bmp
  include win32/src/*.h
  include win32/src/*.manifest

[pywin32-checkins] pywin32/win32/test test_win32api.py,1.17,1.18

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/test
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15729/win32/test

Modified Files:
	test_win32api.py 
Log Message:
do case-insensitve comparisons of filenames

Index: test_win32api.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/test/test_win32api.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** test_win32api.py	26 Jan 2009 00:47:31 -0000	1.17
--- test_win32api.py	16 Feb 2009 05:35:23 -0000	1.18
***************
*** 111,121 ****
          except NameError:
              me = sys.argv[0]
!         fname = os.path.abspath(me)
!         short_name = win32api.GetShortPathName(fname)
!         long_name = win32api.GetLongPathName(short_name)
          self.failUnless(long_name==fname, \
                          "Expected long name ('%s') to be original name ('%s')" % (long_name, fname))
!         self.failUnlessEqual(long_name, win32api.GetLongPathNameW(short_name))
!         long_name = win32api.GetLongPathNameW(short_name)
          self.failUnless(type(long_name)==unicode, "GetLongPathNameW returned type '%s'" % (type(long_name),))
          self.failUnless(long_name==fname, \
--- 111,121 ----
          except NameError:
              me = sys.argv[0]
!         fname = os.path.abspath(me).lower()
!         short_name = win32api.GetShortPathName(fname).lower()
!         long_name = win32api.GetLongPathName(short_name).lower()
          self.failUnless(long_name==fname, \
                          "Expected long name ('%s') to be original name ('%s')" % (long_name, fname))
!         self.failUnlessEqual(long_name, win32api.GetLongPathNameW(short_name).lower())
!         long_name = win32api.GetLongPathNameW(short_name).lower()
          self.failUnless(type(long_name)==unicode, "GetLongPathNameW returned type '%s'" % (type(long_name),))
          self.failUnless(long_name==fname, \
***************
*** 127,139 ****
          except NameError:
              me = sys.argv[0]
!         fname = os.path.abspath(me)
          # passing unicode should cause GetShortPathNameW to be called.
!         short_name = win32api.GetShortPathName(unicode(fname))
          self.failUnless(isinstance(short_name, unicode))
!         long_name = win32api.GetLongPathName(short_name)
          self.failUnless(long_name==fname, \
                          "Expected long name ('%s') to be original name ('%s')" % (long_name, fname))
!         self.failUnlessEqual(long_name, win32api.GetLongPathNameW(short_name))
!         long_name = win32api.GetLongPathNameW(short_name)
          self.failUnless(type(long_name)==unicode, "GetLongPathNameW returned type '%s'" % (type(long_name),))
          self.failUnless(long_name==fname, \
--- 127,139 ----
          except NameError:
              me = sys.argv[0]
!         fname = os.path.abspath(me).lower()
          # passing unicode should cause GetShortPathNameW to be called.
!         short_name = win32api.GetShortPathName(unicode(fname)).lower()
          self.failUnless(isinstance(short_name, unicode))
!         long_name = win32api.GetLongPathName(short_name).lower()
          self.failUnless(long_name==fname, \
                          "Expected long name ('%s') to be original name ('%s')" % (long_name, fname))
!         self.failUnlessEqual(long_name, win32api.GetLongPathNameW(short_name).lower())
!         long_name = win32api.GetLongPathNameW(short_name).lower()
          self.failUnless(type(long_name)==unicode, "GetLongPathNameW returned type '%s'" % (type(long_name),))
          self.failUnless(long_name==fname, \

[pywin32-checkins] pywin32/win32/src win32rasmodule.cpp,1.16,1.17

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10991/win32/src

Modified Files:
	win32rasmodule.cpp 
Log Message:
* ensure win32ras builds with WINVER set to 0x0500 so it works on win2k.
* Install few extra test data files


Index: win32rasmodule.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32rasmodule.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** win32rasmodule.cpp	27 Jan 2009 06:27:09 -0000	1.16
--- win32rasmodule.cpp	16 Feb 2009 04:49:49 -0000	1.17
***************
*** 13,18 ****
  
  #ifndef WINVER
! // hrm - the RASEAPUSERIDENTITY structures on the Vista SDK now want
! #define WINVER 0x501
  #endif
  
--- 13,17 ----
  
  #ifndef WINVER
! #define WINVER 0x500
  #endif