pywin32-checkins Mailing List for Python for Windows Extensions (Page 63)
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: Roger U. <ru...@us...> - 2008-10-03 22:08:54
|
Update of /cvsroot/pywin32/pywin32/win32/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26456 Modified Files: Tag: py3k win32security.i Log Message: Use PyWinCoreString_FromIID for DomainGuid Index: win32security.i =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/src/win32security.i,v retrieving revision 1.47.2.1 retrieving revision 1.47.2.2 diff -C2 -d -r1.47.2.1 -r1.47.2.2 *** win32security.i 29 Aug 2008 04:59:28 -0000 1.47.2.1 --- win32security.i 3 Oct 2008 22:08:47 -0000 1.47.2.2 *************** *** 2517,2521 **** PyObject *dns_domain_name = PyWinObject_FromLSA_UNICODE_STRING(info->DnsDomainName); PyObject *dns_forest_name = PyWinObject_FromLSA_UNICODE_STRING(info->DnsForestName); ! PyObject *domain_guid = PyWinUnicodeObject_FromIID(info->DomainGuid); PyObject *domain_sid = PyWinObject_FromSID(info->Sid); ret = Py_BuildValue("(OOOOO)",domain_name,dns_domain_name,dns_forest_name,domain_guid,domain_sid); --- 2517,2521 ---- PyObject *dns_domain_name = PyWinObject_FromLSA_UNICODE_STRING(info->DnsDomainName); PyObject *dns_forest_name = PyWinObject_FromLSA_UNICODE_STRING(info->DnsForestName); ! PyObject *domain_guid = PyWinCoreString_FromIID(info->DomainGuid); PyObject *domain_sid = PyWinObject_FromSID(info->Sid); ret = Py_BuildValue("(OOOOO)",domain_name,dns_domain_name,dns_forest_name,domain_guid,domain_sid); |
|
From: Mark H. <mha...@us...> - 2008-10-03 04:21:32
|
Update of /cvsroot/pywin32/pywin32/win32/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20398/win32/src Modified Files: Tag: py3k PyIID.cpp Log Message: Simplify PyIID::str() Index: PyIID.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/src/PyIID.cpp,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -C2 -d -r1.8.2.1 -r1.8.2.2 *** PyIID.cpp 29 Aug 2008 04:59:25 -0000 1.8.2.1 --- PyIID.cpp 3 Oct 2008 04:21:29 -0000 1.8.2.2 *************** *** 104,124 **** } ! PyObject *PyWinStringObject_FromIID(const IID &riid) ! { ! OLECHAR oleRes[128]; ! if (StringFromGUID2(riid, oleRes, sizeof(oleRes))==0) { ! // Should never happen - 128 should be heaps big enough. ! PyErr_SetString(PyExc_ValueError, "The string is too long"); ! return NULL; ! } ! char *szResult; ! if (!PyWin_WCHAR_AsString(oleRes, (DWORD)-1, &szResult)) ! return NULL; ! PyObject *rc = PyString_FromString(szResult); ! PyWinObject_FreeString(szResult); ! return rc; ! } ! ! PyObject *PyWinUnicodeObject_FromIID(const IID &riid) { OLECHAR oleRes[128]; --- 104,108 ---- } ! PyObject *PyWinCoreString_FromIID(const IID &riid) { OLECHAR oleRes[128]; *************** *** 128,132 **** return NULL; } ! return PyWinObject_FromOLECHAR(oleRes); } --- 112,116 ---- return NULL; } ! return PyWinCoreString_FromString(oleRes); } *************** *** 298,306 **** PyObject *PyIID::str(void) { ! #if (PY_VERSION_HEX < 0x03000000) ! return PyWinStringObject_FromIID(m_iid); ! #else ! return PyWinUnicodeObject_FromIID(m_iid); ! #endif } --- 282,286 ---- PyObject *PyIID::str(void) { ! return PyWinCoreString_FromIID(m_iid); } *************** *** 309,315 **** OLECHAR oleRes[128]; StringFromGUID2(m_iid, oleRes, sizeof(oleRes)); ! TCHAR buf[128]; ! wsprintf(buf, _T("IID('%ws')"), oleRes); ! return PyWinObject_FromTCHAR(buf); } --- 289,295 ---- OLECHAR oleRes[128]; StringFromGUID2(m_iid, oleRes, sizeof(oleRes)); ! WCHAR buf[128]; ! wsprintfW(buf, L"IID('%ws')", oleRes); ! return PyWinCoreString_FromString(buf); } |
|
From: Mark H. <mha...@us...> - 2008-10-03 04:15:45
|
Update of /cvsroot/pywin32/pywin32/com/win32com/client In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20161/com/win32com/client Modified Files: Tag: py3k combrowse.py Log Message: merge reindentation changes from trunk. Index: combrowse.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/combrowse.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 *** combrowse.py 29 Aug 2008 08:58:52 -0000 1.8.2.1 --- combrowse.py 3 Oct 2008 04:15:33 -0000 1.8.2.2 *************** *** 15,19 **** Details ! This module allows browsing of registered Type Libraries, COM categories, and running COM objects. The display is similar to the Pythonwin object browser, and displays the objects in a hierarchical window. --- 15,19 ---- Details ! This module allows browsing of registered Type Libraries, COM categories, and running COM objects. The display is similar to the Pythonwin object [...1005 lines suppressed...] ! root = HLIRoot("COM Browser") ! if sys.modules.has_key("app"): ! # do it in a window ! browser.MakeTemplate() ! browser.template.OpenObject(root) ! else: ! # list=hierlist.HierListWithItems( root, win32ui.IDB_BROWSER_HIER ) ! # dlg=hierlist.HierDialog("COM Browser",list) ! dlg = browser.dynamic_browser(root) ! dlg.DoModal() if __name__=='__main__': ! main() + ni = pythoncom._GetInterfaceCount() + ng = pythoncom._GetGatewayCount() + if ni or ng: + print "Warning - exiting with %d/%d objects alive" % (ni,ng) |
|
From: Mark H. <mha...@us...> - 2008-10-03 04:07:25
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/dialogs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19899/pythonwin/pywin/dialogs Modified Files: Tag: py3k status.py Log Message: change how WinThread is imported to work around a 2to3 bug. Index: status.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/dialogs/status.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 *** status.py 29 Aug 2008 06:44:50 -0000 1.3.4.2 --- status.py 3 Oct 2008 04:07:12 -0000 1.3.4.3 *************** *** 1,5 **** # No cancel button. ! from pywin.mfc import dialog, thread import threading import win32ui --- 1,6 ---- # No cancel button. ! from pywin.mfc import dialog ! from pywin.mfc.thread import WinThread import threading import win32ui *************** *** 153,157 **** self._Send(MYWM_SET) ! class ProgressThread(thread.WinThread): def __init__(self, title, msg = "", maxticks = 100, tickincr = 1): self.title = title --- 154,158 ---- self._Send(MYWM_SET) ! class ProgressThread(WinThread): def __init__(self, title, msg = "", maxticks = 100, tickincr = 1): self.title = title *************** *** 160,164 **** self.tickincr = tickincr self.dialog = None ! thread.WinThread.__init__(self) self.createdEvent = threading.Event() --- 161,165 ---- self.tickincr = tickincr self.dialog = None ! WinThread.__init__(self) self.createdEvent = threading.Event() *************** *** 171,175 **** pass self.createdEvent.set() ! return thread.WinThread.InitInstance(self) def ExitInstance(self): --- 172,176 ---- pass self.createdEvent.set() ! return WinThread.InitInstance(self) def ExitInstance(self): |
|
From: Mark H. <mha...@us...> - 2008-10-03 04:07:10
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/dialogs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19864/pythonwin/pywin/dialogs Modified Files: status.py Log Message: change how WinThread is imported to work around a 2to3 bug. Index: status.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/dialogs/status.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** status.py 5 Mar 2005 03:17:22 -0000 1.3 --- status.py 3 Oct 2008 04:06:58 -0000 1.4 *************** *** 1,5 **** # No cancel button. ! from pywin.mfc import dialog, thread import threading import win32ui --- 1,6 ---- # No cancel button. ! from pywin.mfc import dialog ! from pywin.mfc.thread import WinThread import threading import win32ui *************** *** 153,157 **** self._Send(MYWM_SET) ! class ProgressThread(thread.WinThread): def __init__(self, title, msg = "", maxticks = 100, tickincr = 1): self.title = title --- 154,158 ---- self._Send(MYWM_SET) ! class ProgressThread(WinThread): def __init__(self, title, msg = "", maxticks = 100, tickincr = 1): self.title = title *************** *** 160,164 **** self.tickincr = tickincr self.dialog = None ! thread.WinThread.__init__(self) self.createdEvent = threading.Event() --- 161,165 ---- self.tickincr = tickincr self.dialog = None ! WinThread.__init__(self) self.createdEvent = threading.Event() *************** *** 171,175 **** pass self.createdEvent.set() ! return thread.WinThread.InitInstance(self) def ExitInstance(self): --- 172,176 ---- pass self.createdEvent.set() ! return WinThread.InitInstance(self) def ExitInstance(self): |
|
From: Mark H. <mha...@us...> - 2008-10-03 03:12:54
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/debugger In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12953 Modified Files: Tag: py3k configui.py Log Message: This time restore it to *valid* py3k syntax! Index: configui.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/debugger/configui.py,v retrieving revision 1.1.4.4 retrieving revision 1.1.4.5 diff -C2 -d -r1.1.4.4 -r1.1.4.5 *** configui.py 3 Oct 2008 02:58:26 -0000 1.1.4.4 --- configui.py 3 Oct 2008 03:12:45 -0000 1.1.4.5 *************** *** 1,3 **** ! import .dbgcon from pywin.mfc import dialog import win32ui --- 1,3 ---- ! from . import dbgcon from pywin.mfc import dialog import win32ui |
|
From: Mark H. <mha...@us...> - 2008-10-03 02:58:37
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/debugger In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12618/pythonwin/pywin/debugger Modified Files: Tag: py3k configui.py Log Message: revert to py3k syntax on this branch until Roger buys into 2to3 :) Index: configui.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/debugger/configui.py,v retrieving revision 1.1.4.3 retrieving revision 1.1.4.4 diff -C2 -d -r1.1.4.3 -r1.1.4.4 *** configui.py 2 Oct 2008 11:38:54 -0000 1.1.4.3 --- configui.py 3 Oct 2008 02:58:26 -0000 1.1.4.4 *************** *** 1,3 **** ! import dbgcon from pywin.mfc import dialog import win32ui --- 1,3 ---- ! import .dbgcon from pywin.mfc import dialog import win32ui |
|
From: Mark H. <mha...@us...> - 2008-10-03 02:47:13
|
Update of /cvsroot/pywin32/pywin32/win32/Lib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12358/win32/Lib Modified Files: Tag: py3k winnt.py Log Message: Merge new constants from trunk. Index: winnt.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/winnt.py,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** winnt.py 23 Jul 2007 05:11:08 -0000 1.7 --- winnt.py 3 Oct 2008 02:47:05 -0000 1.7.2.1 *************** *** 243,246 **** --- 243,251 ---- PROCESSOR_ARCHITECTURE_SH = 4 PROCESSOR_ARCHITECTURE_ARM = 5 + PROCESSOR_ARCHITECTURE_IA64 = 6 + PROCESSOR_ARCHITECTURE_ALPHA64 = 7 + PROCESSOR_ARCHITECTURE_MSIL = 8 + PROCESSOR_ARCHITECTURE_AMD64 = 9 + PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 = 10 PROCESSOR_ARCHITECTURE_UNKNOWN = 65535 PF_FLOATING_POINT_PRECISION_ERRATA = 0 |
|
From: Mark H. <mha...@us...> - 2008-10-03 02:30:34
|
Update of /cvsroot/pywin32/pywin32/com/win32com/client In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12142/com/win32com/client Modified Files: Tag: py3k tlbrowse.py Log Message: Another string exception. Index: tlbrowse.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/tlbrowse.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 *** tlbrowse.py 29 Aug 2008 08:58:53 -0000 1.4.4.1 --- tlbrowse.py 3 Oct 2008 02:30:19 -0000 1.4.4.2 *************** *** 7,11 **** from pywin.mfc import dialog ! error = "TypeLib browser internal error" FRAMEDLG_STD = win32con.WS_CAPTION | win32con.WS_SYSMENU --- 7,13 ---- from pywin.mfc import dialog ! class TLBrowserException(Exception): ! "TypeLib browser internal error" ! error = TLBrowserException FRAMEDLG_STD = win32con.WS_CAPTION | win32con.WS_SYSMENU |
|
From: Mark H. <mha...@us...> - 2008-10-03 02:20:44
|
Update of /cvsroot/pywin32/pywin32/com/win32com In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11961 Modified Files: storagecon.py Log Message: merge from py3k: remove more unnecessary L suffixes. Index: storagecon.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/storagecon.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** storagecon.py 3 Dec 2006 06:03:43 -0000 1.5 --- storagecon.py 3 Oct 2008 02:20:31 -0000 1.6 *************** *** 26,52 **** CWCSTORAGENAME = 32 ! STGM_DIRECT = 0x00000000L ! STGM_TRANSACTED = 0x00010000L ! STGM_SIMPLE = 0x08000000L ! STGM_READ = 0x00000000L ! STGM_WRITE = 0x00000001L ! STGM_READWRITE = 0x00000002L ! STGM_SHARE_DENY_NONE = 0x00000040L ! STGM_SHARE_DENY_READ = 0x00000030L ! STGM_SHARE_DENY_WRITE = 0x00000020L ! STGM_SHARE_EXCLUSIVE = 0x00000010L ! STGM_PRIORITY = 0x00040000L ! STGM_DELETEONRELEASE = 0x04000000L ! STGM_NOSCRATCH = 0x00100000L ! STGM_CREATE = 0x00001000L ! STGM_CONVERT = 0x00020000L ! STGM_FAILIFTHERE = 0x00000000L ! STGM_NOSNAPSHOT = 0x00200000L ! ASYNC_MODE_COMPATIBILITY = 0x00000001L ! ASYNC_MODE_DEFAULT = 0x00000000L ! STGTY_REPEAT = 0x00000100L ! STG_TOEND = 0xFFFFFFFFL ! STG_LAYOUT_SEQUENTIAL = 0x00000000L ! STG_LAYOUT_INTERLEAVED = 0x00000001L ## access rights used with COM server ACL's --- 26,52 ---- CWCSTORAGENAME = 32 ! STGM_DIRECT = 0x00000000 ! STGM_TRANSACTED = 0x00010000 ! STGM_SIMPLE = 0x08000000 ! STGM_READ = 0x00000000 ! STGM_WRITE = 0x00000001 ! STGM_READWRITE = 0x00000002 ! STGM_SHARE_DENY_NONE = 0x00000040 ! STGM_SHARE_DENY_READ = 0x00000030 ! STGM_SHARE_DENY_WRITE = 0x00000020 ! STGM_SHARE_EXCLUSIVE = 0x00000010 ! STGM_PRIORITY = 0x00040000 ! STGM_DELETEONRELEASE = 0x04000000 ! STGM_NOSCRATCH = 0x00100000 ! STGM_CREATE = 0x00001000 ! STGM_CONVERT = 0x00020000 ! STGM_FAILIFTHERE = 0x00000000 ! STGM_NOSNAPSHOT = 0x00200000 ! ASYNC_MODE_COMPATIBILITY = 0x00000001 ! ASYNC_MODE_DEFAULT = 0x00000000 ! STGTY_REPEAT = 0x00000100 ! STG_TOEND = 0xFFFFFFFF ! STG_LAYOUT_SEQUENTIAL = 0x00000000 ! STG_LAYOUT_INTERLEAVED = 0x00000001 ## access rights used with COM server ACL's *************** *** 78,82 **** ## DiscardableInformation ! PIDDI_THUMBNAIL = 0x00000002L ## SummaryInformation --- 78,82 ---- ## DiscardableInformation ! PIDDI_THUMBNAIL = 0x00000002 ## SummaryInformation |
|
From: Mark H. <mha...@us...> - 2008-10-03 01:10:09
|
Update of /cvsroot/pywin32/pywin32/win32/Demos In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10646/win32/Demos Modified Files: Tag: py3k win32gui_dialog.py win32gui_taskbar.py Log Message: Move to exception attributes. Index: win32gui_taskbar.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Demos/win32gui_taskbar.py,v retrieving revision 1.9.2.2 retrieving revision 1.9.2.3 diff -C2 -d -r1.9.2.2 -r1.9.2.3 *** win32gui_taskbar.py 11 Sep 2008 05:12:41 -0000 1.9.2.2 --- win32gui_taskbar.py 3 Oct 2008 01:09:55 -0000 1.9.2.3 *************** *** 23,31 **** wc.lpfnWndProc = message_map # could also specify a wndproc. ! # Don't blow up if class aready registered to make testing easier try: classAtom = win32gui.RegisterClass(wc) except win32gui.error as err_info: ! if err_info.args[0]!=winerror.ERROR_CLASS_ALREADY_EXISTS: raise --- 23,31 ---- wc.lpfnWndProc = message_map # could also specify a wndproc. ! # Don't blow up if class already registered to make testing easier try: classAtom = win32gui.RegisterClass(wc) except win32gui.error as err_info: ! if err_info.winerror!=winerror.ERROR_CLASS_ALREADY_EXISTS: raise Index: win32gui_dialog.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Demos/win32gui_dialog.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 *** win32gui_dialog.py 11 Sep 2008 04:02:48 -0000 1.7.2.2 --- win32gui_dialog.py 3 Oct 2008 01:09:55 -0000 1.7.2.3 *************** *** 153,157 **** classAtom = win32gui.RegisterClass(wc) except win32gui.error as err_info: ! if err_info.args[0]!=winerror.ERROR_CLASS_ALREADY_EXISTS: raise return className --- 153,157 ---- classAtom = win32gui.RegisterClass(wc) except win32gui.error as err_info: ! if err_info.winerror!=winerror.ERROR_CLASS_ALREADY_EXISTS: raise return className |
|
From: Mark H. <mha...@us...> - 2008-10-03 01:10:01
|
Update of /cvsroot/pywin32/pywin32/win32/test In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10646/win32/test Modified Files: Tag: py3k test_win32api.py test_win32file.py Log Message: Move to exception attributes. Index: test_win32file.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/test/test_win32file.py,v retrieving revision 1.13.2.1 retrieving revision 1.13.2.2 diff -C2 -d -r1.13.2.1 -r1.13.2.2 *** test_win32file.py 29 Aug 2008 04:59:28 -0000 1.13.2.1 --- test_win32file.py 3 Oct 2008 01:09:55 -0000 1.13.2.2 *************** *** 178,183 **** raise RuntimeError("Expected close to fail!") except win32file.error as details: ! hr, func, msg = details.args ! self.failUnlessEqual(hr, winerror.ERROR_INVALID_HANDLE) def testCompletionPortsQueued(self): --- 178,182 ---- raise RuntimeError("Expected close to fail!") except win32file.error as details: ! self.failUnlessEqual(details.winerror, winerror.ERROR_INVALID_HANDLE) def testCompletionPortsQueued(self): *************** *** 491,495 **** win32file.EncryptFile(fname) except win32file.error as details: ! if details.args[0] != winerror.ERROR_ACCESS_DENIED: raise print ("It appears this is not NTFS - cant encrypt/decrypt") --- 490,494 ---- win32file.EncryptFile(fname) except win32file.error as details: ! if details.winerror != winerror.ERROR_ACCESS_DENIED: raise print ("It appears this is not NTFS - cant encrypt/decrypt") Index: test_win32api.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/test/test_win32api.py,v retrieving revision 1.13.2.1 retrieving revision 1.13.2.2 diff -C2 -d -r1.13.2.1 -r1.13.2.2 *** test_win32api.py 29 Aug 2008 04:59:28 -0000 1.13.2.1 --- test_win32api.py 3 Oct 2008 01:09:55 -0000 1.13.2.2 *************** *** 145,149 **** win32file.CreateDirectoryW(fname, None) except win32api.error as details: ! if details.args[0]!=winerror.ERROR_ALREADY_EXISTS: raise try: --- 145,149 ---- win32file.CreateDirectoryW(fname, None) except win32api.error as details: ! if details.winerror!=winerror.ERROR_ALREADY_EXISTS: raise try: *************** *** 153,157 **** attr = win32api.GetFileAttributes(fname) except win32api.error as details: ! if details.args[0] != winerror.ERROR_FILENAME_EXCED_RANGE: raise --- 153,157 ---- attr = win32api.GetFileAttributes(fname) except win32api.error as details: ! if details.winerror != winerror.ERROR_FILENAME_EXCED_RANGE: raise |
|
From: Mark H. <mha...@us...> - 2008-10-03 01:10:01
|
Update of /cvsroot/pywin32/pywin32/com/win32com/client In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10646/com/win32com/client Modified Files: Tag: py3k __init__.py build.py dynamic.py Log Message: Move to exception attributes. Index: dynamic.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/dynamic.py,v retrieving revision 1.22.2.2 retrieving revision 1.22.2.3 diff -C2 -d -r1.22.2.2 -r1.22.2.3 *** dynamic.py 31 Aug 2008 09:48:03 -0000 1.22.2.2 --- dynamic.py 3 Oct 2008 01:09:55 -0000 1.22.2.3 *************** *** 182,186 **** return str(self.__call__()) except pythoncom.com_error as details: ! if details.args[0] not in ERRORS_BAD_CONTEXT: raise return self.__repr__() --- 182,186 ---- return str(self.__call__()) except pythoncom.com_error as details: ! if details.hresult not in ERRORS_BAD_CONTEXT: raise return self.__repr__() *************** *** 481,485 **** ret = self._oleobj_.Invoke(retEntry.dispid,0,invoke_type,1) except pythoncom.com_error as details: ! if details.args[0] in ERRORS_BAD_CONTEXT: # May be a method. self._olerepr_.mapFuncs[attr] = retEntry --- 481,485 ---- ret = self._oleobj_.Invoke(retEntry.dispid,0,invoke_type,1) except pythoncom.com_error as details: ! if details.hresult in ERRORS_BAD_CONTEXT: # May be a method. self._olerepr_.mapFuncs[attr] = retEntry Index: __init__.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/__init__.py,v retrieving revision 1.34.4.2 retrieving revision 1.34.4.3 diff -C2 -d -r1.34.4.2 -r1.34.4.3 *** __init__.py 31 Aug 2008 09:00:21 -0000 1.34.4.2 --- __init__.py 3 Oct 2008 01:09:55 -0000 1.34.4.3 *************** *** 421,425 **** # Eg, Lotus notes. # So just let it use the existing object if E_NOINTERFACE ! if details.args[0] != winerror.E_NOINTERFACE: raise oobj = oobj._oleobj_ --- 421,425 ---- # Eg, Lotus notes. # So just let it use the existing object if E_NOINTERFACE ! if details.hresult != winerror.E_NOINTERFACE: raise oobj = oobj._oleobj_ Index: build.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/build.py,v retrieving revision 1.31.2.2 retrieving revision 1.31.2.3 diff -C2 -d -r1.31.2.2 -r1.31.2.3 *** build.py 31 Aug 2008 09:33:17 -0000 1.31.2.2 --- build.py 3 Oct 2008 01:09:55 -0000 1.31.2.3 *************** *** 456,460 **** resultTypeInfo = itypeinfo.GetRefTypeInfo(subrepr) except pythoncom.com_error as details: ! if details.args[0] in [winerror.TYPE_E_CANTLOADLIBRARY, winerror.TYPE_E_LIBNOTREGISTERED]: # an unregistered interface return pythoncom.VT_UNKNOWN, None, None --- 456,460 ---- resultTypeInfo = itypeinfo.GetRefTypeInfo(subrepr) except pythoncom.com_error as details: ! if details.hresult in [winerror.TYPE_E_CANTLOADLIBRARY, winerror.TYPE_E_LIBNOTREGISTERED]: # an unregistered interface return pythoncom.VT_UNKNOWN, None, None |
|
From: Mark H. <mha...@us...> - 2008-10-03 01:04:08
|
Update of /cvsroot/pywin32/pywin32/win32/Demos In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10471/win32/Demos Modified Files: win32gui_dialog.py win32gui_taskbar.py Log Message: Move to exception attributes. Index: win32gui_taskbar.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Demos/win32gui_taskbar.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** win32gui_taskbar.py 30 Oct 2007 09:27:13 -0000 1.9 --- win32gui_taskbar.py 3 Oct 2008 01:03:56 -0000 1.10 *************** *** 23,27 **** wc.hbrBackground = win32con.COLOR_WINDOW wc.lpfnWndProc = message_map # could also specify a wndproc. ! classAtom = RegisterClass(wc) # Create the Window. style = win32con.WS_OVERLAPPED | win32con.WS_SYSMENU --- 23,34 ---- wc.hbrBackground = win32con.COLOR_WINDOW wc.lpfnWndProc = message_map # could also specify a wndproc. ! ! # Don't blow up if class already registered to make testing easier ! try: ! classAtom = win32gui.RegisterClass(wc) ! except win32gui.error, err_info: ! if err_info.winerror!=winerror.ERROR_CLASS_ALREADY_EXISTS: ! raise ! # Create the Window. style = win32con.WS_OVERLAPPED | win32con.WS_SYSMENU Index: win32gui_dialog.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Demos/win32gui_dialog.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** win32gui_dialog.py 4 Jan 2007 08:30:33 -0000 1.7 --- win32gui_dialog.py 3 Oct 2008 01:03:56 -0000 1.8 *************** *** 140,144 **** classAtom = win32gui.RegisterClass(wc) except win32gui.error, err_info: ! if err_info[0]!=winerror.ERROR_CLASS_ALREADY_EXISTS: raise return className --- 140,144 ---- classAtom = win32gui.RegisterClass(wc) except win32gui.error, err_info: ! if err_info.winerror!=winerror.ERROR_CLASS_ALREADY_EXISTS: raise return className |
|
From: Mark H. <mha...@us...> - 2008-10-03 01:04:08
|
Update of /cvsroot/pywin32/pywin32/win32/test In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10471/win32/test Modified Files: test_win32api.py test_win32file.py Log Message: Move to exception attributes. Index: test_win32file.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/test/test_win32file.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** test_win32file.py 28 May 2008 04:32:22 -0000 1.13 --- test_win32file.py 3 Oct 2008 01:03:56 -0000 1.14 *************** *** 176,181 **** win32file.CloseHandle(hv) raise RuntimeError, "Expected close to fail!" ! except win32file.error, (hr, func, msg): ! self.failUnlessEqual(hr, winerror.ERROR_INVALID_HANDLE) def testCompletionPortsQueued(self): --- 176,181 ---- win32file.CloseHandle(hv) raise RuntimeError, "Expected close to fail!" ! except win32file.error, details: ! self.failUnlessEqual(details.winerror, winerror.ERROR_INVALID_HANDLE) def testCompletionPortsQueued(self): *************** *** 489,493 **** win32file.EncryptFile(fname) except win32file.error, details: ! if details[0] != winerror.ERROR_ACCESS_DENIED: raise print "It appears this is not NTFS - cant encrypt/decrypt" --- 489,493 ---- win32file.EncryptFile(fname) except win32file.error, details: ! if details.winerror != winerror.ERROR_ACCESS_DENIED: raise print "It appears this is not NTFS - cant encrypt/decrypt" Index: test_win32api.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/test/test_win32api.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** test_win32api.py 4 Jan 2008 04:53:29 -0000 1.13 --- test_win32api.py 3 Oct 2008 01:03:56 -0000 1.14 *************** *** 145,149 **** win32file.CreateDirectoryW(fname, None) except win32api.error, details: ! if details[0]!=winerror.ERROR_ALREADY_EXISTS: raise try: --- 145,149 ---- win32file.CreateDirectoryW(fname, None) except win32api.error, details: ! if details.winerror!=winerror.ERROR_ALREADY_EXISTS: raise try: *************** *** 153,157 **** attr = win32api.GetFileAttributes(fname) except win32api.error, details: ! if details[0] != winerror.ERROR_FILENAME_EXCED_RANGE: raise --- 153,157 ---- attr = win32api.GetFileAttributes(fname) except win32api.error, details: ! if details.winerror != winerror.ERROR_FILENAME_EXCED_RANGE: raise |
|
From: Mark H. <mha...@us...> - 2008-10-03 01:04:04
|
Update of /cvsroot/pywin32/pywin32/com/win32com/client In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10471/com/win32com/client Modified Files: __init__.py build.py dynamic.py Log Message: Move to exception attributes. Index: dynamic.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/dynamic.py,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** dynamic.py 26 Aug 2007 03:42:13 -0000 1.22 --- dynamic.py 3 Oct 2008 01:03:56 -0000 1.23 *************** *** 187,191 **** return str(self.__call__()) except pythoncom.com_error, details: ! if details[0] not in ERRORS_BAD_CONTEXT: raise return self.__repr__() --- 187,191 ---- return str(self.__call__()) except pythoncom.com_error, details: ! if details.hresult not in ERRORS_BAD_CONTEXT: raise return self.__repr__() *************** *** 489,493 **** ret = self._oleobj_.Invoke(retEntry.dispid,0,invoke_type,1) except pythoncom.com_error, details: ! if details[0] in ERRORS_BAD_CONTEXT: # May be a method. self._olerepr_.mapFuncs[attr] = retEntry --- 489,493 ---- ret = self._oleobj_.Invoke(retEntry.dispid,0,invoke_type,1) except pythoncom.com_error, details: ! if details.hresult in ERRORS_BAD_CONTEXT: # May be a method. self._olerepr_.mapFuncs[attr] = retEntry Index: __init__.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/__init__.py,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** __init__.py 24 May 2005 14:30:04 -0000 1.34 --- __init__.py 3 Oct 2008 01:03:56 -0000 1.35 *************** *** 421,425 **** # Eg, Lotus notes. # So just let it use the existing object if E_NOINTERFACE ! if details[0] != winerror.E_NOINTERFACE: raise oobj = oobj._oleobj_ --- 421,425 ---- # Eg, Lotus notes. # So just let it use the existing object if E_NOINTERFACE ! if details.hresult != winerror.E_NOINTERFACE: raise oobj = oobj._oleobj_ Index: build.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/build.py,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** build.py 29 Jun 2008 23:57:20 -0000 1.31 --- build.py 3 Oct 2008 01:03:56 -0000 1.32 *************** *** 454,459 **** resultTypeInfo = itypeinfo.GetRefTypeInfo(subrepr) except pythoncom.com_error, details: ! if details[0] in [winerror.TYPE_E_CANTLOADLIBRARY, ! winerror.TYPE_E_LIBNOTREGISTERED]: # an unregistered interface return pythoncom.VT_UNKNOWN, None, None --- 454,458 ---- resultTypeInfo = itypeinfo.GetRefTypeInfo(subrepr) except pythoncom.com_error, details: ! if details.hresult in [winerror.TYPE_E_CANTLOADLIBRARY, winerror.TYPE_E_LIBNOTREGISTERED]: # an unregistered interface return pythoncom.VT_UNKNOWN, None, None |
|
From: Mark H. <mha...@us...> - 2008-10-02 13:06:53
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18675/Pythonwin/pywin/framework Modified Files: Tag: py3k help.py Log Message: fix all 'xxx_todo_changeme' items in py3k branch Index: help.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/help.py,v retrieving revision 1.12.2.1 retrieving revision 1.12.2.2 diff -C2 -d -r1.12.2.1 -r1.12.2.2 *** help.py 29 Aug 2008 06:16:41 -0000 1.12.2.1 --- help.py 2 Oct 2008 13:06:36 -0000 1.12.2.2 *************** *** 74,82 **** try: key = win32api.RegOpenKey(root, regutil.BuildDefaultPythonKey() + "\\Help", 0, win32con.KEY_READ) ! except win32api.error as xxx_todo_changeme: ! (code, fn, details) = xxx_todo_changeme.args import winerror ! if code!=winerror.ERROR_FILE_NOT_FOUND: ! raise win32api.error(code, fn, details) return retList try: --- 74,81 ---- try: key = win32api.RegOpenKey(root, regutil.BuildDefaultPythonKey() + "\\Help", 0, win32con.KEY_READ) ! except win32api.error as exc: import winerror ! if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND: ! raise return retList try: *************** *** 88,96 **** retList.append((helpDesc, helpFile)) keyNo = keyNo + 1 ! except win32api.error as xxx_todo_changeme1: ! (code, fn, desc) = xxx_todo_changeme1.args import winerror ! if code!=winerror.ERROR_NO_MORE_ITEMS: ! raise win32api.error(code, fn, desc) break finally: --- 87,94 ---- retList.append((helpDesc, helpFile)) keyNo = keyNo + 1 ! except win32api.error as exc: import winerror ! if exc.winerror!=winerror.ERROR_NO_MORE_ITEMS: ! raise break finally: |
|
From: Mark H. <mha...@us...> - 2008-10-02 13:06:51
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/docking In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18675/Pythonwin/pywin/docking Modified Files: Tag: py3k DockingBar.py Log Message: fix all 'xxx_todo_changeme' items in py3k branch Index: DockingBar.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/docking/DockingBar.py,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -C2 -d -r1.6.2.1 -r1.6.2.2 *** DockingBar.py 29 Aug 2008 06:16:41 -0000 1.6.2.1 --- DockingBar.py 2 Oct 2008 13:06:36 -0000 1.6.2.2 *************** *** 19,28 **** return rect[0] + width//2, rect[1] + height//2 ! def OffsetRect(rect, xxx_todo_changeme ): ! (x, y) = xxx_todo_changeme return rect[0]+x, rect[1]+y, rect[2]+x, rect[3]+y ! def DeflateRect(rect, xxx_todo_changeme1 ): ! (x,y) = xxx_todo_changeme1 return rect[0]+x, rect[1]+y, rect[2]-x, rect[3]-y --- 19,28 ---- return rect[0] + width//2, rect[1] + height//2 ! def OffsetRect(rect, point): ! (x, y) = point return rect[0]+x, rect[1]+y, rect[2]+x, rect[3]+y ! def DeflateRect(rect, point): ! (x,y) = point return rect[0]+x, rect[1]+y, rect[2]-x, rect[3]-y *************** *** 294,299 **** # def OnBarStyleChange(self, old, new): ! def OnNcCalcSize(self, bCalcValid, xxx_todo_changeme2): ! (rc0, rc1, rc2, pos) = xxx_todo_changeme2 self.rectBorder = self.GetWindowRect() self.rectBorder = OffsetRect( self.rectBorder, (-self.rectBorder[0], -self.rectBorder[1]) ) --- 294,299 ---- # def OnBarStyleChange(self, old, new): ! def OnNcCalcSize(self, bCalcValid, size_info): ! (rc0, rc1, rc2, pos) = size_info self.rectBorder = self.GetWindowRect() self.rectBorder = OffsetRect( self.rectBorder, (-self.rectBorder[0], -self.rectBorder[1]) ) |
|
From: Mark H. <mha...@us...> - 2008-10-02 13:06:49
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18675/Pythonwin/pywin/tools Modified Files: Tag: py3k hierlist.py regedit.py Log Message: fix all 'xxx_todo_changeme' items in py3k branch Index: regedit.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools/regedit.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 *** regedit.py 29 Aug 2008 06:16:42 -0000 1.2.4.1 --- regedit.py 2 Oct 2008 13:06:37 -0000 1.2.4.2 *************** *** 10,16 **** fn(*args) return 1 ! except win32api.error as xxx_todo_changeme: ! (rc, fn, msg) = xxx_todo_changeme.args ! msg = "Error " + err_desc + "\r\n\r\n" + msg win32ui.MessageBox(msg) return 0 --- 10,15 ---- fn(*args) return 1 ! except win32api.error as exc: ! msg = "Error " + err_desc + "\r\n\r\n" + exc.strerror win32ui.MessageBox(msg) return 0 *************** *** 42,47 **** return 1 ! def OnItemDoubleClick(self, xxx_todo_changeme1, extra): ! (hwndFrom, idFrom, code) = xxx_todo_changeme1 if idFrom==win32ui.AFX_IDW_PANE_FIRST: # Tree control --- 41,46 ---- return 1 ! def OnItemDoubleClick(self, info, extra): ! (hwndFrom, idFrom, code) = info if idFrom==win32ui.AFX_IDW_PANE_FIRST: # Tree control *************** *** 220,226 **** try: self.SetItemsCurrentValue(item, keyVal, d.newvalue) ! except win32api.error as xxx_todo_changeme2: ! (rc, fn, desc) = xxx_todo_changeme2.args ! win32ui.MessageBox("Error setting value\r\n\n%s" % desc) self.UpdateForRegItem(item) --- 219,224 ---- try: self.SetItemsCurrentValue(item, keyVal, d.newvalue) ! except win32api.error as exc: ! win32ui.MessageBox("Error setting value\r\n\n%s" % exc.strerror) self.UpdateForRegItem(item) Index: hierlist.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools/hierlist.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 *** hierlist.py 29 Aug 2008 06:16:42 -0000 1.7.2.1 --- hierlist.py 2 Oct 2008 13:06:36 -0000 1.7.2.2 *************** *** 124,129 **** self.notify_parent = None # Break a possible cycle ! def OnTreeItemDoubleClick(self, xxx_todo_changeme, extra): ! (hwndFrom, idFrom, code) = xxx_todo_changeme if idFrom != self.listBoxId: return None item = self.itemHandleMap[self.listControl.GetSelectedItem()] --- 124,129 ---- self.notify_parent = None # Break a possible cycle ! def OnTreeItemDoubleClick(self, info, extra): ! (hwndFrom, idFrom, code) = info if idFrom != self.listBoxId: return None item = self.itemHandleMap[self.listControl.GetSelectedItem()] *************** *** 131,136 **** return 1 ! def OnTreeItemExpanding(self, xxx_todo_changeme1, extra): ! (hwndFrom, idFrom, code) = xxx_todo_changeme1 if idFrom != self.listBoxId: return None action, itemOld, itemNew, pt = extra --- 131,136 ---- return 1 ! def OnTreeItemExpanding(self, info, extra): ! (hwndFrom, idFrom, code) = info if idFrom != self.listBoxId: return None action, itemOld, itemNew, pt = extra *************** *** 142,147 **** return 0 ! def OnTreeItemSelChanged(self, xxx_todo_changeme2, extra): ! (hwndFrom, idFrom, code) = xxx_todo_changeme2 if idFrom != self.listBoxId: return None action, itemOld, itemNew, pt = extra --- 142,147 ---- return 0 ! def OnTreeItemSelChanged(self, info, extra): ! (hwndFrom, idFrom, code) = info if idFrom != self.listBoxId: return None action, itemOld, itemNew, pt = extra |
|
From: Mark H. <mha...@us...> - 2008-10-02 13:06:48
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18675/Pythonwin/pywin/framework/editor Modified Files: Tag: py3k document.py vss.py Log Message: fix all 'xxx_todo_changeme' items in py3k branch Index: vss.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor/vss.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 *** vss.py 29 Aug 2008 06:17:09 -0000 1.4.2.1 --- vss.py 2 Oct 2008 13:06:36 -0000 1.4.2.2 *************** *** 82,87 **** item.Checkout(None, fileName) ok = 1 ! except pythoncom.com_error as xxx_todo_changeme: ! (hr, msg, exc, arg) = xxx_todo_changeme.args if exc: msg = exc[2] --- 82,87 ---- item.Checkout(None, fileName) ok = 1 ! except pythoncom.com_error as exc: ! msg = exc.strerror if exc: msg = exc[2] Index: document.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor/document.py,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -C2 -d -r1.11.2.1 -r1.11.2.2 *** document.py 29 Aug 2008 06:17:09 -0000 1.11.2.1 --- document.py 2 Oct 2008 13:06:36 -0000 1.11.2.2 *************** *** 129,136 **** try: newstat = os.stat(self.GetPathName()) ! except os.error as xxx_todo_changeme: ! (code, msg) = xxx_todo_changeme.args if not self.bReportedFileNotFound: ! print("The file '%s' is open for editing, but\nchecking it for changes caused the error: %s" % (self.GetPathName(), msg)) self.bReportedFileNotFound = 1 return --- 129,135 ---- try: newstat = os.stat(self.GetPathName()) ! except os.error as exc: if not self.bReportedFileNotFound: ! print("The file '%s' is open for editing, but\nchecking it for changes caused the error: %s" % (self.GetPathName(), exc.strerror)) self.bReportedFileNotFound = 1 return *************** *** 289,295 **** try: self.watchEvent = win32api.FindFirstChangeNotification(path, 0, filter) ! except win32api.error as xxx_todo_changeme1: ! (rc, fn, msg) = xxx_todo_changeme1.args ! print("Can not watch file", path, "for changes -", msg) def SignalStop(self): win32event.SetEvent(self.stopEvent) --- 288,293 ---- try: self.watchEvent = win32api.FindFirstChangeNotification(path, 0, filter) ! except win32api.error as exc: ! print("Can not watch file", path, "for changes -", exc.strerror) def SignalStop(self): win32event.SetEvent(self.stopEvent) *************** *** 309,315 **** # If the directory has been removed underneath us, we get this error. win32api.FindNextChangeNotification(self.watchEvent) ! except win32api.error as xxx_todo_changeme2: ! (rc, fn, msg) = xxx_todo_changeme2.args ! print("Can not watch file", self.doc.GetPathName(), "for changes -", msg) break --- 307,312 ---- # If the directory has been removed underneath us, we get this error. win32api.FindNextChangeNotification(self.watchEvent) ! except win32api.error as exc: ! print("Can not watch file", self.doc.GetPathName(), "for changes -", exc.strerror) break |
|
From: Mark H. <mha...@us...> - 2008-10-02 13:04:27
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18401/Pythonwin/pywin/tools Modified Files: hierlist.py regedit.py Log Message: More py3k compatible syntax modernizations merged from py3k branch. Index: regedit.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools/regedit.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** regedit.py 9 Oct 1999 23:43:46 -0000 1.2 --- regedit.py 2 Oct 2008 13:03:55 -0000 1.3 *************** *** 8,15 **** def SafeApply( fn, args, err_desc = "" ): try: ! apply(fn, args) return 1 ! except win32api.error, (rc, fn, msg): ! msg = "Error " + err_desc + "\r\n\r\n" + msg win32ui.MessageBox(msg) return 0 --- 8,15 ---- def SafeApply( fn, args, err_desc = "" ): try: ! fn(*args) return 1 ! except win32api.error, exc: ! msg = "Error " + err_desc + "\r\n\r\n" + exc.strerror win32ui.MessageBox(msg) return 0 *************** *** 41,45 **** return 1 ! def OnItemDoubleClick(self,(hwndFrom, idFrom, code), extra): if idFrom==win32ui.AFX_IDW_PANE_FIRST: # Tree control --- 41,46 ---- return 1 ! def OnItemDoubleClick(self, info, extra): ! (hwndFrom, idFrom, code) = info if idFrom==win32ui.AFX_IDW_PANE_FIRST: # Tree control *************** *** 218,223 **** try: self.SetItemsCurrentValue(item, keyVal, d.newvalue) ! except win32api.error, (rc, fn, desc): ! win32ui.MessageBox("Error setting value\r\n\n%s" % desc) self.UpdateForRegItem(item) --- 219,224 ---- try: self.SetItemsCurrentValue(item, keyVal, d.newvalue) ! except win32api.error, exc: ! win32ui.MessageBox("Error setting value\r\n\n%s" % exc.strerror) self.UpdateForRegItem(item) *************** *** 227,231 **** val, type = win32api.RegQueryValueEx(hkey, valueName) if type != win32con.REG_SZ: ! raise TypeError, "Only strings can be edited" return val finally: --- 228,232 ---- val, type = win32api.RegQueryValueEx(hkey, valueName) if type != win32con.REG_SZ: ! raise TypeError("Only strings can be edited") return val finally: *************** *** 272,276 **** def OnOpenDocument (self, name): ! raise TypeError, "This template can not open files" return 0 --- 273,277 ---- def OnOpenDocument (self, name): ! raise TypeError("This template can not open files") return 0 Index: hierlist.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools/hierlist.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** hierlist.py 1 Jul 2008 01:23:51 -0000 1.7 --- hierlist.py 2 Oct 2008 13:03:55 -0000 1.8 *************** *** 109,113 **** self.notify_parent = None # Break a possible cycle ! def OnTreeItemDoubleClick(self,(hwndFrom, idFrom, code), extra): if idFrom != self.listBoxId: return None item = self.itemHandleMap[self.list.GetSelectedItem()] --- 109,114 ---- self.notify_parent = None # Break a possible cycle ! def OnTreeItemDoubleClick(self, info, extra): ! (hwndFrom, idFrom, code) = info if idFrom != self.listBoxId: return None item = self.itemHandleMap[self.list.GetSelectedItem()] *************** *** 115,119 **** return 1 ! def OnTreeItemExpanding(self,(hwndFrom, idFrom, code), extra): if idFrom != self.listBoxId: return None action, itemOld, itemNew, pt = extra --- 116,121 ---- return 1 ! def OnTreeItemExpanding(self, info, extra): ! (hwndFrom, idFrom, code) = info if idFrom != self.listBoxId: return None action, itemOld, itemNew, pt = extra *************** *** 125,129 **** return 0 ! def OnTreeItemSelChanged(self,(hwndFrom, idFrom, code), extra): if idFrom != self.listBoxId: return None action, itemOld, itemNew, pt = extra --- 127,132 ---- return 0 ! def OnTreeItemSelChanged(self, info, extra): ! (hwndFrom, idFrom, code) = info if idFrom != self.listBoxId: return None action, itemOld, itemNew, pt = extra |
|
From: Mark H. <mha...@us...> - 2008-10-02 13:04:15
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/docking In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18401/Pythonwin/pywin/docking Modified Files: DockingBar.py Log Message: More py3k compatible syntax modernizations merged from py3k branch. Index: DockingBar.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/docking/DockingBar.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DockingBar.py 26 Feb 2008 13:11:32 -0000 1.6 --- DockingBar.py 2 Oct 2008 13:03:55 -0000 1.7 *************** *** 17,26 **** width = rect[2]-rect[0] height = rect[3]-rect[1] ! return rect[0] + width/2, rect[1] + height/2 ! def OffsetRect(rect, (x, y) ): return rect[0]+x, rect[1]+y, rect[2]+x, rect[3]+y ! def DeflateRect(rect, (x,y) ): return rect[0]+x, rect[1]+y, rect[2]-x, rect[3]-y --- 17,28 ---- width = rect[2]-rect[0] height = rect[3]-rect[1] ! return rect[0] + width//2, rect[1] + height//2 ! def OffsetRect(rect, point): ! (x, y) = point return rect[0]+x, rect[1]+y, rect[2]+x, rect[3]+y ! def DeflateRect(rect, point): ! (x, y) = point return rect[0]+x, rect[1]+y, rect[2]-x, rect[3]-y *************** *** 70,74 **** # Create the child dialog ! self.dialog = apply(childCreator, (self,) + childCreatorArgs) # use the dialog dimensions as default base dimensions --- 72,76 ---- # Create the child dialog ! self.dialog = childCreator(*(self,) + childCreatorArgs) # use the dialog dimensions as default base dimensions *************** *** 292,296 **** # def OnBarStyleChange(self, old, new): ! def OnNcCalcSize(self, bCalcValid, (rc0, rc1, rc2, pos)): self.rectBorder = self.GetWindowRect() self.rectBorder = OffsetRect( self.rectBorder, (-self.rectBorder[0], -self.rectBorder[1]) ) --- 294,299 ---- # def OnBarStyleChange(self, old, new): ! def OnNcCalcSize(self, bCalcValid, size_info): ! (rc0, rc1, rc2, pos) = size_info self.rectBorder = self.GetWindowRect() self.rectBorder = OffsetRect( self.rectBorder, (-self.rectBorder[0], -self.rectBorder[1]) ) |
|
From: Mark H. <mha...@us...> - 2008-10-02 13:04:14
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18401/Pythonwin/pywin/framework Modified Files: help.py Log Message: More py3k compatible syntax modernizations merged from py3k branch. Index: help.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/help.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** help.py 9 Aug 2008 16:47:07 -0000 1.12 --- help.py 2 Oct 2008 13:03:55 -0000 1.13 *************** *** 74,81 **** try: key = win32api.RegOpenKey(root, regutil.BuildDefaultPythonKey() + "\\Help", 0, win32con.KEY_READ) ! except win32api.error, (code, fn, details): import winerror ! if code!=winerror.ERROR_FILE_NOT_FOUND: ! raise win32api.error, (code, fn, details) return retList try: --- 74,81 ---- try: key = win32api.RegOpenKey(root, regutil.BuildDefaultPythonKey() + "\\Help", 0, win32con.KEY_READ) ! except win32api.error, exc: import winerror ! if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND: ! raise return retList try: *************** *** 87,94 **** retList.append((helpDesc, helpFile)) keyNo = keyNo + 1 ! except win32api.error, (code, fn, desc): import winerror ! if code!=winerror.ERROR_NO_MORE_ITEMS: ! raise win32api.error, (code, fn, desc) break finally: --- 87,94 ---- retList.append((helpDesc, helpFile)) keyNo = keyNo + 1 ! except win32api.error, exc: import winerror ! if exc.winerror!=winerror.ERROR_NO_MORE_ITEMS: ! raise break finally: |
|
From: Mark H. <mha...@us...> - 2008-10-02 13:04:14
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18401/Pythonwin/pywin/framework/editor Modified Files: document.py vss.py Log Message: More py3k compatible syntax modernizations merged from py3k branch. Index: vss.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor/vss.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** vss.py 9 Aug 2008 16:47:20 -0000 1.4 --- vss.py 2 Oct 2008 13:03:55 -0000 1.5 *************** *** 82,86 **** item.Checkout(None, fileName) ok = 1 ! except pythoncom.com_error, (hr, msg, exc, arg): if exc: msg = exc[2] --- 82,87 ---- item.Checkout(None, fileName) ok = 1 ! except pythoncom.com_error, exc: ! msg = exc.strerror if exc: msg = exc[2] Index: document.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor/document.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** document.py 9 Aug 2008 16:47:20 -0000 1.11 --- document.py 2 Oct 2008 13:03:55 -0000 1.12 *************** *** 117,121 **** states.append(info) self.OnOpenDocument(self.GetPathName()) ! for view, info in map(None, views, states): if info is not None: view._EndUserStateChange(info) --- 117,121 ---- states.append(info) self.OnOpenDocument(self.GetPathName()) ! for view, info in zip(views, states): if info is not None: view._EndUserStateChange(info) *************** *** 129,135 **** try: newstat = os.stat(self.GetPathName()) ! except os.error, (code, msg): if not self.bReportedFileNotFound: ! print "The file '%s' is open for editing, but\nchecking it for changes caused the error: %s" % (self.GetPathName(), msg) self.bReportedFileNotFound = 1 return --- 129,135 ---- try: newstat = os.stat(self.GetPathName()) ! except os.error, exc: if not self.bReportedFileNotFound: ! print "The file '%s' is open for editing, but\nchecking it for changes caused the error: %s" % (self.GetPathName(), exc.strerror) self.bReportedFileNotFound = 1 return *************** *** 288,293 **** try: self.watchEvent = win32api.FindFirstChangeNotification(path, 0, filter) ! except win32api.error, (rc, fn, msg): ! print "Can not watch file", path, "for changes -", msg def SignalStop(self): win32event.SetEvent(self.stopEvent) --- 288,293 ---- try: self.watchEvent = win32api.FindFirstChangeNotification(path, 0, filter) ! except win32api.error, exc: ! print "Can not watch file", path, "for changes -", exc.strerror def SignalStop(self): win32event.SetEvent(self.stopEvent) *************** *** 307,312 **** # If the directory has been removed underneath us, we get this error. win32api.FindNextChangeNotification(self.watchEvent) ! except win32api.error, (rc, fn, msg): ! print "Can not watch file", self.doc.GetPathName(), "for changes -", msg break --- 307,312 ---- # If the directory has been removed underneath us, we get this error. win32api.FindNextChangeNotification(self.watchEvent) ! except win32api.error, exc: ! print "Can not watch file", self.doc.GetPathName(), "for changes -", exc.strerror break |
|
From: Mark H. <mha...@us...> - 2008-10-02 12:10:04
|
Update of /cvsroot/pywin32/pywin32/win32/Lib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16045/win32/Lib Modified Files: commctrl.py win32con.py win32netcon.py win32serviceutil.py Log Message: various py3k compatible syntax modernizations merged from py3k branch; unnecessary 'L' suffixes, raise exceptions as objects, types module, etc Index: win32con.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32con.py,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** win32con.py 4 May 2008 10:43:37 -0000 1.23 --- win32con.py 2 Oct 2008 12:09:53 -0000 1.24 *************** *** 456,460 **** MB_SETFOREGROUND = 65536 MB_DEFAULT_DESKTOP_ONLY = 131072 ! MB_TOPMOST = 262144L MB_RIGHT = 524288 MB_RTLREADING = 1048576 --- 456,460 ---- MB_SETFOREGROUND = 65536 MB_DEFAULT_DESKTOP_ONLY = 131072 ! MB_TOPMOST = 262144 MB_RIGHT = 524288 MB_RTLREADING = 1048576 *************** *** 566,570 **** MFS_UNHILITE = MF_UNHILITE MFS_DEFAULT = MF_DEFAULT ! MFS_MASK = 4235L MFS_HOTTRACKDRAWN = 268435456 MFS_CACHEDBMP = 536870912 --- 566,570 ---- MFS_UNHILITE = MF_UNHILITE MFS_DEFAULT = MF_DEFAULT ! MFS_MASK = 4235 MFS_HOTTRACKDRAWN = 268435456 MFS_CACHEDBMP = 536870912 *************** *** 794,798 **** BS_USERBUTTON = 8 BS_AUTORADIOBUTTON = 9 ! BS_OWNERDRAW = 11L BS_LEFTTEXT = 32 BS_TEXT = 0 --- 794,798 ---- BS_USERBUTTON = 8 BS_AUTORADIOBUTTON = 9 ! BS_OWNERDRAW = 11 BS_LEFTTEXT = 32 BS_TEXT = 0 *************** *** 2415,2422 **** IMAGE_SYM_CLASS_SECTION = 104 IMAGE_SYM_CLASS_WEAK_EXTERNAL = 105 ! N_BTMASK = 017 ! N_TMASK = 060 ! N_TMASK1 = 0300 ! N_TMASK2 = 0360 N_BTSHFT = 4 N_TSHIFT = 2 --- 2415,2422 ---- IMAGE_SYM_CLASS_SECTION = 104 IMAGE_SYM_CLASS_WEAK_EXTERNAL = 105 ! N_BTMASK = 15 ! N_TMASK = 48 ! N_TMASK1 = 192 ! N_TMASK2 = 240 N_BTSHFT = 4 N_TSHIFT = 2 *************** *** 2431,2447 **** IMAGE_WEAK_EXTERN_SEARCH_ALIAS = 3 IMAGE_SIZEOF_RELOCATION = 10 ! IMAGE_REL_I386_SECTION = 012 ! IMAGE_REL_I386_SECREL = 013 ! IMAGE_REL_MIPS_REFHALF = 01 ! IMAGE_REL_MIPS_REFWORD = 02 ! IMAGE_REL_MIPS_JMPADDR = 03 ! IMAGE_REL_MIPS_REFHI = 04 ! IMAGE_REL_MIPS_REFLO = 05 ! IMAGE_REL_MIPS_GPREL = 06 ! IMAGE_REL_MIPS_LITERAL = 07 ! IMAGE_REL_MIPS_SECTION = 012 ! IMAGE_REL_MIPS_SECREL = 013 ! IMAGE_REL_MIPS_REFWORDNB = 042 ! IMAGE_REL_MIPS_PAIR = 045 IMAGE_REL_ALPHA_ABSOLUTE = 0 IMAGE_REL_ALPHA_REFLONG = 1 --- 2431,2447 ---- IMAGE_WEAK_EXTERN_SEARCH_ALIAS = 3 IMAGE_SIZEOF_RELOCATION = 10 ! IMAGE_REL_I386_SECTION = 10 ! IMAGE_REL_I386_SECREL = 11 ! IMAGE_REL_MIPS_REFHALF = 1 ! IMAGE_REL_MIPS_REFWORD = 2 ! IMAGE_REL_MIPS_JMPADDR = 3 ! IMAGE_REL_MIPS_REFHI = 4 ! IMAGE_REL_MIPS_REFLO = 5 ! IMAGE_REL_MIPS_GPREL = 6 ! IMAGE_REL_MIPS_LITERAL = 7 ! IMAGE_REL_MIPS_SECTION = 10 ! IMAGE_REL_MIPS_SECREL = 11 ! IMAGE_REL_MIPS_REFWORDNB = 34 ! IMAGE_REL_MIPS_PAIR = 37 IMAGE_REL_ALPHA_ABSOLUTE = 0 IMAGE_REL_ALPHA_REFLONG = 1 Index: win32serviceutil.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32serviceutil.py,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** win32serviceutil.py 7 Feb 2008 03:33:15 -0000 1.26 --- win32serviceutil.py 2 Oct 2008 12:09:53 -0000 1.27 *************** *** 491,495 **** print "Usage: '%s [options] install|update|remove|start [...]|stop|restart [...]|debug [...]'" % fname print "Options for 'install' and 'update' commands only:" ! print " --username domain\username : The Username the service is to run under" print " --password password : The password for the username" print " --startup [manual|auto|disabled] : How the service starts, default = manual" --- 491,495 ---- print "Usage: '%s [options] install|update|remove|start [...]|stop|restart [...]|debug [...]'" % fname print "Options for 'install' and 'update' commands only:" ! print " --username domain\\username : The Username the service is to run under" print " --password password : The password for the username" print " --startup [manual|auto|disabled] : How the service starts, default = manual" Index: commctrl.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/commctrl.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** commctrl.py 12 Apr 2005 03:03:53 -0000 1.6 --- commctrl.py 2 Oct 2008 12:09:53 -0000 1.7 *************** *** 110,115 **** CDIS_MARKED = 128 CDIS_INDETERMINATE = 256 ! CLR_NONE = 0xFFFFFFFFL ! CLR_DEFAULT = 0xFF000000L 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 *************** *** 789,800 **** HOTKEY_CLASSA = "msctls_hotkey32" HOTKEY_CLASS = HOTKEY_CLASSA ! CCS_TOP = 0x00000001L ! CCS_NOMOVEY = 0x00000002L ! CCS_BOTTOM = 0x00000003L ! CCS_NORESIZE = 0x00000004L ! CCS_NOPARENTALIGN = 0x00000008L ! CCS_ADJUSTABLE = 0x00000020L ! CCS_NODIVIDER = 0x00000040L ! CCS_VERT = 0x00000080L CCS_LEFT = (CCS_VERT | CCS_TOP) CCS_RIGHT = (CCS_VERT | CCS_BOTTOM) --- 789,800 ---- HOTKEY_CLASSA = "msctls_hotkey32" HOTKEY_CLASS = HOTKEY_CLASSA ! CCS_TOP = 0x00000001 ! CCS_NOMOVEY = 0x00000002 ! CCS_BOTTOM = 0x00000003 ! CCS_NORESIZE = 0x00000004 ! CCS_NOPARENTALIGN = 0x00000008 ! CCS_ADJUSTABLE = 0x00000020 ! CCS_NODIVIDER = 0x00000040 ! CCS_VERT = 0x00000080 CCS_LEFT = (CCS_VERT | CCS_TOP) CCS_RIGHT = (CCS_VERT | CCS_BOTTOM) *************** *** 1526,1542 **** TME_CANCEL = -2147483648 HOVER_DEFAULT = -1 ! WSB_PROP_CYVSCROLL = 0x00000001L ! WSB_PROP_CXHSCROLL = 0x00000002L ! WSB_PROP_CYHSCROLL = 0x00000004L ! WSB_PROP_CXVSCROLL = 0x00000008L ! WSB_PROP_CXHTHUMB = 0x00000010L ! WSB_PROP_CYVTHUMB = 0x00000020L ! WSB_PROP_VBKGCOLOR = 0x00000040L ! WSB_PROP_HBKGCOLOR = 0x00000080L ! WSB_PROP_VSTYLE = 0x00000100L ! WSB_PROP_HSTYLE = 0x00000200L ! WSB_PROP_WINSTYLE = 0x00000400L ! WSB_PROP_PALETTE = 0x00000800L ! WSB_PROP_MASK = 0x00000FFFL FSB_FLAT_MODE = 2 FSB_ENCARTA_MODE = 1 --- 1526,1542 ---- TME_CANCEL = -2147483648 HOVER_DEFAULT = -1 ! WSB_PROP_CYVSCROLL = 0x00000001 ! WSB_PROP_CXHSCROLL = 0x00000002 ! WSB_PROP_CYHSCROLL = 0x00000004 ! WSB_PROP_CXVSCROLL = 0x00000008 ! WSB_PROP_CXHTHUMB = 0x00000010 ! WSB_PROP_CYVTHUMB = 0x00000020 ! WSB_PROP_VBKGCOLOR = 0x00000040 ! WSB_PROP_HBKGCOLOR = 0x00000080 ! WSB_PROP_VSTYLE = 0x00000100 ! WSB_PROP_HSTYLE = 0x00000200 ! WSB_PROP_WINSTYLE = 0x00000400 ! WSB_PROP_PALETTE = 0x00000800 ! WSB_PROP_MASK = 0x00000FFF FSB_FLAT_MODE = 2 FSB_ENCARTA_MODE = 1 Index: win32netcon.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32netcon.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** win32netcon.py 4 Jun 2008 08:18:55 -0000 1.6 --- win32netcon.py 2 Oct 2008 12:09:53 -0000 1.7 *************** *** 311,315 **** DEF_MIN_PWAGE = 0 DEF_FORCE_LOGOFF = -1 ! ONE_DAY = 01*24*3600 GROUP_SPECIALGRP_USERS = "USERS" GROUP_SPECIALGRP_ADMINS = "ADMINS" --- 311,315 ---- DEF_MIN_PWAGE = 0 DEF_FORCE_LOGOFF = -1 ! ONE_DAY = 1*24*3600 GROUP_SPECIALGRP_USERS = "USERS" GROUP_SPECIALGRP_ADMINS = "ADMINS" *************** *** 353,357 **** SV_TYPE_DOMAIN_ENUM = -2147483648 SV_TYPE_ALL = -1 ! SV_NODISC = (-1L) SV_USERSECURITY = 1 SV_SHARESECURITY = 0 --- 353,357 ---- SV_TYPE_DOMAIN_ENUM = -2147483648 SV_TYPE_ALL = -1 ! SV_NODISC = -1 SV_USERSECURITY = 1 SV_SHARESECURITY = 0 |
