pywin32-checkins — CVS checkin notices

[pywin32-checkins] /hgrepo/p/py/pywin32/pywin32: py3k branch landed pre mercurial m...

[<pyw...@li...>]

changeset 6c001d583473 in /hgrepo/p/py/pywin32/pywin32
details: http://pywin32.hg.sourceforge.net/hgweb/pywin32/pywin32/hgrepo/p/py/pywin32/pywin32?cmd=changeset;node=6c001d583473
summary: py3k branch landed pre mercurial migration

[pywin32-checkins] /hgrepo/p/py/pywin32/pywin32: get ISAPI building on python 3.3 (...

[<pyw...@li...>]

changeset e4fd5f1a855c in /hgrepo/p/py/pywin32/pywin32
details: http://pywin32.hg.sourceforge.net/hgweb/pywin32/pywin32/hgrepo/p/py/pywin32/pywin32?cmd=changeset;node=e4fd5f1a855c
summary: get ISAPI building on python 3.3 (bug 3260092)

diffstat:

 isapi/src/Utils.cpp |  9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diffs (20 lines):

diff -r ff9086ad5e86 -r e4fd5f1a855c isapi/src/Utils.cpp
--- a/isapi/src/Utils.cpp	Sat Mar 19 15:23:54 2011 +1100
+++ b/isapi/src/Utils.cpp	Thu Mar 31 12:13:43 2011 +1100
@@ -38,7 +38,16 @@
 #if (PY_VERSION_HEX >= 0x03000000)
 	// py3k - check for unicode object and use default encoding.
 	if (PyUnicode_Check(ob)) {
+		// NOTE: we are using an internal API and it may go away later.
+		// The implementation in py3k is simply "encode as utf-8" - but using
+		// this makes our life a little simpler (the value is cached and we
+		// don't need to manage reference counts) so we stick with it.
+		// Sadly this changed in 3.3 though...
+#if (PY_VERSION_HEX >= 0x03030000)
+		ob = _PyUnicode_AsDefaultEncodedString(ob);
+#else
 		ob = _PyUnicode_AsDefaultEncodedString(ob, NULL);
+#endif
 		if (ob == NULL)
 			return NULL;
 	}

[pywin32-checkins] /hgrepo/p/py/pywin32/pywin32: oops - remove stray print

[<pyw...@li...>]

changeset ff9086ad5e86 in /hgrepo/p/py/pywin32/pywin32
details: http://pywin32.hg.sourceforge.net/hgweb/pywin32/pywin32/hgrepo/p/py/pywin32/pywin32?cmd=changeset;node=ff9086ad5e86
summary: oops - remove stray print

diffstat:

 setup.py |  1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diffs (11 lines):

diff -r 3becde564ef5 -r ff9086ad5e86 setup.py
--- a/setup.py	Sat Mar 19 15:20:09 2011 +1100
+++ b/setup.py	Sat Mar 19 15:23:54 2011 +1100
@@ -629,7 +629,6 @@
             self.force = True
 
         def run(self):
-            print "RUNNING", self.force
             self.updated_files = []
     
             # Base class code

[pywin32-checkins] /hgrepo/p/py/pywin32/pywin32: more fine-grained control over 3.x...

[<pyw...@li...>]

changeset 3becde564ef5 in /hgrepo/p/py/pywin32/pywin32
details: http://pywin32.hg.sourceforge.net/hgweb/pywin32/pywin32/hgrepo/p/py/pywin32/pywin32?cmd=changeset;node=3becde564ef5
summary: more fine-grained control over 3.x 'force' workaround and fix raw strings

diffstat:

 setup.cfg |  5 -----
 setup.py  |  9 ++++++++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (36 lines):

diff -r 159d252707cd -r 3becde564ef5 setup.cfg
--- a/setup.cfg	Mon Mar 14 10:32:03 2011 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-[build]
-force=1
-[bdist_wininst]
-user_access_control=auto
-
diff -r 159d252707cd -r 3becde564ef5 setup.py
--- a/setup.py	Mon Mar 14 10:32:03 2011 -0400
+++ b/setup.py	Sat Mar 19 15:20:09 2011 +1100
@@ -622,7 +622,14 @@
 if do_2to3:
     # Force 2to3 to be run for py3k versions.
     class my_build_py(build_py):
+        def finalize_options(self):
+            build_py.finalize_options(self)
+            # must force as the 2to3 conversion happens in place so an
+            # interrupted build can cause py2 syntax files in a py3k build.
+            self.force = True
+
         def run(self):
+            print "RUNNING", self.force
             self.updated_files = []
     
             # Base class code
@@ -1765,7 +1772,7 @@
                         %(win32com)s/extensions/PyIType.cpp                 %(win32com)s/extensions/PyITypeObjects.cpp
                         %(win32com)s/extensions/PyTYPEATTR.cpp              %(win32com)s/extensions/PyVARDESC.cpp
                         """ % dirs).split(),
-                   depends=("""
+                   depends=(r"""
                         %(win32com)s/include\propbag.h          %(win32com)s/include\PyComTypeObjects.h
                         %(win32com)s/include\PyFactory.h        %(win32com)s/include\PyGConnectionPoint.h
                         %(win32com)s/include\PyGConnectionPointContainer.h

[pywin32-checkins] /hgrepo/p/py/pywin32/pywin32: Fix autoduck for SCROLLINFO

[<pyw...@li...>]

changeset 159d252707cd in /hgrepo/p/py/pywin32/pywin32
details: http://pywin32.hg.sourceforge.net/hgweb/pywin32/pywin32/hgrepo/p/py/pywin32/pywin32?cmd=changeset;node=159d252707cd
summary: Fix autoduck for SCROLLINFO

diffstat:

 Pythonwin/win32win.cpp |  22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diffs (50 lines):

diff -r a5946f228466 -r 159d252707cd Pythonwin/win32win.cpp
--- a/Pythonwin/win32win.cpp	Sun Mar 13 15:15:12 2011 +1100
+++ b/Pythonwin/win32win.cpp	Mon Mar 14 10:32:03 2011 -0400
@@ -158,20 +158,19 @@
 	return (CMDIFrameWnd *)PyCWnd::GetPythonGenericWnd(self, &PyCMDIFrameWnd::type);
 }
 
-// @pymethod |PyCWnd|SCROLLINFO tuple|Describes a SCROLLINFO tuple
-// @pyparm int|addnMask||Additional mask information.  Python automatically fills the mask for valid items, so currently the only valid values are zero, and win32con.SIF_DISABLENOSCROLL.
-// @pyparm int|min||The minimum scrolling position.  Both min and max, or neither, must be provided.
-// @pyparm int|max||The maximum scrolling position.  Both min and max, or neither, must be provided.
-// @pyparm int|page||Specifies the page size. A scroll bar uses this value to determine the appropriate size of the proportional scroll box.
-// @pyparm int|pos||Specifies the position of the scroll box.
-// @pyparm int|trackPos||Specifies the immediate position of a scroll box that the user 
+// @object SCROLLINFO tuple|Tuple representing a SCROLLINFO struct
+// @tupleitem 0|int|addnMask|Additional mask information.  Python automatically fills the mask for valid items, so currently the only valid values are zero, and win32con.SIF_DISABLENOSCROLL.
+// @tupleitem 1|int|min|The minimum scrolling position.  Both min and max, or neither, must be provided.
+// @tupleitem 2|int|max|The maximum scrolling position.  Both min and max, or neither, must be provided.
+// @tupleitem 3|int|page|Specifies the page size. A scroll bar uses this value to determine the appropriate size of the proportional scroll box.
+// @tupleitem 4|int|pos|Specifies the position of the scroll box.
+// @tupleitem 5|int|trackPos|Specifies the immediate position of a scroll box that the user 
 // is dragging. An application can retrieve this value while processing 
 // the SB_THUMBTRACK notification message. An application cannot set 
 // the immediate scroll position; the <om PyCWnd.SetScrollInfo> function ignores 
 // this member.
-// @comm When passed to Python, will always be a tuple of size 6, and items may be None if not available.
-// @comm When passed from Python, it must have the addn mask attribute, but all other items may be None, or not exist.
-// <nl>userob is any Python object at all, but no reference count is kept, so you must ensure the object remains referenced throught the lists life.
+// @comm When returned from a method, will always be a tuple of size 6, and items may be None if not available.
+// @comm When passed as an arg, it must have the addn mask attribute, but all other items may be None, or not exist.
 BOOL ParseSCROLLINFOTuple( PyObject *args, SCROLLINFO *pInfo)
 {
 	PyObject *ob;
@@ -1336,7 +1335,7 @@
 	return PyWinLong_FromHANDLE(hwnd);
 }
 
-// @pymethod int|PyCWnd|GetScrollInfo|Returns information about a scroll bar
+// @pymethod <o SCROLLINFO tuple>|PyCWnd|GetScrollInfo|Returns information about a scroll bar
 static PyObject *
 ui_window_get_scroll_info (PyObject *self, PyObject *args)
 {
@@ -2138,6 +2137,7 @@
 	BOOL bRedraw = TRUE;
 	PyObject *obInfo;
 	// @pyparm int|nBar||The scroll bar to examine.  Can be one of win32con.SB_BOTH, win32con.SB_VERT or win32con.SB_HORZ
+	// @pyparm <o SCROLLINFO tuple>|ScrollInfo||The information to set
 	// @pyparm int|redraw|1|A flag indicating if the scrollbar should be re-drawn.
 	if (!PyArg_ParseTuple(args, "iO|i:SetScrollInfo", &nBar, &obInfo, &bRedraw))
 		return NULL;

[pywin32-checkins] /hgrepo/p/py/pywin32/pywin32: turns out pywin32.pth is needed af...

[<pyw...@li...>]

changeset a5946f228466 in /hgrepo/p/py/pywin32/pywin32
details: http://pywin32.hg.sourceforge.net/hgweb/pywin32/pywin32/hgrepo/p/py/pywin32/pywin32?cmd=changeset;node=a5946f228466
summary: turns out pywin32.pth is needed after all :)

diffstat:

 pywin32.pth |  4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r 58b1345cbe40 -r a5946f228466 pywin32.pth
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pywin32.pth	Sun Mar 13 15:15:12 2011 +1100
@@ -0,0 +1,4 @@
+# .pth file for the PyWin32 extensions
+win32
+win32\lib
+Pythonwin

Re: [pywin32-checkins] [python-win32] Conversion to Mercurial is done

[Vernon C. <ver...@gm...>]

Working fine here.  Here's a sample for anyone who has not tried sourceforge
hg before.
I have PuTTY loaded on this machine, and already have my ssh keys set up on
sourceforge -- just like with CVS.
Mercurial is loaded using the binary installer.
And, I actually remembered to load my sourceforge keys into Pagent before I
started. ;-)

In order to get read/write access, I used the ssh:// url as documented on
the page Mark referenced.
https://sourceforge.net/scm/?type=hg&group_id=78018

If your are reading a rich text (html) version of this, my input below
is highlighted
in yellow.
Don't copy this exactly, you will need to use your own username where I have
"kf7xm".
I keep my mercurial trees in a C:\hg folder. YMMV

I had the usual "The server's host key is not cached in the registry"
problem.
Solved by running a quick plink command to the server in question:

<screen dump>
C:\hg>plink kf...@py... ls
The server's host key is not cached in the registry. You
have no guarantee that the server is the computer you
think it is.
The server's rsa2 key fingerprint is:
ssh-rsa 2048 86:7b:1b:12:85:35:8a:b7:98:b6:d2:97:5e:96:58:1d
If you trust this host, enter "y" to add the key to
PuTTY's cache and carry on connecting.
If you want to carry on connecting just once, without
adding the key to the cache, enter "n".
If you do not trust this host, press Return to abandon the
connection.
Store key in cache? (y/n) y

Welcome to *.hg.sourceforge.net
<snip>
C:\hg>hg clone ssh://kf...@py.../hgroot/pywin32/pywin32
destination directory: pywin32
requesting all changes
adding changesets
adding manifests
adding file changes
added 4100 changesets with 9863 changes to 1831 files (+1 heads)
updating to branch default
1545 files updated, 0 files merged, 0 files removed, 0 files unresolved
<snip>
C:\hg>cd pywin32
C:\hg>dir
</screen dump>
--
Vernon

On Sat, Mar 5, 2011 at 11:05 PM, Mark Hammond <mha...@sk...>
wrote:
> I've converted the CVS repository to a Mercurial (hg) and after a few
tweaks [...]

Re: [pywin32-checkins] /hgrepo/p/py/pywin32/pywin32: trivial typo

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

On 6/03/2011 5:21 PM, pyw...@li... wrote:

 > <some garbage>

hrm - not sure what happened there, but I've removed the custom 
"template" for messages which should mean the default is used - we'll 
see what happens next checkin :)

Cheers,

Mark

[pywin32-checkins] /hgrepo/p/py/pywin32/pywin32: trivial typo

[<pyw...@li...>]

details:   http://pywin32.hg.sourceforge.net/hgweb/pywin32/pywin32/hgrepo/p/py/pywin32/pywin32/rev/58b1345cbe40
changeset: 4099:58b1345cbe40
user:      Mark Hammond <mha...@sk...>
date:       Sun Mar 06 17:20:32 2011 +1100
description:
trivial typo

diffstat:

 CHANGES.txt |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r e3e23407aba6 -r 58b1345cbe40 CHANGES.txt
--- a/CHANGES.txt	Sun Mar 06 17:18:04 2011 +1100
+++ b/CHANGES.txt	Sun Mar 06 17:20:32 2011 +1100
@@ -7,7 +7,7 @@
 Since build 216:
 ----------------
 
-* Source-code management move from CVS to Mercurual.
+* Source-code management moved from CVS to Mercurual.
 
 Since build 215:
 ----------------

[pywin32-checkins] Conversion to Mercurial is done

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

I've converted the CVS repository to a Mercurial (hg) and after a few 
tweaks and re-conversions, it seems to have done a good job.  It is 
purely a coincidence that this finally happened on the same week Python 
itself flicked the Mercurial switch :).

I'd like to encourage everyone with an interest in this to grab a clone 
and have a play - note that you can make a clone, make some local test 
commits, then throw the clone away without pushing back to sourceforge.

Some notes:

* People not familiar with hg should read the hg book at 
http://hgbook.red-bean.com/ and any other tutorials they can find.  The 
model is significantly different to CVS and SVN (but somewhat similar to 
Bazaar and Git)

* The hg repo is at sourceforge and all developers who had CVS access 
should have mercurial "push" access.  You can browse the repo via the 
normal sourceforge web interface.  The pywin32 sourceforge page with the 
configuration information is at 
https://sourceforge.net/scm/?type=hg&group_id=78018

* I've disabled access to CVS for all developers - the CVS repo still 
exists and can be re-enabled should some serious issue be found, but 
eventually it will be removed completely from the project (and probably 
make the raw repo available for download via sourceforge)

* I'm still battling the hg hook for sending emails as changes are 
pushed, but think I have that working.  I'll make a trivial commit in 
the next few minutes to test that out, but note that in the worst case, 
commit email may not appear for a day or few.

* You should enable the "eol" extension for Mercurial to ensure you get 
Windows line endings.  Eventually I hope to have a hg server-side hook 
to reject changes which screw up the line-endings, but I've failed to 
make that happen so far.  Note that support for Windows line-endings is 
a recent mercurial feature and may have rough edges.  Before committing 
to your local repo, please check that 'hg diff' isn't marking a change 
in every line in one of the changed files - it is does, please hold off 
the commit and contact me.

* I can recommend the "Tortoise HG" tool for Windows - it allows you to 
disable the "shell extensions", but you still wind up with normal 
command-line hg plus a nice GUI tool you can invoke if desired.

* Sourceforge hg seems a little slow, especially fetching the full repo. 
  Fetching incremental updates should be better, but if there are 
performance issues related to sourceforge, we can look at hosting the 
master repo elsewhere.

* Although it should not be necessary, I reserve the right to nuke the 
hg repo and start again with the CVS conversion.  This will only be done 
over the next week or 2, and only if someone notices a significant 
problem in the conversion and I would need to "back-port" any hg changes 
into CVS.  If this did happen, you would be unable to update any 
existing clones you made - you would have to start again into a clean 
local tree.

Please let me know how you go!

Thanks,

Mark

[pywin32-checkins] pywin32 setup.cfg,NONE,1.1

[Vernon C. <kf...@us...>]

Update of /cvsroot/pywin32/pywin32
In directory vz-cvs-2.sog:/tmp/cvs-serv27692

Added Files:
	setup.cfg 
Log Message:
add setup.cfg to automatically clear build folder

--- NEW FILE: setup.cfg ---
[build]
force=1
[bdist_wininst]
user_access_control=auto

[pywin32-checkins] pywin32 pywin32.pth,1.1,NONE

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

Update of /cvsroot/pywin32/pywin32
In directory vz-cvs-2.sog:/tmp/cvs-serv5677

Removed Files:
	pywin32.pth 
Log Message:
remove unused and unnecessary .pth file

--- pywin32.pth DELETED ---

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

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

Update of /cvsroot/pywin32/pywin32
In directory vz-cvs-2.sog:/tmp/cvs-serv31853

Removed Files:
	Python and Extensions.dsw 
Log Message:
remove unused top-level visual studio workspace

--- Python and Extensions.dsw DELETED ---

[pywin32-checkins] pywin32/wince/dist FileList.txt, 1.1, NONE UpdateCEInf.py, 1.1, NONE pythonce.inf, 1.1, NONE pythonce.ini, 1.1, NONE

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

Update of /cvsroot/pywin32/pywin32/wince/dist
In directory vz-cvs-2.sog:/tmp/cvs-serv30447/wince/dist

Removed Files:
	FileList.txt UpdateCEInf.py pythonce.inf pythonce.ini 
Log Message:
remove long-rotted wince port

--- FileList.txt DELETED ---

--- pythonce.inf DELETED ---

--- UpdateCEInf.py DELETED ---

--- pythonce.ini DELETED ---

[pywin32-checkins] pywin32/wince .cvsignore, 1.1, NONE win32db.dsp, 1.1, NONE win32ras.dsp, 1.1, NONE win32reg.dsp, 1.1, NONE win32sh.dsp, 1.1, NONE win32sys.dsp, 1.1, NONE

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

Update of /cvsroot/pywin32/pywin32/wince
In directory vz-cvs-2.sog:/tmp/cvs-serv30447/wince

Removed Files:
	.cvsignore win32db.dsp win32ras.dsp win32reg.dsp win32sh.dsp 
	win32sys.dsp 
Log Message:
remove long-rotted wince port

--- .cvsignore DELETED ---

--- win32sys.dsp DELETED ---

--- win32db.dsp DELETED ---

--- win32sh.dsp DELETED ---

--- win32ras.dsp DELETED ---

--- win32reg.dsp DELETED ---

[pywin32-checkins] pywin32/com Active Scripting.dsp, 1.8, NONE _com projects.dsp, 1.4, NONE adsi.dsp, 1.6, NONE directsound.dsp, 1.2, NONE ifilter.dsp, 1.1, NONE internet.dsp, 1.8, NONE win32com.dsp, 1.28, NONE

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

Update of /cvsroot/pywin32/pywin32/com
In directory vz-cvs-2.sog:/tmp/cvs-serv30580/com

Removed Files:
	Active Scripting.dsp _com projects.dsp adsi.dsp 
	directsound.dsp ifilter.dsp internet.dsp win32com.dsp 
Log Message:
remove all COM .dsp files

--- adsi.dsp DELETED ---

--- directsound.dsp DELETED ---

--- internet.dsp DELETED ---

--- _com projects.dsp DELETED ---

--- win32com.dsp DELETED ---

--- Active Scripting.dsp DELETED ---

--- ifilter.dsp DELETED ---

[pywin32-checkins] pywin32 setup.py,1.124,1.125

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

Update of /cvsroot/pywin32/pywin32
In directory vz-cvs-2.sog:/tmp/cvs-serv5922

Modified Files:
	setup.py 
Log Message:
update build ID to 216.1

Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** setup.py	27 Feb 2011 11:31:20 -0000	1.124
--- setup.py	5 Mar 2011 00:18:15 -0000	1.125
***************
*** 1,3 ****
! build_id="216" # 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="216.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 setup.py,1.123,1.124

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

Update of /cvsroot/pywin32/pywin32
In directory vz-cvs-2.sog:/tmp/cvs-serv17652

Modified Files:
	setup.py 
Log Message:
build 216

Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** setup.py	26 Feb 2011 06:04:44 -0000	1.123
--- setup.py	27 Feb 2011 11:31:20 -0000	1.124
***************
*** 1,3 ****
! build_id="215" # 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="216" # 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 CHANGES.txt,1.70,1.71

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

Update of /cvsroot/pywin32/pywin32
In directory vz-cvs-2.sog:/tmp/cvs-serv32438

Modified Files:
	CHANGES.txt 
Log Message:
more changes

Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/pywin32/pywin32/CHANGES.txt,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** CHANGES.txt	26 Feb 2011 00:24:53 -0000	1.70
--- CHANGES.txt	27 Feb 2011 05:39:57 -0000	1.71
***************
*** 16,19 ****
--- 16,24 ----
    this.
  
+ * Performance Monitor and ISAPI DLLs now include a manifest to fix potential
+   CRT related issues using those features.
+ 
+ * Fix potential crash in ISAPI GetServerVariable functions.
+ 
  * Fix printing on pythonwin on 3.x
  

[pywin32-checkins] pywin32 MANIFEST.in,1.22,1.23

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

Update of /cvsroot/pywin32/pywin32
In directory vz-cvs-2.sog:/tmp/cvs-serv31897

Modified Files:
	MANIFEST.in 
Log Message:
for some reason PythonCOMLoader.cpp isn't automatically included in source archives

Index: MANIFEST.in
===================================================================
RCS file: /cvsroot/pywin32/pywin32/MANIFEST.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** MANIFEST.in	26 Feb 2011 02:24:28 -0000	1.22
--- MANIFEST.in	27 Feb 2011 05:39:39 -0000	1.23
***************
*** 36,39 ****
--- 36,40 ----
  include com/win32com/src/PythonCOM.def
  include com/win32com/src/PythonCOMLoader.def
+ include com/win32com/src/PythonCOMLoader.cpp
  include com/win32com/readme.htm
  include com/win32com/HTML/*.html

[pywin32-checkins] pywin32/isapi/src FilterContext.h, 1.3, 1.4 ControlBlock.h, 1.7, 1.8

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

Update of /cvsroot/pywin32/pywin32/isapi/src
In directory vz-cvs-2.sog:/tmp/cvs-serv25643/isapi/src

Modified Files:
	FilterContext.h ControlBlock.h 
Log Message:
prevent isapi GetServerVariable functions crashing on invalid variable names

Index: ControlBlock.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/isapi/src/ControlBlock.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ControlBlock.h	3 Feb 2009 00:51:42 -0000	1.7
--- ControlBlock.h	27 Feb 2011 05:37:50 -0000	1.8
***************
*** 69,73 ****
  			*pBuffSize = 0;
  
! 		if (lpBuff[(*pBuffSize)-1]=='\0')
  			(*pBuffSize)--;
  		return (bOK) ? true : false;
--- 69,73 ----
  			*pBuffSize = 0;
  
! 		if ((int)(*pBuffSize)>0 && lpBuff[(*pBuffSize)-1]=='\0')
  			(*pBuffSize)--;
  		return (bOK) ? true : false;

Index: FilterContext.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/isapi/src/FilterContext.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FilterContext.h	3 Feb 2009 00:51:42 -0000	1.3
--- FilterContext.h	27 Feb 2011 05:37:50 -0000	1.4
***************
*** 50,54 ****
  			*pBuffSize = 0;
  
! 		if (lpBuff[(*pBuffSize)-1]=='\0')
  			(*pBuffSize)--;
  		return (bOK) ? true : false;
--- 50,54 ----
  			*pBuffSize = 0;
  
! 		if ((int)(*pBuffSize)>0 && lpBuff[(*pBuffSize)-1]=='\0')
  			(*pBuffSize)--;
  		return (bOK) ? true : false;

[pywin32-checkins] pywin32/win32/Lib pywin32_testutil.py,1.4,1.5

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

Update of /cvsroot/pywin32/pywin32/win32/Lib
In directory vz-cvs-2.sog:/tmp/cvs-serv22133/win32/Lib

Modified Files:
	pywin32_testutil.py 
Log Message:
add TYPE_E_LIBNOTREGISTERED to list of exceptions causing tests to reported as 'skipped'

Index: pywin32_testutil.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/pywin32_testutil.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pywin32_testutil.py	26 Feb 2011 00:32:36 -0000	1.4
--- pywin32_testutil.py	27 Feb 2011 05:37:01 -0000	1.5
***************
*** 217,221 ****
          # is admin)
          elif isinstance(exc_val, pywintypes.com_error) and \
!            exc_val.hresult in [winerror.CO_E_CLASSSTRING, winerror.REGDB_E_CLASSNOTREG]:
              exc_val = TestSkipped(exc_val)
          # NotImplemented generally means the platform doesn't support the
--- 217,223 ----
          # is admin)
          elif isinstance(exc_val, pywintypes.com_error) and \
!            exc_val.hresult in [winerror.CO_E_CLASSSTRING,
!                                winerror.REGDB_E_CLASSNOTREG,
!                                winerror.TYPE_E_LIBNOTREGISTERED]:
              exc_val = TestSkipped(exc_val)
          # NotImplemented generally means the platform doesn't support the

[pywin32-checkins] pywin32/win32/src PyTime.cpp,1.30,1.31

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

Update of /cvsroot/pywin32/pywin32/win32/src
In directory vz-cvs-2.sog:/tmp/cvs-serv17897/win32/src

Modified Files:
	PyTime.cpp 
Log Message:
don't call strftime with negative dates to prevent crt crashes

Index: PyTime.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/PyTime.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** PyTime.cpp	16 Nov 2010 04:45:52 -0000	1.30
--- PyTime.cpp	27 Feb 2011 05:35:46 -0000	1.31
***************
*** 167,174 ****
  	PyTime *pTime = (PyTime *)self;
  
  	SYSTEMTIME	st;
! 	if ( !VariantTimeToSystemTime(pTime->m_time, &st) )
  	{
! 		PyErr_SetString(PyExc_ValueError, "illegal internal value");
  		return NULL;
  	}
--- 167,176 ----
  	PyTime *pTime = (PyTime *)self;
  
+ 	// _tcsftime tries to be "helpful" by dieing with a too early date in
+ 	// some CRT implementations (eg, vs2008 64bit - and probably others)
  	SYSTEMTIME	st;
! 	if ( !VariantTimeToSystemTime(pTime->m_time, &st) || st.wYear < 1900 )
  	{
! 		PyErr_SetString(PyExc_ValueError, "can't format dates this early");
  		return NULL;
  	}

[pywin32-checkins] pywin32 setup.py,1.122,1.123

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

Update of /cvsroot/pywin32/pywin32
In directory vz-cvs-2.sog:/tmp/cvs-serv32453

Modified Files:
	setup.py 
Log Message:
isapi and perfmon dlls need the manifest with the crt

Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** setup.py	26 Feb 2011 02:56:17 -0000	1.122
--- setup.py	26 Feb 2011 06:04:44 -0000	1.123
***************
*** 75,78 ****
--- 75,79 ----
  import re
  from tempfile import gettempdir
+ import shutil
  
  is_py3k = sys.version_info > (3,) # get this out of the way early on...
***************
*** 240,248 ****
      MSVCCompiler._orig_link = MSVCCompiler.link
      def monkeypatched_spawn(self, cmd):
          _want_assembly_hack = getattr(self, '_want_assembly_hack', False)
          if _want_assembly_hack and cmd[0].endswith("mt.exe"):
              # We don't want mt.exe run...
              return
!         if _want_assembly_hack and cmd[0].endswith("link.exe"):
              # remove /MANIFESTFILE:... and add MANIFEST:NO
              for i in range(len(cmd)):
--- 241,251 ----
      MSVCCompiler._orig_link = MSVCCompiler.link
      def monkeypatched_spawn(self, cmd):
+         is_link = cmd[0].endswith("link.exe") or cmd[0].endswith('"link.exe"')
          _want_assembly_hack = getattr(self, '_want_assembly_hack', False)
+         _want_assembly_with_crt = getattr(self, '_want_assembly_with_crt', False)
          if _want_assembly_hack and cmd[0].endswith("mt.exe"):
              # We don't want mt.exe run...
              return
!         if _want_assembly_hack and is_link:
              # remove /MANIFESTFILE:... and add MANIFEST:NO
              for i in range(len(cmd)):
***************
*** 250,257 ****
                      cmd[i] = "/MANIFEST:NO"
                      break
          self._orig_spawn(cmd)
  
      def monkeypatched_link(self, target_desc, objects, output_filename, *args, **kw):
!         self._want_assembly_hack = not(target_desc==self.EXECUTABLE or
                                         os.path.basename(output_filename).startswith("winxpgui") or
                                         os.path.basename(output_filename).startswith("_winxptheme") or
--- 253,275 ----
                      cmd[i] = "/MANIFEST:NO"
                      break
+         if _want_assembly_with_crt and cmd[0].endswith("mt.exe"):
+             # We want mt.exe run with the original manifest
+             for i in range(len(cmd)):
+                 if cmd[i] == "-manifest":
+                     cmd[i+1] = cmd[i+1] + ".orig"
+                     break
          self._orig_spawn(cmd)
+         if _want_assembly_with_crt and is_link:
+             # We want a copy of the original manifest so we can use it later.
+             for i in range(len(cmd)):
+                 if cmd[i].startswith("/MANIFESTFILE:"):
+                     mfname = cmd[i][14:]
+                     shutil.copyfile(mfname, mfname + ".orig")
+                     break
  
      def monkeypatched_link(self, target_desc, objects, output_filename, *args, **kw):
!         self._want_assembly_with_crt = os.path.basename(output_filename).startswith("PyISAPI_loader.dll") or \
!                                        os.path.basename(output_filename).startswith("perfmondata.dll")
!         self._want_assembly_hack = not(target_desc==self.EXECUTABLE or self._want_assembly_with_crt or
                                         os.path.basename(output_filename).startswith("winxpgui") or
                                         os.path.basename(output_filename).startswith("_winxptheme") or
***************
*** 261,264 ****
--- 279,283 ----
          finally:
              delattr(self, '_want_assembly_hack')
+             delattr(self, '_want_assembly_with_crt')
      MSVCCompiler.spawn = monkeypatched_spawn
      MSVCCompiler.link = monkeypatched_link

[pywin32-checkins] pywin32/adodbapi/tests adodbapitest.py, 1.12, 1.13 adodbapitestconfig.py, 1.10, 1.11 test_adodbapi_dbapi20.py, 1.6, 1.7 test.mdb, 1.1, NONE

[Vernon C. <kf...@us...>]

Update of /cvsroot/pywin32/pywin32/adodbapi/tests
In directory vz-cvs-2.sog:/tmp/cvs-serv3298

Modified Files:
	adodbapitest.py adodbapitestconfig.py test_adodbapi_dbapi20.py 
Removed Files:
	test.mdb 
Log Message:
fix adodbapi tests

Index: adodbapitest.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/adodbapi/tests/adodbapitest.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** adodbapitest.py	16 Feb 2011 06:02:05 -0000	1.12
--- adodbapitest.py	26 Feb 2011 04:54:02 -0000	1.13
***************
*** 31,35 ****
      win32 = False
  
! import testADOdbapiConfig as config #will find (parent?) adodbapi
  import adodbapi
  try:
--- 31,38 ----
      win32 = False
  
! try:
!     import adodbapitestconfig as config #will find (parent?) adodbapi
! except ImportError:
!     import testADOdbapiConfig as config #alternate version
  import adodbapi
  try:

Index: test_adodbapi_dbapi20.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/adodbapi/tests/test_adodbapi_dbapi20.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_adodbapi_dbapi20.py	31 Jul 2010 05:48:10 -0000	1.6
--- test_adodbapi_dbapi20.py	26 Feb 2011 04:54:02 -0000	1.7
***************
*** 18,22 ****
  print "Tested with dbapi20 %s" % dbapi20.__version__
  
! _computername=".\SQLEXPRESS" #or name of computer with SQL Server
  _databasename="Northwind" #or something else
  connStr = r"Provider=SQLOLEDB.1; Integrated Security=SSPI; Initial Catalog=%s;Data Source=%s" %(_databasename, _computername)
--- 18,22 ----
  print "Tested with dbapi20 %s" % dbapi20.__version__
  
! _computername="(local)" #or name of computer with SQL Server
  _databasename="Northwind" #or something else
  connStr = r"Provider=SQLOLEDB.1; Integrated Security=SSPI; Initial Catalog=%s;Data Source=%s" %(_databasename, _computername)

Index: adodbapitestconfig.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/adodbapi/tests/adodbapitestconfig.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** adodbapitestconfig.py	16 Feb 2011 06:02:05 -0000	1.10
--- adodbapitestconfig.py	26 Feb 2011 04:54:02 -0000	1.11
***************
*** 1,4 ****
  # Configure this in order to run the testcases.
! "testADOdbapiConfig.py v 2.4.0"
  
  import os
--- 1,4 ----
  # Configure this in order to run the testcases.
! "testADOdbapiConfig.py v 2.4.2"
  
  import os
***************
*** 23,27 ****
  print __doc__
  
! doAllTests = True
  doAccessTest = True or doAllTests
  doSqlServerTest = False or doAllTests
--- 23,27 ----
  print __doc__
  
! doAllTests = False   # switch to True for intensive testing
  doAccessTest = True or doAllTests
  doSqlServerTest = False or doAllTests

--- test.mdb DELETED ---