pywin32-checkins Mailing List for Python for Windows Extensions (Page 47)
OLD project page for the Python extensions for Windows
Brought to you by:
mhammond
Menu
▾
▴
pywin32-checkins — CVS checkin notices
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
(1) |
Jun
(6) |
Jul
(50) |
Aug
(11) |
Sep
(24) |
Oct
(184) |
Nov
(118) |
Dec
(22) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(31) |
Feb
(25) |
Mar
(34) |
Apr
(105) |
May
(49) |
Jun
(38) |
Jul
(39) |
Aug
(7) |
Sep
(98) |
Oct
(79) |
Nov
(20) |
Dec
(17) |
| 2005 |
Jan
(66) |
Feb
(32) |
Mar
(43) |
Apr
(30) |
May
(58) |
Jun
(30) |
Jul
(16) |
Aug
(4) |
Sep
(21) |
Oct
(42) |
Nov
(11) |
Dec
(14) |
| 2006 |
Jan
(42) |
Feb
(30) |
Mar
(22) |
Apr
(1) |
May
(9) |
Jun
(15) |
Jul
(20) |
Aug
(9) |
Sep
(8) |
Oct
(1) |
Nov
(9) |
Dec
(43) |
| 2007 |
Jan
(52) |
Feb
(45) |
Mar
(20) |
Apr
(12) |
May
(59) |
Jun
(39) |
Jul
(35) |
Aug
(31) |
Sep
(17) |
Oct
(20) |
Nov
(4) |
Dec
(4) |
| 2008 |
Jan
(28) |
Feb
(111) |
Mar
(4) |
Apr
(27) |
May
(40) |
Jun
(27) |
Jul
(32) |
Aug
(94) |
Sep
(87) |
Oct
(153) |
Nov
(336) |
Dec
(331) |
| 2009 |
Jan
(298) |
Feb
(127) |
Mar
(20) |
Apr
(8) |
May
|
Jun
(10) |
Jul
(6) |
Aug
|
Sep
(2) |
Oct
(2) |
Nov
|
Dec
(1) |
| 2010 |
Jan
(7) |
Feb
(1) |
Mar
|
Apr
|
May
(15) |
Jun
(4) |
Jul
(3) |
Aug
(28) |
Sep
(1) |
Oct
(19) |
Nov
(16) |
Dec
(6) |
| 2011 |
Jan
(2) |
Feb
(18) |
Mar
(17) |
Apr
(12) |
May
(5) |
Jun
(11) |
Jul
(7) |
Aug
(2) |
Sep
(2) |
Oct
(4) |
Nov
(4) |
Dec
|
| 2012 |
Jan
(6) |
Feb
(2) |
Mar
|
Apr
(8) |
May
(4) |
Jun
(3) |
Jul
(13) |
Aug
(27) |
Sep
(8) |
Oct
(9) |
Nov
(3) |
Dec
(2) |
| 2013 |
Jan
|
Feb
(1) |
Mar
(5) |
Apr
(10) |
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(9) |
| 2014 |
Jan
(2) |
Feb
(4) |
Mar
(4) |
Apr
(1) |
May
(4) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
(1) |
| 2015 |
Jan
(1) |
Feb
|
Mar
|
Apr
(6) |
May
(2) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
(3) |
Feb
(2) |
Mar
|
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
|
From: Mark H. <mha...@us...> - 2008-11-27 12:18:13
|
Update of /cvsroot/pywin32/pywin32/win32/Demos In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25938/win32/Demos Modified Files: Tag: py3k cerapi.py getfilever.py Log Message: merge lots of fixes from the trunk Index: cerapi.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Demos/cerapi.py,v retrieving revision 1.2.4.1 retrieving revision 1.2.4.2 diff -C2 -d -r1.2.4.1 -r1.2.4.2 *** cerapi.py 29 Aug 2008 04:59:23 -0000 1.2.4.1 --- cerapi.py 27 Nov 2008 11:31:05 -0000 1.2.4.2 *************** *** 10,14 **** import sys import getopt - from reprlib import repr --- 10,13 ---- Index: getfilever.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Demos/getfilever.py,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** getfilever.py 29 Aug 2008 04:59:23 -0000 1.1.4.1 --- getfilever.py 27 Nov 2008 11:31:05 -0000 1.1.4.2 *************** *** 8,12 **** d=win32api.GetFileVersionInfo(fname, '\\') ## backslash as parm returns dictionary of numeric info corresponding to VS_FIXEDFILEINFO struc ! for n, v in list(d.items()): print(n, v) --- 8,12 ---- d=win32api.GetFileVersionInfo(fname, '\\') ## backslash as parm returns dictionary of numeric info corresponding to VS_FIXEDFILEINFO struc ! for n, v in d.items(): print(n, v) *************** *** 19,24 **** str_info='\\StringFileInfo\\%04X%04X\\%s' %(lang,codepage,ver_string) ## print str_info ! print(ver_string, win32api.GetFileVersionInfo(fname, str_info)) ! ! ! \ No newline at end of file --- 19,21 ---- str_info='\\StringFileInfo\\%04X%04X\\%s' %(lang,codepage,ver_string) ## print str_info ! print(ver_string, repr(win32api.GetFileVersionInfo(fname, str_info))) |
Update of /cvsroot/pywin32/pywin32/com/win32com/test In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25938/com/win32com/test Modified Files: Tag: py3k errorSemantics.py testADOEvents.py testAXScript.py testAccess.py testExchange.py testGatewayAddresses.py testMSOffice.py testMSOfficeEvents.py testMarshal.py testPyComTest.py testShell.py testall.py testvb.py Log Message: merge lots of fixes from the trunk Index: testADOEvents.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testADOEvents.py,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** testADOEvents.py 26 Nov 2008 09:03:29 -0000 1.1.4.1 --- testADOEvents.py 27 Nov 2008 11:31:05 -0000 1.1.4.2 *************** *** 59,63 **** def Test(): ! import testAccess try: testAccess.GenerateSupport() --- 59,63 ---- def Test(): ! from . import testAccess try: testAccess.GenerateSupport() Index: testGatewayAddresses.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testGatewayAddresses.py,v retrieving revision 1.2.4.3 retrieving revision 1.2.4.4 diff -C2 -d -r1.2.4.3 -r1.2.4.4 *** testGatewayAddresses.py 27 Nov 2008 04:58:41 -0000 1.2.4.3 --- testGatewayAddresses.py 27 Nov 2008 11:31:05 -0000 1.2.4.4 *************** *** 38,42 **** import pythoncom import string ! from util import CheckClean numErrors = 0 --- 38,42 ---- import pythoncom import string ! from .util import CheckClean numErrors = 0 Index: testMSOfficeEvents.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testMSOfficeEvents.py,v retrieving revision 1.4.4.1 retrieving revision 1.4.4.2 diff -C2 -d -r1.4.4.1 -r1.4.4.2 *** testMSOfficeEvents.py 26 Nov 2008 09:03:29 -0000 1.4.4.1 --- testMSOfficeEvents.py 27 Nov 2008 11:31:05 -0000 1.4.4.2 *************** *** 99,103 **** rc = 1 for e in events: ! if not o.seen_events.has_key(e): print("ERROR: Expected event did not trigger", e) rc = 0 --- 99,103 ---- rc = 1 for e in events: ! if e not in o.seen_events: print("ERROR: Expected event did not trigger", e) rc = 0 Index: testPyComTest.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testPyComTest.py,v retrieving revision 1.32.2.4 retrieving revision 1.32.2.5 diff -C2 -d -r1.32.2.4 -r1.32.2.5 *** testPyComTest.py 27 Nov 2008 05:36:19 -0000 1.32.2.4 --- testPyComTest.py 27 Nov 2008 11:31:05 -0000 1.32.2.5 *************** *** 8,12 **** from win32com.client import constants import win32com ! from util import RegisterPythonServer importMsg = "**** PyCOMTest is not installed ***\n PyCOMTest is a Python test specific COM client and server.\n It is likely this server is not installed on this machine\n To install the server, you must get the win32com sources\n and build it using MS Visual C++" --- 8,12 ---- from win32com.client import constants import win32com ! from .util import RegisterPythonServer importMsg = "**** PyCOMTest is not installed ***\n PyCOMTest is a Python test specific COM client and server.\n It is likely this server is not installed on this machine\n To install the server, you must get the win32com sources\n and build it using MS Visual C++" Index: errorSemantics.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/errorSemantics.py,v retrieving revision 1.6.4.2 retrieving revision 1.6.4.3 diff -C2 -d -r1.6.4.2 -r1.6.4.3 *** errorSemantics.py 26 Nov 2008 09:03:29 -0000 1.6.4.2 --- errorSemantics.py 27 Nov 2008 11:31:05 -0000 1.6.4.3 *************** *** 147,151 **** if logging is not None: testLogger() ! from util import CheckClean CheckClean() print("error semantic tests worked") --- 147,151 ---- if logging is not None: testLogger() ! from .util import CheckClean CheckClean() print("error semantic tests worked") Index: testShell.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testShell.py,v retrieving revision 1.10.4.3 retrieving revision 1.10.4.4 diff -C2 -d -r1.10.4.3 -r1.10.4.4 *** testShell.py 27 Nov 2008 04:58:41 -0000 1.10.4.3 --- testShell.py 27 Nov 2008 11:31:05 -0000 1.10.4.4 *************** *** 38,42 **** if num == 0: # This isn't a fatal error, but is unlikely. ! print ("Could not find any links on your desktop or programs dir, which is unusual") def testShellFolder(self): --- 38,42 ---- if num == 0: # This isn't a fatal error, but is unlikely. ! print("Could not find any links on your desktop or programs dir, which is unusual") def testShellFolder(self): Index: testMSOffice.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testMSOffice.py,v retrieving revision 1.7.4.4 retrieving revision 1.7.4.5 diff -C2 -d -r1.7.4.4 -r1.7.4.5 *** testMSOffice.py 27 Nov 2008 05:36:19 -0000 1.7.4.4 --- testMSOffice.py 27 Nov 2008 11:31:05 -0000 1.7.4.5 *************** *** 21,25 **** try: # NOTE - using "client.Dispatch" would return an msword8.py instance! ! print ("Starting Word 8 for dynamic test") word = win32com.client.dynamic.Dispatch("Word.Application") TestWord8(word) --- 21,25 ---- try: # NOTE - using "client.Dispatch" would return an msword8.py instance! ! print("Starting Word 8 for dynamic test") word = win32com.client.dynamic.Dispatch("Word.Application") TestWord8(word) *************** *** 27,31 **** word = None # Now we will test Dispatch without the new "lazy" capabilities ! print ("Starting Word 8 for non-lazy dynamic test") dispatch = win32com.client.dynamic._GetGoodDispatch("Word.Application") typeinfo = dispatch.GetTypeInfo() --- 27,31 ---- word = None # Now we will test Dispatch without the new "lazy" capabilities ! print("Starting Word 8 for non-lazy dynamic test") dispatch = win32com.client.dynamic._GetGoodDispatch("Word.Application") typeinfo = dispatch.GetTypeInfo() *************** *** 37,45 **** except pythoncom.com_error: ! print ("Starting Word 7 for dynamic test") word = win32com.client.Dispatch("Word.Basic") TestWord7(word) ! print ("Starting MSWord for generated test") from win32com.client import gencache word = gencache.EnsureDispatch("Word.Application.8") --- 37,45 ---- except pythoncom.com_error: ! print("Starting Word 7 for dynamic test") word = win32com.client.Dispatch("Word.Basic") TestWord7(word) ! print("Starting MSWord for generated test") from win32com.client import gencache word = gencache.EnsureDispatch("Word.Application.8") *************** *** 82,86 **** import win32com.test.Generated4Test.msword8 except ImportError: ! print ("Can not do old style test") --- 82,86 ---- import win32com.test.Generated4Test.msword8 except ImportError: ! print("Can not do old style test") *************** *** 137,151 **** TestWord() ! print ("Starting Excel for Dynamic test...") xl = win32com.client.dynamic.Dispatch("Excel.Application") TextExcel(xl) try: ! print ("Starting Excel 8 for generated excel8.py test...") mod = gencache.EnsureModule("{00020813-0000-0000-C000-000000000046}", 0, 1, 2, bForDemand=1) xl = win32com.client.Dispatch("Excel.Application") TextExcel(xl) except ImportError: ! print ("Could not import the generated Excel 97 wrapper") try: --- 137,151 ---- TestWord() ! print("Starting Excel for Dynamic test...") xl = win32com.client.dynamic.Dispatch("Excel.Application") TextExcel(xl) try: ! print("Starting Excel 8 for generated excel8.py test...") mod = gencache.EnsureModule("{00020813-0000-0000-C000-000000000046}", 0, 1, 2, bForDemand=1) xl = win32com.client.Dispatch("Excel.Application") TextExcel(xl) except ImportError: ! print("Could not import the generated Excel 97 wrapper") try: *************** *** 153,160 **** mod = gencache.EnsureModule("{00020813-0000-0000-C000-000000000046}", 9, 1, 0) xl = win32com.client.Dispatch("Excel.Application.5") ! print ("Starting Excel 95 for makepy test...") TextExcel(xl) except ImportError: ! print ("Could not import the generated Excel 95 wrapper") if __name__=='__main__': --- 153,160 ---- mod = gencache.EnsureModule("{00020813-0000-0000-C000-000000000046}", 9, 1, 0) xl = win32com.client.Dispatch("Excel.Application.5") ! print("Starting Excel 95 for makepy test...") TextExcel(xl) except ImportError: ! print("Could not import the generated Excel 95 wrapper") if __name__=='__main__': Index: testExchange.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testExchange.py,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -d -r1.7.2.1 -r1.7.2.2 *** testExchange.py 26 Nov 2008 09:03:29 -0000 1.7.2.1 --- testExchange.py 27 Nov 2008 11:31:05 -0000 1.7.2.2 *************** *** 108,112 **** if __name__=='__main__': ! from util import CheckClean test() CheckClean() --- 108,112 ---- if __name__=='__main__': ! from .util import CheckClean test() CheckClean() Index: testvb.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testvb.py,v retrieving revision 1.20.4.2 retrieving revision 1.20.4.3 diff -C2 -d -r1.20.4.2 -r1.20.4.3 *** testvb.py 26 Nov 2008 09:03:29 -0000 1.20.4.2 --- testvb.py 27 Nov 2008 11:31:05 -0000 1.20.4.3 *************** *** 291,300 **** testData = string.split("Mark was here") resultData, byRefParam = vbtest.PassSAFEARRAY(testData) - # Un unicode everything (only 1.5.2) - try: - unicode - except NameError : # No builtin named Unicode! - resultData = map(str, resultData) - byRefParam = map(str, byRefParam) if testData != list(resultData): raise error("The safe array data was not what we expected - got " + str(resultData)) --- 291,294 ---- Index: testMarshal.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testMarshal.py,v retrieving revision 1.4.4.1 retrieving revision 1.4.4.2 diff -C2 -d -r1.4.4.1 -r1.4.4.2 *** testMarshal.py 26 Nov 2008 09:03:29 -0000 1.4.4.1 --- testMarshal.py 27 Nov 2008 11:31:05 -0000 1.4.4.2 *************** *** 28,32 **** import unittest ! from testServers import InterpCase freeThreaded = 1 --- 28,32 ---- import unittest ! from .testServers import InterpCase freeThreaded = 1 Index: testAccess.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testAccess.py,v retrieving revision 1.6.4.1 retrieving revision 1.6.4.2 diff -C2 -d -r1.6.4.1 -r1.6.4.2 *** testAccess.py 26 Nov 2008 09:03:29 -0000 1.6.4.1 --- testAccess.py 27 Nov 2008 11:31:05 -0000 1.6.4.2 *************** *** 101,105 **** def DoDumpAccessInfo(dbname): ! import daodump a = forms = None try: --- 101,105 ---- def DoDumpAccessInfo(dbname): ! from . import daodump a = forms = None try: *************** *** 160,164 **** if __name__=='__main__': import sys ! from util import CheckClean dbname = None if len(sys.argv)>1: --- 160,164 ---- if __name__=='__main__': import sys ! from .util import CheckClean dbname = None if len(sys.argv)>1: Index: testall.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testall.py,v retrieving revision 1.27.2.3 retrieving revision 1.27.2.4 diff -C2 -d -r1.27.2.3 -r1.27.2.4 *** testall.py 26 Nov 2008 09:03:29 -0000 1.27.2.3 --- testall.py 27 Nov 2008 11:31:05 -0000 1.27.2.4 *************** *** 18,22 **** def GenerateAndRunOldStyle(): ! import GenTestScripts GenTestScripts.GenerateAll() try: --- 18,22 ---- def GenerateAndRunOldStyle(): ! from . import GenTestScripts GenTestScripts.GenerateAll() try: Index: testAXScript.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testAXScript.py,v retrieving revision 1.7.4.2 retrieving revision 1.7.4.3 diff -C2 -d -r1.7.4.2 -r1.7.4.3 *** testAXScript.py 26 Nov 2008 09:03:29 -0000 1.7.4.2 --- testAXScript.py 27 Nov 2008 11:31:05 -0000 1.7.4.3 *************** *** 13,17 **** def setUp(self): file = win32api.GetFullPathName(os.path.join(win32com.axscript.client.__path__[0], "pyscript.py")) ! from util import RegisterPythonServer self.verbose = verbose RegisterPythonServer(file, 'python', verbose=self.verbose) --- 13,17 ---- def setUp(self): file = win32api.GetFullPathName(os.path.join(win32com.axscript.client.__path__[0], "pyscript.py")) ! from .util import RegisterPythonServer self.verbose = verbose RegisterPythonServer(file, 'python', verbose=self.verbose) |
|
From: Mark H. <mha...@us...> - 2008-11-27 12:18:05
|
Update of /cvsroot/pywin32/pywin32/win32/Demos/service In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25938/win32/Demos/service Modified Files: Tag: py3k pipeTestServiceClient.py Log Message: merge lots of fixes from the trunk Index: pipeTestServiceClient.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Demos/service/pipeTestServiceClient.py,v retrieving revision 1.3.4.2 retrieving revision 1.3.4.3 diff -C2 -d -r1.3.4.2 -r1.3.4.3 *** pipeTestServiceClient.py 23 Oct 2008 09:45:16 -0000 1.3.4.2 --- pipeTestServiceClient.py 27 Nov 2008 11:31:05 -0000 1.3.4.3 *************** *** 66,70 **** try: try: ! for i in xrange(numMessages): r = CallPipe(CallNamedPipe, ("\\\\%s\\pipe\\PyPipeTest" % server, "#" * 512, 1024, NMPWAIT_WAIT_FOREVER)) except: --- 66,70 ---- try: try: ! for i in range(numMessages): r = CallPipe(CallNamedPipe, ("\\\\%s\\pipe\\PyPipeTest" % server, "#" * 512, 1024, NMPWAIT_WAIT_FOREVER)) except: *************** *** 77,81 **** import _thread thread_waits = [] ! for t_num in xrange(numThreads): # Note I could just wait on thread handles (after calling DuplicateHandle) # See the service itself for an example of waiting for the clients... --- 77,81 ---- import _thread thread_waits = [] ! for t_num in range(numThreads): # Note I could just wait on thread handles (after calling DuplicateHandle) # See the service itself for an example of waiting for the clients... |
|
From: Mark H. <mha...@us...> - 2008-11-27 12:18:01
|
Update of /cvsroot/pywin32/pywin32/win32/Demos/win32wnet In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25938/win32/Demos/win32wnet Modified Files: Tag: py3k testwnet.py Log Message: merge lots of fixes from the trunk Index: testwnet.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Demos/win32wnet/testwnet.py,v retrieving revision 1.2.4.2 retrieving revision 1.2.4.3 diff -C2 -d -r1.2.4.2 -r1.2.4.3 *** testwnet.py 23 Oct 2008 09:45:16 -0000 1.2.4.2 --- testwnet.py 27 Nov 2008 11:31:05 -0000 1.2.4.3 *************** *** 1,5 **** import win32wnet import sys ! from .winnetwk import * import os --- 1,5 ---- import win32wnet import sys ! from winnetwk import * import os |
|
From: Mark H. <mha...@us...> - 2008-11-27 12:17:56
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25938/Pythonwin/pywin/Demos Modified Files: Tag: py3k cmdserver.py demoutils.py dibdemo.py dlgtest.py fontdemo.py guidemo.py menutest.py objdoc.py Log Message: merge lots of fixes from the trunk Index: dlgtest.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/dlgtest.py,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -C2 -d -r1.1.4.2 -r1.1.4.3 *** dlgtest.py 23 Oct 2008 09:45:16 -0000 1.1.4.2 --- dlgtest.py 27 Nov 2008 11:31:03 -0000 1.1.4.3 *************** *** 136,138 **** if __name__=='__main__': demo(1) - --- 136,137 ---- Index: dibdemo.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/dibdemo.py,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** dibdemo.py 29 Aug 2008 06:16:06 -0000 1.2.2.1 --- dibdemo.py 27 Nov 2008 11:31:03 -0000 1.2.2.2 *************** *** 66,69 **** if __name__=='__main__': ! from . import demoutils demoutils.NotAScript() \ No newline at end of file --- 66,69 ---- if __name__=='__main__': ! import demoutils demoutils.NotAScript() \ No newline at end of file Index: fontdemo.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/fontdemo.py,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** fontdemo.py 29 Aug 2008 06:16:06 -0000 1.1.4.1 --- fontdemo.py 27 Nov 2008 11:31:03 -0000 1.1.4.2 *************** *** 75,79 **** if __name__=='__main__': ! from . import demoutils if demoutils.NeedGoodGUI(): FontDemo() --- 75,79 ---- if __name__=='__main__': ! import demoutils if demoutils.NeedGoodGUI(): FontDemo() Index: objdoc.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/objdoc.py,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -C2 -d -r1.1.4.2 -r1.1.4.3 *** objdoc.py 23 Oct 2008 09:45:16 -0000 1.1.4.2 --- objdoc.py 27 Nov 2008 11:31:03 -0000 1.1.4.3 *************** *** 45,49 **** if __name__=='__main__': ! from . import demoutils if demoutils.NeedGoodGUI(): ! demo() \ No newline at end of file --- 45,49 ---- if __name__=='__main__': ! import demoutils if demoutils.NeedGoodGUI(): ! demo() Index: demoutils.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/demoutils.py,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** demoutils.py 29 Aug 2008 06:16:06 -0000 1.1.4.1 --- demoutils.py 27 Nov 2008 11:31:03 -0000 1.1.4.2 *************** *** 51,54 **** if __name__=='__main__': ! from . import demoutils demoutils.NotAScript() --- 51,54 ---- if __name__=='__main__': ! import demoutils demoutils.NotAScript() Index: cmdserver.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/cmdserver.py,v retrieving revision 1.2.4.1 retrieving revision 1.2.4.2 diff -C2 -d -r1.2.4.1 -r1.2.4.2 *** cmdserver.py 29 Aug 2008 06:16:06 -0000 1.2.4.1 --- cmdserver.py 27 Nov 2008 11:31:03 -0000 1.2.4.2 *************** *** 104,108 **** # writer=ThreadWriter() if __name__=='__main__': ! from . import demoutils demoutils.NotAScript() --- 104,108 ---- # writer=ThreadWriter() if __name__=='__main__': ! import demoutils demoutils.NotAScript() Index: menutest.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/menutest.py,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** menutest.py 29 Aug 2008 06:16:06 -0000 1.1.4.1 --- menutest.py 27 Nov 2008 11:31:03 -0000 1.1.4.2 *************** *** 4,8 **** if __name__=='__main__': ! from . import demoutils if demoutils.NeedGoodGUI(): win=interact.edit.currentView.GetParent() --- 4,8 ---- if __name__=='__main__': ! import demoutils if demoutils.NeedGoodGUI(): win=interact.edit.currentView.GetParent() *************** *** 10,12 **** id=menu.GetMenuItemID(6) menu.EnableMenuItem(id,win32con.MF_BYCOMMAND|win32con.MF_GRAYED) ! print("The interactive window's 'Close' menu item is now disabled.") \ No newline at end of file --- 10,12 ---- id=menu.GetMenuItemID(6) menu.EnableMenuItem(id,win32con.MF_BYCOMMAND|win32con.MF_GRAYED) ! print("The interactive window's 'Close' menu item is now disabled.") Index: guidemo.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/guidemo.py,v retrieving revision 1.3.4.1 retrieving revision 1.3.4.2 diff -C2 -d -r1.3.4.1 -r1.3.4.2 *** guidemo.py 29 Aug 2008 06:16:06 -0000 1.3.4.1 --- guidemo.py 27 Nov 2008 11:31:03 -0000 1.3.4.2 *************** *** 25,29 **** try: # seeif I can locate the demo files. ! from . import fontdemo except ImportError: # else put the demos direectory on the path (if not already) --- 25,29 ---- try: # seeif I can locate the demo files. ! import fontdemo except ImportError: # else put the demos direectory on the path (if not already) *************** *** 40,44 **** else: sys.path.append(demosDir) ! from . import fontdemo import sys --- 40,44 ---- else: sys.path.append(demosDir) ! import fontdemo import sys *************** *** 64,68 **** if __name__==__main__.__name__: ! from . import demoutils if demoutils.NeedGoodGUI(): demo() --- 64,68 ---- if __name__==__main__.__name__: ! import demoutils if demoutils.NeedGoodGUI(): demo() |
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25938/Pythonwin/pywin/framework Modified Files: Tag: py3k help.py interact.py intpyapp.py mdi_pychecker.py sgrepmdi.py Log Message: merge lots of fixes from the trunk Index: intpyapp.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/intpyapp.py,v retrieving revision 1.11.2.3 retrieving revision 1.11.2.4 diff -C2 -d -r1.11.2.3 -r1.11.2.4 *** intpyapp.py 26 Nov 2008 07:17:38 -0000 1.11.2.3 --- intpyapp.py 27 Nov 2008 11:31:03 -0000 1.11.2.4 *************** *** 382,385 **** --- 382,386 ---- from pywin.dialogs import ideoptions sheet.AddPage( ideoptions.OptionsPropPage() ) + from . import toolmenu sheet.AddPage( toolmenu.ToolMenuPropPage() ) *************** *** 430,436 **** # Only attempt to save editor documents. from pywin.framework.editor import editorTemplate ! docs = [doc for doc in editorTemplate.GetDocumentList() if doc.IsModified() and doc.GetPathName()] ! list(map(lambda doc: doc.OnSaveDocument(doc.GetPathName()), docs)) ! win32ui.SetStatusText("%d documents saved" % len(docs), 1) def OnViewToolbarDbg(self, id, code): --- 431,440 ---- # Only attempt to save editor documents. from pywin.framework.editor import editorTemplate ! num = 0 ! for doc in editorTemplate.GetDocumentList(): ! if doc.IsModified() and doc.GetPathName(): ! num = num = 1 ! doc.OnSaveDocument(doc.GetPathName()) ! win32ui.SetStatusText("%d documents saved" % num, 1) def OnViewToolbarDbg(self, id, code): Index: mdi_pychecker.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/mdi_pychecker.py,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -d -r1.2.2.2 -r1.2.2.3 *** mdi_pychecker.py 23 Oct 2008 09:45:16 -0000 1.2.2.2 --- mdi_pychecker.py 27 Nov 2008 11:31:03 -0000 1.2.2.3 *************** *** 99,103 **** dirs[sd] = None self.dirs = [] ! for d in dirs.iterkeys(): self.dirs.append(d) --- 99,103 ---- dirs[sd] = None self.dirs = [] ! for d in dirs.keys(): self.dirs.append(d) Index: sgrepmdi.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/sgrepmdi.py,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -d -r1.7.2.1 -r1.7.2.2 *** sgrepmdi.py 29 Aug 2008 06:16:42 -0000 1.7.2.1 --- sgrepmdi.py 27 Nov 2008 11:31:03 -0000 1.7.2.2 *************** *** 29,33 **** import stat import glob ! from pywin.framework import scriptutils def getsubdirs(d): --- 29,33 ---- import stat import glob ! from . import scriptutils def getsubdirs(d): Index: interact.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/interact.py,v retrieving revision 1.17.2.1 retrieving revision 1.17.2.2 diff -C2 -d -r1.17.2.1 -r1.17.2.2 *** interact.py 29 Aug 2008 06:16:41 -0000 1.17.2.1 --- interact.py 27 Nov 2008 11:31:03 -0000 1.17.2.2 *************** *** 28,31 **** --- 28,32 ---- trace=pywin.scintilla.formatter.trace + from . import winout Index: help.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/help.py,v retrieving revision 1.12.2.3 retrieving revision 1.12.2.4 diff -C2 -d -r1.12.2.3 -r1.12.2.4 *** help.py 26 Nov 2008 07:17:38 -0000 1.12.2.3 --- help.py 27 Nov 2008 11:31:03 -0000 1.12.2.4 *************** *** 143,147 **** if helpIDMap: ! for id, (desc, fname) in helpIDMap.iteritems(): otherMenu.AppendMenu(win32con.MF_ENABLED|win32con.MF_STRING,id, desc) else: --- 143,147 ---- if helpIDMap: ! for id, (desc, fname) in helpIDMap.items(): otherMenu.AppendMenu(win32con.MF_ENABLED|win32con.MF_STRING,id, desc) else: |
|
From: Mark H. <mha...@us...> - 2008-11-27 12:17:48
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25938/Pythonwin/pywin/framework/editor Modified Files: Tag: py3k configui.py Log Message: merge lots of fixes from the trunk Index: configui.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor/configui.py,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -C2 -d -r1.8.2.1 -r1.8.2.2 *** configui.py 29 Aug 2008 06:17:09 -0000 1.8.2.1 --- configui.py 27 Nov 2008 11:31:03 -0000 1.8.2.2 *************** *** 47,50 **** --- 47,51 ---- + def _AddEditorOption(self, idd, typ, optionName, defaultVal): self.AddDDX(idd, optionName, typ) |
|
From: Mark H. <mha...@us...> - 2008-11-27 12:17:45
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/mfc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25938/Pythonwin/pywin/mfc Modified Files: Tag: py3k activex.py thread.py Log Message: merge lots of fixes from the trunk Index: activex.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/mfc/activex.py,v retrieving revision 1.3.4.2 retrieving revision 1.3.4.3 diff -C2 -d -r1.3.4.2 -r1.3.4.3 *** activex.py 26 Nov 2008 07:17:38 -0000 1.3.4.2 --- activex.py 27 Nov 2008 11:31:03 -0000 1.3.4.3 *************** *** 29,33 **** def HookOleEvents(self): dict = self._GetEventMap() ! for dispid, methodName in dict.iteritems(): if hasattr(self, methodName): self._obj_.HookOleEvent( getattr(self, methodName), dispid ) --- 29,33 ---- def HookOleEvents(self): dict = self._GetEventMap() ! for dispid, methodName in dict.items(): if hasattr(self, methodName): self._obj_.HookOleEvent( getattr(self, methodName), dispid ) Index: thread.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/mfc/thread.py,v retrieving revision 1.3.4.1 retrieving revision 1.3.4.2 diff -C2 -d -r1.3.4.1 -r1.3.4.2 *** thread.py 29 Aug 2008 06:16:42 -0000 1.3.4.1 --- thread.py 27 Nov 2008 11:31:03 -0000 1.3.4.2 *************** *** 1,2 **** --- 1,4 ---- + # Thread and application objects + from . import object import win32ui |
|
From: Mark H. <mha...@us...> - 2008-11-27 12:17:41
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/idle In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25938/Pythonwin/pywin/idle Modified Files: Tag: py3k FormatParagraph.py Log Message: merge lots of fixes from the trunk Index: FormatParagraph.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/idle/FormatParagraph.py,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** FormatParagraph.py 29 Aug 2008 06:16:42 -0000 1.2.2.1 --- FormatParagraph.py 27 Nov 2008 11:31:03 -0000 1.2.2.2 *************** *** 52,56 **** # Reformat the comment lines - convert to text sans header. lines = data.split("\n") ! lines = list(map(lambda st, l=len(comment_header): st[l:], lines)) data = "\n".join(lines) # Reformat to 70 chars or a 20 char width, whichever is greater. --- 52,56 ---- # Reformat the comment lines - convert to text sans header. lines = data.split("\n") ! lines = map(lambda st, l=len(comment_header): st[l:], lines) data = "\n".join(lines) # Reformat to 70 chars or a 20 char width, whichever is greater. |
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/app In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25938/Pythonwin/pywin/Demos/app Modified Files: Tag: py3k basictimerapp.py customprint.py demoutils.py dlgappdemo.py dojobapp.py Log Message: merge lots of fixes from the trunk Index: basictimerapp.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/app/basictimerapp.py,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** basictimerapp.py 29 Aug 2008 06:16:05 -0000 1.4.2.1 --- basictimerapp.py 27 Nov 2008 11:31:03 -0000 1.4.2.2 *************** *** 218,221 **** if __name__=='__main__': ! from . import demoutils demoutils.NeedApp() --- 218,221 ---- if __name__=='__main__': ! import demoutils demoutils.NeedApp() Index: dlgappdemo.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/app/dlgappdemo.py,v retrieving revision 1.2.4.2 retrieving revision 1.2.4.3 diff -C2 -d -r1.2.4.2 -r1.2.4.3 *** dlgappdemo.py 26 Nov 2008 07:17:38 -0000 1.2.4.2 --- dlgappdemo.py 27 Nov 2008 11:31:03 -0000 1.2.4.3 *************** *** 43,46 **** if __name__=='__main__': ! from . import demoutils demoutils.NeedApp() --- 43,46 ---- if __name__=='__main__': ! import demoutils demoutils.NeedApp() Index: demoutils.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/app/demoutils.py,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** demoutils.py 29 Aug 2008 06:16:05 -0000 1.1.4.1 --- demoutils.py 27 Nov 2008 11:31:03 -0000 1.1.4.2 *************** *** 49,52 **** if __name__=='__main__': ! from . import demoutils demoutils.NotAScript() --- 49,52 ---- if __name__=='__main__': ! import demoutils demoutils.NotAScript() Index: customprint.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/app/customprint.py,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -C2 -d -r1.3.2.2 -r1.3.2.3 *** customprint.py 26 Nov 2008 07:17:38 -0000 1.3.2.2 --- customprint.py 27 Nov 2008 11:31:03 -0000 1.3.2.3 *************** *** 34,38 **** } self.pens = {} ! for name, color in self.colors.iteritems(): self.pens[name] = win32ui.CreatePen(win32con.PS_SOLID, 5, color) --- 34,38 ---- } self.pens = {} ! for name, color in self.colors.items(): self.pens[name] = win32ui.CreatePen(win32con.PS_SOLID, 5, color) Index: dojobapp.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/app/dojobapp.py,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** dojobapp.py 29 Aug 2008 06:16:05 -0000 1.1.4.1 --- dojobapp.py 27 Nov 2008 11:31:03 -0000 1.1.4.2 *************** *** 59,62 **** if __name__=='__main__': ! from . import demoutils demoutils.NeedApp() --- 59,62 ---- if __name__=='__main__': ! import demoutils demoutils.NeedApp() |
|
From: Mark H. <mha...@us...> - 2008-11-27 12:17:33
|
Update of /cvsroot/pywin32/pywin32 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25938 Modified Files: Tag: py3k CHANGES.txt pywin32_postinstall.py Log Message: merge lots of fixes from the trunk Index: pywin32_postinstall.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/pywin32_postinstall.py,v retrieving revision 1.25.2.2 retrieving revision 1.25.2.3 diff -C2 -d -r1.25.2.2 -r1.25.2.3 *** pywin32_postinstall.py 26 Nov 2008 09:03:28 -0000 1.25.2.2 --- pywin32_postinstall.py 27 Nov 2008 11:31:03 -0000 1.25.2.3 *************** *** 263,266 **** --- 263,287 ---- return win32api.GetSystemDirectory() + def fixup_dbi(): + # We used to have a dbi.pyd with our .pyd files, but now have a .py file. + # If the user didn't uninstall, they will find the .pyd which will cause + # problems - so handle that. + import win32api, win32con + pyd_name = os.path.join(os.path.dirname(win32api.__file__), "dbi.pyd") + pyd_d_name = os.path.join(os.path.dirname(win32api.__file__), "dbi_d.pyd") + py_name = os.path.join(os.path.dirname(win32con.__file__), "dbi.py") + for this_pyd in (pyd_name, pyd_d_name): + this_dest = this_pyd + ".old" + if os.path.isfile(this_pyd) and os.path.isfile(py_name): + try: + if os.path.isfile(this_dest): + print("Old dbi '%s' already exists - deleting '%s'" % (this_dest, this_pyd)) + os.remove(this_pyd) + else: + os.rename(this_pyd, this_dest) + print("renamed '%s'->'%s.old'" % (this_pyd, this_pyd)) + except os.error as exc: + print("FAILED to rename '%s': %s" % (this_pyd, exc)) + def install(): import distutils.sysconfig *************** *** 372,375 **** --- 393,399 ---- "been registered") + # misc other fixups. + fixup_dbi() + # Register Pythonwin in context menu try: *************** *** 483,486 **** --- 507,521 ---- for fname in glob.glob(os.path.join(pywin_dir, "*.cfc")): os.remove(fname) + + # The dbi.pyd.old files we may have created. + try: + os.remove(os.path.join(lib_dir, "win32", "dbi.pyd.old")) + except os.error: + pass + try: + os.remove(os.path.join(lib_dir, "win32", "dbi_d.pyd.old")) + except os.error: + pass + except Exception as why: print("Failed to remove misc files:", why) Index: CHANGES.txt =================================================================== RCS file: /cvsroot/pywin32/pywin32/CHANGES.txt,v retrieving revision 1.26.2.3 retrieving revision 1.26.2.4 diff -C2 -d -r1.26.2.3 -r1.26.2.4 *** CHANGES.txt 2 Nov 2008 12:55:54 -0000 1.26.2.3 --- CHANGES.txt 27 Nov 2008 11:31:03 -0000 1.26.2.4 *************** *** 9,12 **** --- 9,32 ---- ---------------- + * Lots of work to better support unicode, py3k and 64bits from Roger. + Most of these changes will be invisible, and those that are not + are detailed elsewhere. + + * ODBC module - todo - add more about this. + + * pythoncom.__future_currency__ is no longer supported - the decimal + module is now used unconditionally when returning 'currency' variants. + See the win32com readme for more. + + * If you *implement* (not use) any of the following interfaces, take note: + IErrorLog, IPropertyBag, ICatInformation and IStorage have been upgraded + to have unicode passed instead of strings as args to the implementation + methods. + + * win32gui: RegisterDeviceNotification and EnumPropsExW didn't release the + GIL, which could cause a deadlock in multi-threaded Python apps. + + * Fix bug in win32timezone.GetSortedTimeZoneNames() on WinNT. + * win32com.internet gets support for IDocHostUIHandler, IHTMLOMWindowServices and IInternetSecurityManager interfaces, and CoInternetCreateSecurityManager *************** *** 32,35 **** --- 52,59 ---- Since build 211: ---------------- + * adodbapi updated to version 2.2. Supports Iron Python. Better + logic for .rowcount. New .cvtString convertion method. Multiple + result sets work correctly. Code cleanup and eliminate classic + classes and string exceptions. Fix CoInitialize bug. * Remove warning about VARDESCs in obscure circumstances when using |
|
From: Mark H. <mha...@us...> - 2008-11-27 12:17:24
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/debugger In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25938/Pythonwin/pywin/debugger Modified Files: Tag: py3k dbgcon.py debugger.py Log Message: merge lots of fixes from the trunk Index: debugger.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/debugger/debugger.py,v retrieving revision 1.17.2.4 retrieving revision 1.17.2.5 diff -C2 -d -r1.17.2.4 -r1.17.2.5 *** debugger.py 26 Nov 2008 07:17:38 -0000 1.17.2.4 --- debugger.py 27 Nov 2008 11:31:03 -0000 1.17.2.5 *************** *** 312,316 **** from bdb import Breakpoint ! for bplist in Breakpoint.bplist.itervalues(): for bp in bplist: if id(bp)==item_id: --- 312,316 ---- from bdb import Breakpoint ! for bplist in Breakpoint.bplist.values(): for bp in bplist: if id(bp)==item_id: *************** *** 326,330 **** item_id = self.GetItem(num)[6] from bdb import Breakpoint ! for bplist in Breakpoint.bplist.itervalues(): for bp in bplist: if id(bp)==item_id: --- 326,330 ---- item_id = self.GetItem(num)[6] from bdb import Breakpoint ! for bplist in Breakpoint.bplist.values(): for bp in bplist: if id(bp)==item_id: *************** *** 340,344 **** index = -1 from bdb import Breakpoint ! for bplist in Breakpoint.bplist.itervalues(): for bp in bplist: baseName = os.path.split(bp.file)[1] --- 340,344 ---- index = -1 from bdb import Breakpoint ! for bplist in Breakpoint.bplist.values(): for bp in bplist: baseName = os.path.split(bp.file)[1] Index: dbgcon.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/debugger/dbgcon.py,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -C2 -d -r1.1.4.2 -r1.1.4.3 *** dbgcon.py 23 Oct 2008 09:45:16 -0000 1.1.4.2 --- dbgcon.py 27 Nov 2008 11:31:03 -0000 1.1.4.3 *************** *** 25,28 **** def SaveDebuggerOptions(opts): ! for key, val in opts.iteritems(): win32ui.WriteProfileVal("Debugger Options", key, val) --- 25,28 ---- def SaveDebuggerOptions(opts): ! for key, val in opts.items(): win32ui.WriteProfileVal("Debugger Options", key, val) |
|
From: Mark H. <mha...@us...> - 2008-11-27 12:17:20
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25938/Pythonwin/pywin/scintilla Modified Files: Tag: py3k IDLEenvironment.py bindings.py formatter.py view.py Log Message: merge lots of fixes from the trunk Index: IDLEenvironment.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla/IDLEenvironment.py,v retrieving revision 1.11.2.2 retrieving revision 1.11.2.3 diff -C2 -d -r1.11.2.2 -r1.11.2.3 *** IDLEenvironment.py 24 Sep 2008 21:00:40 -0000 1.11.2.2 --- IDLEenvironment.py 27 Nov 2008 11:31:03 -0000 1.11.2.3 *************** *** 43,55 **** def fast_readline(self): if self.finished: ! return "" ! if "_scint_lines" not in self.__dict__: ! # XXX - note - assumes this is only called once the file is loaded! ! self._scint_lines = self.text.edit.GetTextRange().split("\n") ! sl = self._scint_lines ! i = self.i = self.i + 1 ! if i >= len(sl): ! return b"" ! return (sl[i]+"\n").encode(default_scintilla_encoding) try: --- 43,58 ---- def fast_readline(self): if self.finished: ! val = "" ! else: ! if "_scint_lines" not in self.__dict__: ! # XXX - note - assumes this is only called once the file is loaded! ! self._scint_lines = self.text.edit.GetTextRange().split("\n") ! sl = self._scint_lines ! i = self.i = self.i + 1 ! if i >= len(sl): ! val = "" ! else: ! val = sl[i]+"\n" ! return val.encode(default_scintilla_encoding) try: *************** *** 71,75 **** self.extension_menus = None try: ! for ext in list(self.extensions.values()): closer = getattr(ext, "close", None) if closer is not None: --- 74,78 ---- self.extension_menus = None try: ! for ext in self.extensions.values(): closer = getattr(ext, "close", None) if closer is not None: *************** *** 96,100 **** bindings = self.edit.bindings ret = [] ! for ext in list(self.extensions.values()): menudefs = getattr(ext, "menudefs", []) for name, items in menudefs: --- 99,103 ---- bindings = self.edit.bindings ret = [] ! for ext in self.extensions.values(): menudefs = getattr(ext, "menudefs", []) for name, items in menudefs: Index: view.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla/view.py,v retrieving revision 1.28.2.4 retrieving revision 1.28.2.5 diff -C2 -d -r1.28.2.4 -r1.28.2.5 *** view.py 8 Sep 2008 04:08:27 -0000 1.28.2.4 --- view.py 27 Nov 2008 11:31:03 -0000 1.28.2.5 *************** *** 1,2 **** --- 1,4 ---- + # A general purpose MFC CCtrlView view that uses Scintilla. + from . import control from . import IDLEenvironment # IDLE emulation. *************** *** 4,8 **** from pywin.mfc import dialog from . import scintillacon - import win32con import win32ui --- 6,9 ---- *************** *** 528,532 **** curclass = None # Find out which class we are in ! for item in list(clbrdata.values()): if item.module==curmodule: item_lineno = item.lineno - 1 # Scintilla counts lines from 0, whereas pyclbr - from 1 --- 529,533 ---- curclass = None # Find out which class we are in ! for item in clbrdata.values(): if item.module==curmodule: item_lineno = item.lineno - 1 # Scintilla counts lines from 0, whereas pyclbr - from 1 Index: bindings.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla/bindings.py,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -C2 -d -r1.5.2.1 -r1.5.2.2 *** bindings.py 29 Aug 2008 06:16:42 -0000 1.5.2.1 --- bindings.py 27 Nov 2008 11:31:03 -0000 1.5.2.2 *************** *** 51,55 **** def complete_configure(self): ! for id in list(command_to_events.keys()): self.parent_view.HookCommand(self._OnCommand, id) --- 51,55 ---- def complete_configure(self): ! for id in command_to_events.keys(): self.parent_view.HookCommand(self._OnCommand, id) Index: formatter.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla/formatter.py,v retrieving revision 1.14.2.1 retrieving revision 1.14.2.2 diff -C2 -d -r1.14.2.1 -r1.14.2.2 *** formatter.py 29 Aug 2008 06:16:42 -0000 1.14.2.1 --- formatter.py 27 Nov 2008 11:31:03 -0000 1.14.2.2 *************** *** 85,89 **** def HookFormatter(self, parent = None): ! raise NotImplementedError # Used by the IDLE extensions to quickly determine if a character is a string. --- 85,89 ---- def HookFormatter(self, parent = None): ! raise NotImplementedError() # Used by the IDLE extensions to quickly determine if a character is a string. *************** *** 107,111 **** def SetStyles(self): ! raise NotImplementedError def GetSampleText(self): --- 107,111 ---- def SetStyles(self): ! raise NotImplementedError() def GetSampleText(self): |
|
From: Mark H. <mha...@us...> - 2008-11-27 12:17:11
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25938/Pythonwin/pywin/tools Modified Files: Tag: py3k browseProjects.py browser.py hierlist.py regpy.py Log Message: merge lots of fixes from the trunk Index: regpy.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools/regpy.py,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** regpy.py 29 Aug 2008 06:16:42 -0000 1.1.4.1 --- regpy.py 27 Nov 2008 11:31:03 -0000 1.1.4.2 *************** *** 1,5 **** # (sort-of) Registry editor import win32ui ! from pywin.mfc import dialog import win32con import commctrl --- 1,5 ---- # (sort-of) Registry editor import win32ui ! import dialog import win32con import commctrl Index: hierlist.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools/hierlist.py,v retrieving revision 1.7.2.2 retrieving revision 1.7.2.3 diff -C2 -d -r1.7.2.2 -r1.7.2.3 *** hierlist.py 2 Oct 2008 13:06:36 -0000 1.7.2.2 --- hierlist.py 27 Nov 2008 11:31:03 -0000 1.7.2.3 *************** *** 56,60 **** self.filledItemHandlesMap = {} self.bitmapMask = bitmapMask - def __getattr__(self, attr): try: --- 56,59 ---- Index: browser.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools/browser.py,v retrieving revision 1.10.2.3 retrieving revision 1.10.2.4 diff -C2 -d -r1.10.2.3 -r1.10.2.4 *** browser.py 24 Nov 2008 06:14:33 -0000 1.10.2.3 --- browser.py 27 Nov 2008 11:31:03 -0000 1.10.2.4 *************** *** 9,12 **** --- 9,13 ---- import win32ui from pywin.mfc import dialog + from . import hierlist from types import * *************** *** 64,68 **** ret = [] try: ! for (key, ob) in list(self.myobject.__dict__.items()): if key not in special_names: ret.append(MakeHLI( ob, key ) ) --- 65,69 ---- ret = [] try: ! for (key, ob) in self.myobject.__dict__.items(): if key not in special_names: ret.append(MakeHLI( ob, key ) ) *************** *** 93,97 **** return 1 try: ! for key in list(self.myobject.__dict__.keys()): if key not in special_names: return 1 --- 94,98 ---- return 1 try: ! for key in self.myobject.__dict__.keys(): if key not in special_names: return 1 Index: browseProjects.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools/browseProjects.py,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** browseProjects.py 29 Aug 2008 06:16:42 -0000 1.3.2.1 --- browseProjects.py 27 Nov 2008 11:31:03 -0000 1.3.2.2 *************** *** 57,61 **** for c in self.super: ret.append(HLICLBRClass(c, " (Parent class)")) ! for meth, lineno in list(self.methods.items()): ret.append(HLICLBRMethod(meth, self.file, lineno, " (method)")) return ret --- 57,61 ---- for c in self.super: ret.append(HLICLBRClass(c, " (Parent class)")) ! for meth, lineno in self.methods.items(): ret.append(HLICLBRMethod(meth, self.file, lineno, " (method)")) return ret *************** *** 104,108 **** if data: ret = [] ! for item in list(data.values()): if item.__class__ != pyclbr.Class: # ie, it is a pyclbr Function instance (only introduced post 1.5.2) ret.append(HLICLBRFunction( item, " (function)" ) ) --- 104,108 ---- if data: ret = [] ! for item in data.values(): if item.__class__ != pyclbr.Class: # ie, it is a pyclbr Function instance (only introduced post 1.5.2) ret.append(HLICLBRFunction( item, " (function)" ) ) |
Update of /cvsroot/pywin32/pywin32/com/win32com/client In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25938/com/win32com/client Modified Files: Tag: py3k __init__.py combrowse.py dynamic.py gencache.py genpy.py makepy.py Log Message: merge lots of fixes from the trunk Index: makepy.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/makepy.py,v retrieving revision 1.25.2.4 retrieving revision 1.25.2.5 diff -C2 -d -r1.25.2.4 -r1.25.2.5 *** makepy.py 26 Nov 2008 07:17:39 -0000 1.25.2.4 --- makepy.py 27 Nov 2008 11:31:04 -0000 1.25.2.5 *************** *** 68,75 **** import sys, os, pythoncom ! from win32com.client import genpy ! ! from . import selecttlb ! from . import gencache from win32com.client import NeedUnicodeConversions, Dispatch --- 68,72 ---- import sys, os, pythoncom ! from win32com.client import genpy, selecttlb, gencache from win32com.client import NeedUnicodeConversions, Dispatch Index: dynamic.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/dynamic.py,v retrieving revision 1.22.2.5 retrieving revision 1.22.2.6 diff -C2 -d -r1.22.2.5 -r1.22.2.6 *** dynamic.py 26 Nov 2008 09:05:11 -0000 1.22.2.5 --- dynamic.py 27 Nov 2008 11:31:04 -0000 1.22.2.6 *************** *** 24,28 **** from . import build - from pywintypes import IIDType --- 24,27 ---- *************** *** 75,79 **** dispatchType = pythoncom.TypeIIDs[pythoncom.IID_IDispatch] iunkType = pythoncom.TypeIIDs[pythoncom.IID_IUnknown] ! _GoodDispatchTypes=(str, IIDType, str) _defaultDispatchItem=build.DispatchItem --- 74,78 ---- dispatchType = pythoncom.TypeIIDs[pythoncom.IID_IDispatch] iunkType = pythoncom.TypeIIDs[pythoncom.IID_IUnknown] ! _GoodDispatchTypes=[str, IIDType, str] _defaultDispatchItem=build.DispatchItem *************** *** 320,324 **** """Cleanup object - like a close - to force cleanup when you dont want to rely on Python's reference counting.""" ! for childCont in self._mapCachedItems_.itervalues(): childCont._Release_() self._mapCachedItems_ = {} --- 319,323 ---- """Cleanup object - like a close - to force cleanup when you dont want to rely on Python's reference counting.""" ! for childCont in self._mapCachedItems_.values(): childCont._Release_() self._mapCachedItems_ = {} *************** *** 345,358 **** try: print("Methods:") ! for method in list(self._olerepr_.mapFuncs.keys()): print("\t", method) print("Props:") ! for prop, entry in list(self._olerepr_.propMap.items()): print("\t%s = 0x%x - %s" % (prop, entry.dispid, repr(entry))) print("Get Props:") ! for prop, entry in list(self._olerepr_.propMapGet.items()): print("\t%s = 0x%x - %s" % (prop, entry.dispid, repr(entry))) print("Put Props:") ! for prop, entry in list(self._olerepr_.propMapPut.items()): print("\t%s = 0x%x - %s" % (prop, entry.dispid, repr(entry))) except: --- 344,357 ---- try: print("Methods:") ! for method in self._olerepr_.mapFuncs.keys(): print("\t", method) print("Props:") ! for prop, entry in self._olerepr_.propMap.items(): print("\t%s = 0x%x - %s" % (prop, entry.dispid, repr(entry))) print("Get Props:") ! for prop, entry in self._olerepr_.propMapGet.items(): print("\t%s = 0x%x - %s" % (prop, entry.dispid, repr(entry))) print("Put Props:") ! for prop, entry in self._olerepr_.propMapPut.items(): print("\t%s = 0x%x - %s" % (prop, entry.dispid, repr(entry))) except: Index: combrowse.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/combrowse.py,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -C2 -d -r1.8.2.3 -r1.8.2.4 *** combrowse.py 26 Nov 2008 09:03:29 -0000 1.8.2.3 --- combrowse.py 27 Nov 2008 11:31:04 -0000 1.8.2.4 *************** *** 520,524 **** from pywin.tools import hierlist root = HLIRoot("COM Browser") ! if sys.modules.has_key("app"): # do it in a window browser.MakeTemplate() --- 520,524 ---- from pywin.tools import hierlist root = HLIRoot("COM Browser") ! if "app" in sys.modules: # do it in a window browser.MakeTemplate() Index: __init__.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/__init__.py,v retrieving revision 1.34.4.4 retrieving revision 1.34.4.5 diff -C2 -d -r1.34.4.4 -r1.34.4.5 *** __init__.py 26 Nov 2008 07:17:39 -0000 1.34.4.4 --- __init__.py 27 Nov 2008 11:31:04 -0000 1.34.4.5 *************** *** 11,15 **** import pythoncom ! from . import dynamic, gencache import sys import pywintypes --- 11,16 ---- import pythoncom ! from . import dynamic ! from . import gencache import sys import pywintypes Index: genpy.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/genpy.py,v retrieving revision 1.55.2.5 retrieving revision 1.55.2.6 diff -C2 -d -r1.55.2.5 -r1.55.2.6 *** genpy.py 27 Nov 2008 05:36:19 -0000 1.55.2.5 --- genpy.py 27 Nov 2008 11:31:04 -0000 1.55.2.6 *************** *** 211,223 **** if vdesc[4] == pythoncom.VAR_CONST: val = vdesc[1] ! if sys.version_info <= (2,4) and (isinstance(val, int) or isinstance(val, long)): if val==0x80000000: # special case use = "0x80000000L" # 'L' for future warning elif val > 0x80000000 or val < 0: # avoid a FutureWarning ! use = long(val) else: use = hex(val) else: ! use = repr(str(val)) print("\t%-30s=%-10s # from enum %s" % \ (build.MakePublicAttributeName(name, True), use, enumName), file=stream) --- 211,223 ---- if vdesc[4] == pythoncom.VAR_CONST: val = vdesc[1] ! if sys.version_info <= (2,4) and (isinstance(val, int) or isinstance(val, int)): if val==0x80000000: # special case use = "0x80000000L" # 'L' for future warning elif val > 0x80000000 or val < 0: # avoid a FutureWarning ! use = int(val) else: use = hex(val) else: ! use = repr(val) print("\t%-30s=%-10s # from enum %s" % \ (build.MakePublicAttributeName(name, True), use, enumName), file=stream) *************** *** 821,825 **** encoding = self.file.encoding # or "mbcs" ! print('# -*- coding: mbcs -*-', file=self.file) # Is this always correct? print('# Created by makepy.py version %s' % (makepy_version,), file=self.file) print('# By python version %s' % \ --- 821,825 ---- encoding = self.file.encoding # or "mbcs" ! print('# -*- coding: %s -*-' % (encoding,), file=self.file) print('# Created by makepy.py version %s' % (makepy_version,), file=self.file) print('# By python version %s' % \ *************** *** 832,839 **** print('makepy_version =', repr(makepy_version), file=self.file) ! try: ! print('python_version = 0x%x' % (sys.hexversion,), file=self.file) ! except AttributeError: ! print('python_version = 0x0 # Presumably Python 1.5.2 - 0x0 is not a problem', file=self.file) print(file=self.file) print('import win32com.client.CLSIDToClass, pythoncom', file=self.file) --- 832,836 ---- print('makepy_version =', repr(makepy_version), file=self.file) ! print('python_version = 0x%x' % (sys.hexversion,), file=self.file) print(file=self.file) print('import win32com.client.CLSIDToClass, pythoncom', file=self.file) *************** *** 873,879 **** if enumItems: print("class constants:", file=stream) ! values = list(enumItems.values()) ! values.sort() ! for oleitem in values: oleitem.WriteEnumerationItems(stream) self.progress.Tick() --- 870,876 ---- if enumItems: print("class constants:", file=stream) ! items = list(enumItems.values()) ! items.sort() ! for oleitem in items: oleitem.WriteEnumerationItems(stream) self.progress.Tick() *************** *** 881,893 **** if self.generate_type == GEN_FULL: ! values = [v for v in oleItems.values() if v is not None] ! values.sort() ! for oleitem in values: self.progress.Tick() oleitem.WriteClass(self) ! values = list(vtableItems.values()) ! values.sort() ! for oleitem in values: self.progress.Tick() oleitem.WriteClass(self) --- 878,890 ---- if self.generate_type == GEN_FULL: ! items = [l for l in oleItems.values() if l is not None] ! items.sort() ! for oleitem in items: self.progress.Tick() oleitem.WriteClass(self) ! items = list(vtableItems.values()) ! items.sort() ! for oleitem in items: self.progress.Tick() oleitem.WriteClass(self) Index: gencache.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/gencache.py,v retrieving revision 1.32.2.3 retrieving revision 1.32.2.4 diff -C2 -d -r1.32.2.3 -r1.32.2.4 *** gencache.py 27 Nov 2008 05:36:19 -0000 1.32.2.3 --- gencache.py 27 Nov 2008 11:31:04 -0000 1.32.2.4 *************** *** 584,588 **** zip_pos = win32com.__gen_path__.find(".zip\\") if zip_pos >= 0: ! import zipfile, io zip_file = win32com.__gen_path__[:zip_pos+4] zip_path = win32com.__gen_path__[zip_pos+5:].replace("\\", "/") --- 584,588 ---- zip_pos = win32com.__gen_path__.find(".zip\\") if zip_pos >= 0: ! import zipfile zip_file = win32com.__gen_path__[:zip_pos+4] zip_path = win32com.__gen_path__[zip_pos+5:].replace("\\", "/") |
|
From: Mark H. <mha...@us...> - 2008-11-27 12:16:53
|
Update of /cvsroot/pywin32/pywin32/win32/Lib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25938/win32/Lib Modified Files: Tag: py3k commctrl.py mmsystem.py netbios.py regcheck.py regutil.py win32evtlogutil.py win32pdhquery.py win32pdhutil.py win32rcparser.py win32serviceutil.py win32timezone.py win32traceutil.py Log Message: merge lots of fixes from the trunk Index: regcheck.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/regcheck.py,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -C2 -d -r1.6.2.2 -r1.6.2.3 *** regcheck.py 23 Oct 2008 09:45:16 -0000 1.6.2.2 --- regcheck.py 27 Nov 2008 11:31:05 -0000 1.6.2.3 *************** *** 5,10 **** warnings.warn("The regcheck module has been pending deprecation since build 210", category=PendingDeprecationWarning) ! from . import win32con ! from . import regutil import win32api import os --- 5,11 ---- warnings.warn("The regcheck module has been pending deprecation since build 210", category=PendingDeprecationWarning) ! ! import win32con ! import regutil import win32api import os *************** *** 67,71 **** key = win32api.RegOpenKey(regutil.GetRootKey(), regutil.BuildDefaultPythonKey() + "\\Help", 0, win32con.KEY_READ) except win32api.error as exc: ! from . import winerror if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND: raise --- 68,72 ---- key = win32api.RegOpenKey(regutil.GetRootKey(), regutil.BuildDefaultPythonKey() + "\\Help", 0, win32con.KEY_READ) except win32api.error as exc: ! import winerror if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND: raise *************** *** 87,91 **** keyNo = keyNo + 1 except win32api.error as exc: ! from . import winerror if exc.winerror!=winerror.ERROR_NO_MORE_ITEMS: raise --- 88,92 ---- keyNo = keyNo + 1 except win32api.error as exc: ! import winerror if exc.winerror!=winerror.ERROR_NO_MORE_ITEMS: raise *************** *** 101,106 **** print("WARNING: 'Modules' registry entry is deprectated and evil!") except win32api.error as exc: ! from . import winerror ! if exc.strerror!=winerror.ERROR_FILE_NOT_FOUND: raise return --- 102,107 ---- print("WARNING: 'Modules' registry entry is deprectated and evil!") except win32api.error as exc: ! import winerror ! if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND: raise return Index: win32timezone.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32timezone.py,v retrieving revision 1.9.2.4 retrieving revision 1.9.2.5 diff -C2 -d -r1.9.2.4 -r1.9.2.5 *** win32timezone.py 27 Nov 2008 04:58:42 -0000 1.9.2.4 --- win32timezone.py 27 Nov 2008 11:31:10 -0000 1.9.2.5 *************** *** 569,573 **** def __getitem__(self, item): ! sortedKeys = self.keys() sortedKeys.sort(self.sort) if isinstance(item, RangeItem): --- 569,573 ---- def __getitem__(self, item): ! sortedKeys = list(self.keys()) sortedKeys.sort(self.sort) if isinstance(item, RangeItem): *************** *** 588,592 **** def bounds(self): ! sortedKeys = self.keys() sortedKeys.sort(self.sort) return sortedKeys[RangeItemFirst()], sortedKeys[RangeItemLast()] --- 588,592 ---- def bounds(self): ! sortedKeys = list(self.keys()) sortedKeys.sort(self.sort) return sortedKeys[RangeItemFirst()], sortedKeys[RangeItemLast()] Index: commctrl.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/commctrl.py,v retrieving revision 1.6.4.1 retrieving revision 1.6.4.2 diff -C2 -d -r1.6.4.1 -r1.6.4.2 *** commctrl.py 29 Aug 2008 04:59:25 -0000 1.6.4.1 --- commctrl.py 27 Nov 2008 11:31:05 -0000 1.6.4.2 *************** *** 110,115 **** CDIS_MARKED = 128 CDIS_INDETERMINATE = 256 ! CLR_NONE = 0xFFFFFFFF ! CLR_DEFAULT = 0xFF000000 ILC_MASK = 1 ILC_COLOR = 0 --- 110,115 ---- CDIS_MARKED = 128 CDIS_INDETERMINATE = 256 ! CLR_NONE = -1 # 0xFFFFFFFFL ! CLR_DEFAULT = -16777216 # 0xFF000000L ILC_MASK = 1 ILC_COLOR = 0 Index: win32pdhquery.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32pdhquery.py,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** win32pdhquery.py 25 Apr 2004 07:44:41 -0000 1.3 --- win32pdhquery.py 27 Nov 2008 11:31:07 -0000 1.3.4.1 *************** *** 345,349 **** ''' self.volatilecounters = [] ! apply(BaseQuery.__init__, (self,)+args, namedargs) def addperfcounter(self, object, counter, machine=None): ''' --- 345,349 ---- ''' self.volatilecounters = [] ! BaseQuery.__init__(*(self,)+args, **namedargs) def addperfcounter(self, object, counter, machine=None): ''' *************** *** 420,428 **** ''' # do all the normal opening stuff, self._base is now the query object ! apply(BaseQuery.open,(self,)+args, namedargs) # should rewrite getinstpaths to take a single tuple paths = [] for tup in self.volatilecounters: ! paths[len(paths):] = apply(self.getinstpaths, tup) for path in paths: try: --- 420,428 ---- ''' # do all the normal opening stuff, self._base is now the query object ! BaseQuery.open(*(self,)+args, **namedargs) # should rewrite getinstpaths to take a single tuple paths = [] for tup in self.volatilecounters: ! paths[len(paths):] = self.getinstpaths(*tup) for path in paths: try: *************** *** 446,450 **** try: self.open() ! for ind in xrange(totalperiod/period): tempresults.append(self.collectdata()) time.sleep(period) --- 446,450 ---- try: self.open() ! for ind in range(totalperiod/period): tempresults.append(self.collectdata()) time.sleep(period) Index: win32serviceutil.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32serviceutil.py,v retrieving revision 1.26.2.3 retrieving revision 1.26.2.4 diff -C2 -d -r1.26.2.3 -r1.26.2.4 *** win32serviceutil.py 27 Nov 2008 04:58:42 -0000 1.26.2.3 --- win32serviceutil.py 27 Nov 2008 11:31:10 -0000 1.26.2.4 *************** *** 642,646 **** InstallService(serviceClassString, serviceName, serviceDisplayName, serviceDeps = serviceDeps, startType=startup, bRunInteractive=interactive, userName=userName,password=password, exeName=exeName, perfMonIni=perfMonIni,perfMonDll=perfMonDll,exeArgs=exeArgs,description=description) if customOptionHandler: ! apply( customOptionHandler, (opts,) ) print("Service installed") except win32service.error as xxx_todo_changeme4: --- 642,646 ---- InstallService(serviceClassString, serviceName, serviceDisplayName, serviceDeps = serviceDeps, startType=startup, bRunInteractive=interactive, userName=userName,password=password, exeName=exeName, perfMonIni=perfMonIni,perfMonDll=perfMonDll,exeArgs=exeArgs,description=description) if customOptionHandler: ! customOptionHandler(*(opts,)) print("Service installed") except win32service.error as xxx_todo_changeme4: *************** *** 686,690 **** ChangeServiceConfig(serviceClassString, serviceName, serviceDeps = serviceDeps, startType=startup, bRunInteractive=interactive, userName=userName,password=password, exeName=exeName, displayName = serviceDisplayName, perfMonIni=perfMonIni,perfMonDll=perfMonDll,exeArgs=exeArgs,description=description) if customOptionHandler: ! apply( customOptionHandler, (opts,) ) print("Service updated") except win32service.error as xxx_todo_changeme5: --- 686,690 ---- ChangeServiceConfig(serviceClassString, serviceName, serviceDeps = serviceDeps, startType=startup, bRunInteractive=interactive, userName=userName,password=password, exeName=exeName, displayName = serviceDisplayName, perfMonIni=perfMonIni,perfMonDll=perfMonDll,exeArgs=exeArgs,description=description) if customOptionHandler: ! customOptionHandler(*(opts,)) print("Service updated") except win32service.error as xxx_todo_changeme5: Index: regutil.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/regutil.py,v retrieving revision 1.3.4.2 retrieving revision 1.3.4.3 diff -C2 -d -r1.3.4.2 -r1.3.4.3 *** regutil.py 23 Oct 2008 09:45:16 -0000 1.3.4.2 --- regutil.py 27 Nov 2008 11:31:05 -0000 1.3.4.3 *************** *** 91,95 **** win32api.RegDeleteKey(GetRootKey(), GetAppPathsKey() + "\\" + exeAlias) except win32api.error as exc: ! from . import winerror if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND: raise --- 91,95 ---- win32api.RegDeleteKey(GetRootKey(), GetAppPathsKey() + "\\" + exeAlias) except win32api.error as exc: ! import winerror if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND: raise *************** *** 110,114 **** win32api.RegDeleteKey(GetRootKey(), keyStr) except win32api.error as exc: ! from . import winerror if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND: raise --- 110,114 ---- win32api.RegDeleteKey(GetRootKey(), keyStr) except win32api.error as exc: ! import winerror if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND: raise *************** *** 123,127 **** return win32api.RegQueryValue(GetRootKey(), keyStr) except win32api.error as exc: ! from . import winerror if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND: raise --- 123,127 ---- return win32api.RegQueryValue(GetRootKey(), keyStr) except win32api.error as exc: ! import winerror if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND: raise *************** *** 155,159 **** BuildDefaultPythonKey() + "\\Modules\\%s" % modName) except win32api.error as exc: ! from . import winerror if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND: raise --- 155,159 ---- BuildDefaultPythonKey() + "\\Modules\\%s" % modName) except win32api.error as exc: ! import winerror if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND: raise *************** *** 203,207 **** win32api.RegDeleteValue(key, helpFile) except win32api.error as exc: ! from . import winerror if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND: raise --- 203,207 ---- win32api.RegDeleteValue(key, helpFile) except win32api.error as exc: ! import winerror if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND: raise *************** *** 215,219 **** BuildDefaultPythonKey() + "\\Help\\%s" % helpDesc) except win32api.error as exc: ! from . import winerror if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND: raise --- 215,219 ---- BuildDefaultPythonKey() + "\\Help\\%s" % helpDesc) except win32api.error as exc: ! import winerror if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND: raise Index: win32rcparser.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32rcparser.py,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -C2 -d -r1.5.2.1 -r1.5.2.2 *** win32rcparser.py 26 Nov 2008 09:03:30 -0000 1.5.2.1 --- win32rcparser.py 27 Nov 2008 11:31:10 -0000 1.5.2.2 *************** *** 214,218 **** i = int(lex.get_token()) self.ids[n] = i ! if self.names.has_key(i): # Dupe ID really isn't a problem - most consumers # want to go from name->id, and this is OK. --- 214,218 ---- i = int(lex.get_token()) self.ids[n] = i ! if i in self.names: # Dupe ID really isn't a problem - most consumers # want to go from name->id, and this is OK. Index: win32pdhutil.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32pdhutil.py,v retrieving revision 1.12.4.1 retrieving revision 1.12.4.2 diff -C2 -d -r1.12.4.1 -r1.12.4.2 *** win32pdhutil.py 28 Sep 2008 19:51:43 -0000 1.12.4.1 --- win32pdhutil.py 27 Nov 2008 11:31:10 -0000 1.12.4.2 *************** *** 112,116 **** # Bit of a hack to get useful info. items = [find_pdh_counter_localized_name("ID Process")] + items[:5] ! print ("Process Name", ",".join(items)) for instance, max_instances in instance_dict.items(): for inum in range(max_instances+1): --- 112,116 ---- # Bit of a hack to get useful info. items = [find_pdh_counter_localized_name("ID Process")] + items[:5] ! print("Process Name", ",".join(items)) for instance, max_instances in instance_dict.items(): for inum in range(max_instances+1): *************** *** 126,137 **** time.sleep(0.01) win32pdh.CollectQueryData(hq) ! print ("%-15s\t" % (instance[:15]),) for hc in hcs: type, val = win32pdh.GetFormattedCounterValue(hc, win32pdh.PDH_FMT_LONG) ! print ("%5d" % (val),) win32pdh.RemoveCounter(hc) ! print win32pdh.CloseQuery(hq) def BrowseCallBackDemo(counter): machine, object, instance, parentInstance, index, counterName = \ --- 126,139 ---- time.sleep(0.01) win32pdh.CollectQueryData(hq) ! print("%-15s\t" % (instance[:15]), end=' ') for hc in hcs: type, val = win32pdh.GetFormattedCounterValue(hc, win32pdh.PDH_FMT_LONG) ! print("%5d" % (val), end=' ') win32pdh.RemoveCounter(hc) ! print() win32pdh.CloseQuery(hq) + # NOTE: This BrowseCallback doesn't seem to work on Vista for markh. + # XXX - look at why!? def BrowseCallBackDemo(counter): machine, object, instance, parentInstance, index, counterName = \ *************** *** 140,145 **** result = GetPerformanceAttributes(object, counterName, instance, index, win32pdh.PDH_FMT_DOUBLE, machine) ! print ("Value of '%s' is" % counter, result) ! print ("Added '%s' on object '%s' (machine %s), instance %s(%d)-parent of %s" \ % (counterName, object, machine, instance, index, parentInstance)) --- 142,147 ---- result = GetPerformanceAttributes(object, counterName, instance, index, win32pdh.PDH_FMT_DOUBLE, machine) ! print("Value of '%s' is" % counter, result) ! print("Added '%s' on object '%s' (machine %s), instance %s(%d)-parent of %s" \ % (counterName, object, machine, instance, index, parentInstance)) *************** *** 152,161 **** # Show how to get a couple of attributes by name. counter = find_pdh_counter_localized_name("Virtual Bytes") ! print ("Virtual Bytes = ", FindPerformanceAttributesByName("python", counter=counter)) ! print ("Available Bytes = ", GetPerformanceAttributes( find_pdh_counter_localized_name("Memory"), find_pdh_counter_localized_name("Available Bytes"))) # And a browser. ! print ("Browsing for counters...") browse() --- 154,163 ---- # Show how to get a couple of attributes by name. counter = find_pdh_counter_localized_name("Virtual Bytes") ! print("Virtual Bytes = ", FindPerformanceAttributesByName("python", counter=counter)) ! print("Available Bytes = ", GetPerformanceAttributes( find_pdh_counter_localized_name("Memory"), find_pdh_counter_localized_name("Available Bytes"))) # And a browser. ! print("Browsing for counters...") browse() Index: win32traceutil.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32traceutil.py,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** win32traceutil.py 29 Aug 2008 04:59:25 -0000 1.3.2.1 --- win32traceutil.py 27 Nov 2008 11:31:10 -0000 1.3.2.2 *************** *** 33,37 **** pass # Oh well! win32trace.InitRead() ! print ("Collecting Python Trace Output...") try: while 1: --- 33,37 ---- pass # Oh well! win32trace.InitRead() ! print("Collecting Python Trace Output...") try: while 1: *************** *** 39,43 **** sys.stdout.write(win32trace.blockingread(500)) except KeyboardInterrupt: ! print ("Ctrl+C") --- 39,43 ---- sys.stdout.write(win32trace.blockingread(500)) except KeyboardInterrupt: ! print("Ctrl+C") *************** *** 45,49 **** win32trace.InitWrite() try: # Under certain servers, sys.stdout may be invalid. ! print ("Redirecting output to win32trace remote collector") except: pass --- 45,49 ---- win32trace.InitWrite() try: # Under certain servers, sys.stdout may be invalid. ! print("Redirecting output to win32trace remote collector") except: pass Index: win32evtlogutil.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32evtlogutil.py,v retrieving revision 1.10.4.2 retrieving revision 1.10.4.3 diff -C2 -d -r1.10.4.2 -r1.10.4.3 *** win32evtlogutil.py 27 Nov 2008 04:58:41 -0000 1.10.4.2 --- win32evtlogutil.py 27 Nov 2008 11:31:07 -0000 1.10.4.3 *************** *** 149,153 **** if not objects: break ! map(lambda item, feeder = feeder: apply(feeder, (item,)), objects) finally: win32evtlog.CloseEventLog(h) --- 149,153 ---- if not objects: break ! map(lambda item, feeder = feeder: feeder(*(item,)), objects) finally: win32evtlog.CloseEventLog(h) Index: mmsystem.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/mmsystem.py,v retrieving revision 1.2.4.1 retrieving revision 1.2.4.2 diff -C2 -d -r1.2.4.1 -r1.2.4.2 *** mmsystem.py 29 Aug 2008 04:59:25 -0000 1.2.4.1 --- mmsystem.py 27 Nov 2008 11:31:05 -0000 1.2.4.2 *************** *** 141,145 **** WIM_CLOSE = MM_WIM_CLOSE WIM_DATA = MM_WIM_DATA ! WAVE_MAPPER = 0xFFFFFFFF WAVE_FORMAT_QUERY = 0x0001 WAVE_ALLOWSYNC = 0x0002 --- 141,145 ---- WIM_CLOSE = MM_WIM_CLOSE WIM_DATA = MM_WIM_DATA ! WAVE_MAPPER = -1 # 0xFFFFFFFF WAVE_FORMAT_QUERY = 0x0001 WAVE_ALLOWSYNC = 0x0002 *************** *** 214,218 **** MHDR_ISSTRM = 0x00000008 MEVT_F_SHORT = 0x00000000 ! MEVT_F_LONG = 0x80000000 MEVT_F_CALLBACK = 0x40000000 def MEVT_EVENTTYPE(x): return ((BYTE)(((x)>>24)&0xFF)) --- 214,218 ---- MHDR_ISSTRM = 0x00000008 MEVT_F_SHORT = 0x00000000 ! MEVT_F_LONG = -2147483648 # 0x80000000 MEVT_F_CALLBACK = 0x40000000 def MEVT_EVENTTYPE(x): return ((BYTE)(((x)>>24)&0xFF)) *************** *** 221,225 **** MIDISTRM_ERROR = (-2) ! MIDIPROP_SET = 0x80000000 MIDIPROP_GET = 0x40000000 MIDIPROP_TIMEDIV = 0x00000001 --- 221,225 ---- MIDISTRM_ERROR = (-2) ! MIDIPROP_SET = -2147483648 # 0x80000000 MIDIPROP_GET = 0x40000000 MIDIPROP_TIMEDIV = 0x00000001 *************** *** 235,239 **** MIXERR_INVALVALUE = (MIXERR_BASE + 2) MIXERR_LASTERROR = (MIXERR_BASE + 2) ! MIXER_OBJECTF_HANDLE = 0x80000000 MIXER_OBJECTF_MIXER = 0x00000000 MIXER_OBJECTF_HMIXER = (MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_MIXER) --- 235,239 ---- MIXERR_INVALVALUE = (MIXERR_BASE + 2) MIXERR_LASTERROR = (MIXERR_BASE + 2) ! MIXER_OBJECTF_HANDLE = -2147483648 # 0x80000000 MIXER_OBJECTF_MIXER = 0x00000000 MIXER_OBJECTF_HMIXER = (MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_MIXER) *************** *** 249,253 **** MIXERLINE_LINEF_ACTIVE = 0x00000001 MIXERLINE_LINEF_DISCONNECTED = 0x00008000 ! MIXERLINE_LINEF_SOURCE = 0x80000000 MIXERLINE_COMPONENTTYPE_DST_FIRST = 0x00000000 MIXERLINE_COMPONENTTYPE_DST_UNDEFINED = (MIXERLINE_COMPONENTTYPE_DST_FIRST + 0) --- 249,253 ---- MIXERLINE_LINEF_ACTIVE = 0x00000001 MIXERLINE_LINEF_DISCONNECTED = 0x00008000 ! MIXERLINE_LINEF_SOURCE = -2147483648 # 0x80000000 MIXERLINE_COMPONENTTYPE_DST_FIRST = 0x00000000 MIXERLINE_COMPONENTTYPE_DST_UNDEFINED = (MIXERLINE_COMPONENTTYPE_DST_FIRST + 0) *************** *** 288,293 **** MIXERCONTROL_CONTROLF_UNIFORM = 0x00000001 MIXERCONTROL_CONTROLF_MULTIPLE = 0x00000002 ! MIXERCONTROL_CONTROLF_DISABLED = 0x80000000 ! MIXERCONTROL_CT_CLASS_MASK = 0xF0000000 MIXERCONTROL_CT_CLASS_CUSTOM = 0x00000000 MIXERCONTROL_CT_CLASS_METER = 0x10000000 --- 288,293 ---- MIXERCONTROL_CONTROLF_UNIFORM = 0x00000001 MIXERCONTROL_CONTROLF_MULTIPLE = 0x00000002 ! MIXERCONTROL_CONTROLF_DISABLED = -2147483648 # 0x80000000 ! MIXERCONTROL_CT_CLASS_MASK = -268435456 # 0xF0000000 MIXERCONTROL_CT_CLASS_CUSTOM = 0x00000000 MIXERCONTROL_CT_CLASS_METER = 0x10000000 *************** *** 400,404 **** JOY_BUTTON30 = 0x20000000 JOY_BUTTON31 = 0x40000000 ! JOY_BUTTON32 = 0x80000000 JOY_POVFORWARD = 0 JOY_POVRIGHT = 9000 --- 400,404 ---- JOY_BUTTON30 = 0x20000000 JOY_BUTTON31 = 0x40000000 ! JOY_BUTTON32 = -2147483648 # 0x80000000 JOY_POVFORWARD = 0 JOY_POVRIGHT = 9000 Index: netbios.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/netbios.py,v retrieving revision 1.4.4.1 retrieving revision 1.4.4.2 diff -C2 -d -r1.4.4.1 -r1.4.4.2 *** netbios.py 29 Aug 2008 04:59:25 -0000 1.4.4.1 --- netbios.py 27 Nov 2008 11:31:05 -0000 1.4.4.2 *************** *** 283,285 **** print("%02x" % (ch,), end=' ') print() - \ No newline at end of file --- 283,284 ---- |
|
From: Mark H. <mha...@us...> - 2008-11-27 12:16:49
|
Update of /cvsroot/pywin32/pywin32/win32/scripts/ce In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25938/win32/scripts/ce Modified Files: Tag: py3k pysynch.py Log Message: merge lots of fixes from the trunk Index: pysynch.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/scripts/ce/pysynch.py,v retrieving revision 1.2.4.1 retrieving revision 1.2.4.2 diff -C2 -d -r1.2.4.1 -r1.2.4.2 *** pysynch.py 26 Nov 2008 09:03:30 -0000 1.2.4.1 --- pysynch.py 27 Nov 2008 11:31:10 -0000 1.2.4.2 *************** *** 206,210 **** print("%-10s - %s" % ("Command", "Description")) print("%-10s - %s" % ("-------", "-----------")) ! for name, item in globals().items(): if type(item)==type(DumpCommands): doc = getattr(item, "__doc__", "") --- 206,210 ---- print("%-10s - %s" % ("Command", "Description")) print("%-10s - %s" % ("-------", "-----------")) ! for name, item in list(globals().items()): if type(item)==type(DumpCommands): doc = getattr(item, "__doc__", "") |
|
From: Mark H. <mha...@us...> - 2008-11-27 12:16:40
|
Update of /cvsroot/pywin32/pywin32/win32/scripts/VersionStamp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25938/win32/scripts/VersionStamp Modified Files: Tag: py3k bulkstamp.py Log Message: merge lots of fixes from the trunk Index: bulkstamp.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/scripts/VersionStamp/bulkstamp.py,v retrieving revision 1.6.4.1 retrieving revision 1.6.4.2 diff -C2 -d -r1.6.4.1 -r1.6.4.2 *** bulkstamp.py 26 Nov 2008 09:03:30 -0000 1.6.4.1 --- bulkstamp.py 27 Nov 2008 11:31:10 -0000 1.6.4.2 *************** *** 60,64 **** name = base[:-2] + ext is_dll = ext.lower() != ".exe" ! if descriptions.has_key(os.path.normcase(name)): desc = descriptions[os.path.normcase(name)] try: --- 60,64 ---- name = base[:-2] + ext is_dll = ext.lower() != ".exe" ! if os.path.normcase(name) in descriptions: desc = descriptions[os.path.normcase(name)] try: *************** *** 97,107 **** descriptions[key] = val ! if not retvars.has_key('product'): print('ERROR: description file is missing the product name.') sys.exit(1) ! if not retvars.has_key('major'): print('ERROR: description file is missing the major version number.') sys.exit(1) ! if not retvars.has_key('minor'): print('ERROR: description file is missing the minor version number.') sys.exit(1) --- 97,107 ---- descriptions[key] = val ! if 'product' not in retvars: print('ERROR: description file is missing the product name.') sys.exit(1) ! if 'major' not in retvars: print('ERROR: description file is missing the major version number.') sys.exit(1) ! if 'minor' not in retvars: print('ERROR: description file is missing the minor version number.') sys.exit(1) *************** *** 136,138 **** sys.exit(1) ! apply(scan, tuple(sys.argv[1:])) --- 136,138 ---- sys.exit(1) ! scan(*tuple(sys.argv[1:])) |
|
From: Mark H. <mha...@sk...> - 2008-11-27 12:02:49
|
I found some more time today. The trunk is in pretty good shape for 2to3. I recently took the approach of taking a clean checkout of the trunk, running 2to3 over it, then diffing the result with the .py files in the py3k branch. As a result I merged a number of changes back to both the trunk and that branch, so the vast majority of differences that remain are byte and similar issues. In other words, the .py files in the trunk and in the py3k branch are very close to being identical after being run through 2to3. This seems like a good sign :) The bzr py3k integration branch should also be up-to-date wrt these .py files. This time I *really* will not find more time for a week or 2 :) Cheers, Mark > [Roger - I'm not sure you are seeing the messages to the checkins list > - let me know if you are] > > So, I've just done a ton of consolidation work on the 3 branches. > Specifically, the trunk has had many more syntax modernizations done > (eg, all 'raise' statements should now be new style). The py3k branch > has had almost all remaining files converted to py3k syntax, and 2to3 > disabled in that branch. The bzr 'py3k-integration' branch is fairly > close to both of these - although in py2k syntax. > > Remaining to be done is the 'getattro' style changes from the py3k > branch which I hope to tackle next, although not for a week or 2. > Please go for any changes you like, and let me know of any issues... > > Cheers, > > Mark |
|
From: Mark H. <mha...@us...> - 2008-11-27 11:59:16
|
Update of /cvsroot/pywin32/pywin32/com/win32com/makegw In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25938/com/win32com/makegw Modified Files: Tag: py3k makegw.py Log Message: merge lots of fixes from the trunk Index: makegw.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/makegw/makegw.py,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -C2 -d -r1.9.2.1 -r1.9.2.2 *** makegw.py 26 Nov 2008 09:03:29 -0000 1.9.2.1 --- makegw.py 27 Nov 2008 11:31:04 -0000 1.9.2.2 *************** *** 49,53 **** import re import string ! import makegwparse def make_framework_support(header_file_name, interface_name, bMakeInterface = 1, bMakeGateway = 1): --- 49,53 ---- import re import string ! from . import makegwparse def make_framework_support(header_file_name, interface_name, bMakeInterface = 1, bMakeGateway = 1): |
|
From: Mark H. <mha...@us...> - 2008-11-27 11:59:16
|
Update of /cvsroot/pywin32/pywin32/com/win32comext/shell/test In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25938/com/win32comext/shell/test Modified Files: Tag: py3k testShellItem.py Log Message: merge lots of fixes from the trunk Index: testShellItem.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/test/testShellItem.py,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** testShellItem.py 26 Jul 2008 07:02:35 -0000 1.1 --- testShellItem.py 27 Nov 2008 11:31:05 -0000 1.1.2.1 *************** *** 19,23 **** flags = shellcon.SHCONTF_FOLDERS | shellcon.SHCONTF_NONFOLDERS children = sf.EnumObjects(0, flags) ! child_pidl = children.next() name = sf.GetDisplayNameOf(child_pidl, shellcon.SHGDN_FORPARSING) --- 19,23 ---- flags = shellcon.SHCONTF_FOLDERS | shellcon.SHCONTF_NONFOLDERS children = sf.EnumObjects(0, flags) ! child_pidl = next(children) name = sf.GetDisplayNameOf(child_pidl, shellcon.SHGDN_FORPARSING) *************** *** 33,37 **** flags = shellcon.SHCONTF_FOLDERS | shellcon.SHCONTF_NONFOLDERS children = sf.EnumObjects(0, flags) ! child_pidl = children.next() name_flags = shellcon.SHGDN_FORPARSING | shellcon.SHGDN_INFOLDER name = sf.GetDisplayNameOf(child_pidl, name_flags) --- 33,37 ---- flags = shellcon.SHCONTF_FOLDERS | shellcon.SHCONTF_NONFOLDERS children = sf.EnumObjects(0, flags) ! child_pidl = next(children) name_flags = shellcon.SHGDN_FORPARSING | shellcon.SHGDN_INFOLDER name = sf.GetDisplayNameOf(child_pidl, name_flags) *************** *** 54,58 **** flags = shellcon.SHCONTF_FOLDERS | shellcon.SHCONTF_NONFOLDERS children = sf.EnumObjects(0, flags) ! child_pidl = children.next() item1 = shell.SHCreateItemWithParent(desktop_pidl, None, child_pidl, shell.IID_IShellItem) item2 = shell.SHCreateItemWithParent(None, sf, child_pidl, shell.IID_IShellItem) --- 54,58 ---- flags = shellcon.SHCONTF_FOLDERS | shellcon.SHCONTF_NONFOLDERS children = sf.EnumObjects(0, flags) ! child_pidl = next(children) item1 = shell.SHCreateItemWithParent(desktop_pidl, None, child_pidl, shell.IID_IShellItem) item2 = shell.SHCreateItemWithParent(None, sf, child_pidl, shell.IID_IShellItem) |
|
From: Mark H. <mha...@us...> - 2008-11-27 11:17:39
|
Update of /cvsroot/pywin32/pywin32/com/win32comext/axscript/client In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25371/com/win32comext/axscript/client Modified Files: framework.py pyscript.py Log Message: Move to dictionary item/key/value iterators where possible Index: pyscript.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/client/pyscript.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** pyscript.py 27 Nov 2008 05:58:17 -0000 1.14 --- pyscript.py 27 Nov 2008 11:17:32 -0000 1.15 *************** *** 68,72 **** pass # Check out the sub-items ! for item in obj.subItems.values(): try: return self._DoFindAttribute_(item, attr) --- 68,72 ---- pass # Check out the sub-items ! for item in obj.subItems.itervalues(): try: return self._DoFindAttribute_(item, attr) *************** *** 76,80 **** def _FindAttribute_(self, attr): ! for item in self._scriptEngine_.subItems.values(): try: return self._DoFindAttribute_(item, attr) --- 76,80 ---- def _FindAttribute_(self, attr): ! for item in self._scriptEngine_.subItems.itervalues(): try: return self._DoFindAttribute_(item, attr) *************** *** 223,230 **** if item.IsGlobal(): # Global items means sub-items are also added... ! for subitem in item.subItems.values(): self.globalNameSpaceModule.__dict__[subitem.name] = subitem.attributeObject # Also add all methods ! for name, entry in item.dispatchContainer._olerepr_.mapFuncs.items(): if not entry.hidden: self.globalNameSpaceModule.__dict__[name] = getattr(item.dispatchContainer,name) --- 223,230 ---- if item.IsGlobal(): # Global items means sub-items are also added... ! for subitem in item.subItems.itervalues(): self.globalNameSpaceModule.__dict__[subitem.name] = subitem.attributeObject # Also add all methods ! for name, entry in item.dispatchContainer._olerepr_.mapFuncs.iteritems(): if not entry.hidden: self.globalNameSpaceModule.__dict__[name] = getattr(item.dispatchContainer,name) *************** *** 303,307 **** # Not there _exactly_ - do case ins search. funcNameLook = funcName.lower() ! for attr in self.globalNameSpaceModule.__dict__.keys(): if funcNameLook==attr.lower(): function = self.globalNameSpaceModule.__dict__[attr] --- 303,307 ---- # Not there _exactly_ - do case ins search. funcNameLook = funcName.lower() ! for attr in self.globalNameSpaceModule.__dict__.iterkeys(): if funcNameLook==attr.lower(): function = self.globalNameSpaceModule.__dict__[attr] Index: framework.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/client/framework.py,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** framework.py 27 Nov 2008 05:58:17 -0000 1.26 --- framework.py 27 Nov 2008 11:17:32 -0000 1.27 *************** *** 163,167 **** self.myInvokeMethod = None self.coDispatch = None ! for event in self.events.values(): event.Reset() self.events = {} --- 163,167 ---- self.myInvokeMethod = None self.coDispatch = None ! for event in self.events.itervalues(): event.Reset() self.events = {} *************** *** 271,275 **** flagDescs.append("CODE ONLY") print " " * level, "Name=", self.name, ", flags=", "/".join(flagDescs), self ! for subItem in self.subItems.values(): subItem._dump_(level+1) --- 271,275 ---- flagDescs.append("CODE ONLY") print " " * level, "Name=", self.name, ", flags=", "/".join(flagDescs), self ! for subItem in self.subItems.itervalues(): subItem._dump_(level+1) *************** *** 279,283 **** self.eventSink.Reset() self.isRegistered = 0 ! for subItem in self.subItems.values(): subItem.Reset() --- 279,283 ---- self.eventSink.Reset() self.isRegistered = 0 ! for subItem in self.subItems.itervalues(): subItem.Reset() *************** *** 289,293 **** self.eventSink.Close() self.eventSink = None ! for subItem in self.subItems.values(): subItem.Close() self.subItems = [] --- 289,293 ---- self.eventSink.Close() self.eventSink = None ! for subItem in self.subItems.itervalues(): subItem.Close() self.subItems = [] *************** *** 309,313 **** self.isRegistered = 1 # Register the sub-items. ! for item in self.subItems.values(): if not item.isRegistered: item.Register() --- 309,313 ---- self.isRegistered = 1 # Register the sub-items. ! for item in self.subItems.itervalues(): if not item.isRegistered: item.Register() *************** *** 372,376 **** if self.eventSink: self.eventSink.Connect() ! for subItem in self.subItems.values(): subItem.Connect() --- 372,376 ---- if self.eventSink: self.eventSink.Connect() ! for subItem in self.subItems.itervalues(): subItem.Connect() *************** *** 379,383 **** if self.eventSink: self.eventSink.Disconnect() ! for subItem in self.subItems.values(): subItem.Disconnect() --- 379,383 ---- if self.eventSink: self.eventSink.Disconnect() ! for subItem in self.subItems.itervalues(): subItem.Disconnect() *************** *** 640,644 **** self.ChangeScriptState(axscript.SCRIPTSTATE_CLOSED) # Completely reset all named items (including persistent) ! for item in self.subItems.values(): item.Close() self.subItems = {} --- 640,644 ---- self.ChangeScriptState(axscript.SCRIPTSTATE_CLOSED) # Completely reset all named items (including persistent) ! for item in self.subItems.itervalues(): item.Close() self.subItems = {} *************** *** 742,753 **** def _DumpNamedItems_(self): ! for item in self.subItems.values(): item._dump_(0) def ResetNamedItems(self): # Due to the way we work, we re-create persistent ones. - si = self.subItems.items() self.subItems = {} ! for name, item in si: item.Close() if item.flags & axscript.SCRIPTITEM_ISPERSISTENT: --- 742,752 ---- def _DumpNamedItems_(self): ! for item in self.subItems.itervalues(): item._dump_(0) def ResetNamedItems(self): # Due to the way we work, we re-create persistent ones. self.subItems = {} ! for name, item in self.subItems.iteritems(): item.Close() if item.flags & axscript.SCRIPTITEM_ISPERSISTENT: *************** *** 758,762 **** def ProcessNewNamedItemsConnections(self): # Process all sub-items. ! for item in self.subItems.values(): if not item.createdConnections: # Fast-track! item.CreateConnections() --- 757,761 ---- def ProcessNewNamedItemsConnections(self): # Process all sub-items. ! for item in self.subItems.itervalues(): if not item.createdConnections: # Fast-track! item.CreateConnections() *************** *** 764,768 **** def RegisterNewNamedItems(self): # Register all sub-items. ! for item in self.subItems.values(): if not item.isRegistered: # Fast-track! self.RegisterNamedItem(item) --- 763,767 ---- def RegisterNewNamedItems(self): # Register all sub-items. ! for item in self.subItems.itervalues(): if not item.isRegistered: # Fast-track! self.RegisterNamedItem(item) *************** *** 808,812 **** def ConnectEventHandlers(self): # trace ("Connecting to event handlers") ! for item in self.subItems.values(): item.Connect() self.ChangeScriptState(axscript.SCRIPTSTATE_CONNECTED); --- 807,811 ---- def ConnectEventHandlers(self): # trace ("Connecting to event handlers") ! for item in self.subItems.itervalues(): item.Connect() self.ChangeScriptState(axscript.SCRIPTSTATE_CONNECTED); *************** *** 814,818 **** def DisconnectEventHandlers(self): # trace ("Disconnecting from event handlers") ! for item in self.subItems.values(): item.Disconnect() --- 813,817 ---- def DisconnectEventHandlers(self): # trace ("Disconnecting from event handlers") ! for item in self.subItems.itervalues(): item.Disconnect() |
|
From: Mark H. <mha...@us...> - 2008-11-27 11:17:39
|
Update of /cvsroot/pywin32/pywin32/com/win32com/client In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25371/com/win32com/client Modified Files: genpy.py Log Message: Move to dictionary item/key/value iterators where possible Index: genpy.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/genpy.py,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** genpy.py 27 Nov 2008 09:33:22 -0000 1.59 --- genpy.py 27 Nov 2008 11:17:32 -0000 1.60 *************** *** 520,524 **** print >> stream, '\tdef __getitem__(self, index):' print >> stream, '\t\t"Allow this class to be accessed as a collection"' ! print >> stream, "\t\tif not self.__dict__.has_key('_enum_'):" print >> stream, "\t\t\tself.__dict__['_enum_'] = self._NewEnum()" print >> stream, "\t\treturn self._enum_.__getitem__(index)" --- 520,524 ---- print >> stream, '\tdef __getitem__(self, index):' print >> stream, '\t\t"Allow this class to be accessed as a collection"' ! print >> stream, "\t\tif not '_enum' in self.__dict__:" print >> stream, "\t\t\tself.__dict__['_enum_'] = self._NewEnum()" print >> stream, "\t\treturn self._enum_.__getitem__(index)" *************** *** 941,945 **** print >> stream, "NamesToIIDMap = {" ! for name, iid in map.items(): print >> stream, "\t'%s' : '%s'," % (name, iid) print >> stream, '}' --- 941,945 ---- print >> stream, "NamesToIIDMap = {" ! for name, iid in map.iteritems(): print >> stream, "\t'%s' : '%s'," % (name, iid) print >> stream, '}' *************** *** 999,1005 **** # Make a map of iid: dispitem, vtableitem) items = {} ! for key, value in oleItems.items(): items[key] = (value,None) ! for key, value in vtableItems.items(): existing = items.get(key, None) if existing is not None: --- 999,1005 ---- # Make a map of iid: dispitem, vtableitem) items = {} ! for key, value in oleItems.iteritems(): items[key] = (value,None) ! for key, value in vtableItems.iteritems(): existing = items.get(key, None) if existing is not None: |
|
From: Mark H. <mha...@us...> - 2008-11-27 11:17:39
|
Update of /cvsroot/pywin32/pywin32/com/win32com/server In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25371/com/win32com/server Modified Files: policy.py Log Message: Move to dictionary item/key/value iterators where possible Index: policy.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/server/policy.py,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** policy.py 27 Nov 2008 09:42:41 -0000 1.26 --- policy.py 27 Nov 2008 11:17:32 -0000 1.27 *************** *** 472,480 **** # Copy existing _dispid_to_func_ entries to _name_to_dispid_ ! for dispid, name in self._dispid_to_func_.items(): self._name_to_dispid_[name.lower()]=dispid ! for dispid, name in self._dispid_to_get_.items(): self._name_to_dispid_[name.lower()]=dispid ! for dispid, name in self._dispid_to_put_.items(): self._name_to_dispid_[name.lower()]=dispid --- 472,480 ---- # Copy existing _dispid_to_func_ entries to _name_to_dispid_ ! for dispid, name in self._dispid_to_func_.iteritems(): self._name_to_dispid_[name.lower()]=dispid ! for dispid, name in self._dispid_to_get_.iteritems(): self._name_to_dispid_[name.lower()]=dispid ! for dispid, name in self._dispid_to_put_.iteritems(): self._name_to_dispid_[name.lower()]=dispid |
|
From: Mark H. <mha...@us...> - 2008-11-27 11:17:39
|
Update of /cvsroot/pywin32/pywin32/win32/Demos/security In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25371/win32/Demos/security Modified Files: security_enums.py Log Message: Move to dictionary item/key/value iterators where possible Index: security_enums.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Demos/security/security_enums.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** security_enums.py 1 Oct 2008 14:44:53 -0000 1.3 --- security_enums.py 27 Nov 2008 11:17:32 -0000 1.4 *************** *** 20,24 **** def lookup_name(self, const_val): """Looks up the name of a particular value.""" ! for k,v in self.__dict__.items(): if v==const_val: return k --- 20,24 ---- def lookup_name(self, const_val): """Looks up the name of a particular value.""" ! for k,v in self.__dict__.iteritems(): if v==const_val: return k *************** *** 29,33 **** flag_names=[] unknown_flags=flags ! for k,v in self.__dict__.items(): if flags & v == v: flag_names.append(k) --- 29,33 ---- flag_names=[] unknown_flags=flags ! for k,v in self.__dict__.iteritems(): if flags & v == v: flag_names.append(k) |
