pywin32-checkins Mailing List for Python for Windows Extensions (Page 42)
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-12-06 00:36:19
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20820/Pythonwin/pywin Modified Files: default.cfg Log Message: Move to py2k *and* py3k syntax Index: default.cfg =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/default.cfg,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** default.cfg 11 Aug 2008 00:49:01 -0000 1.9 --- default.cfg 6 Dec 2008 00:36:13 -0000 1.10 *************** *** 197,202 **** find.lastSearch.findText = word find.lastSearch.sel = (start,end) ! except Exception, why: ! print repr(why), why find.FindNext() --- 197,203 ---- find.lastSearch.findText = word find.lastSearch.sel = (start,end) ! except Exception: ! import traceback ! traceback.print_exc() find.FindNext() |
|
From: Mark H. <mha...@us...> - 2008-12-06 00:35:27
|
Update of /cvsroot/pywin32/pywin32/Pythonwin In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20707/Pythonwin Modified Files: win32ui.h win32virt.cpp Log Message: Remove plain 'char *' and 'WCHAR *' retval helpers as they make memory management with auto unicode conversions impossible. Index: win32ui.h =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/win32ui.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** win32ui.h 13 Nov 2008 04:04:50 -0000 1.8 --- win32ui.h 6 Dec 2008 00:35:20 -0000 1.9 *************** *** 314,319 **** BOOL retval( PyObject* &ret ); BOOL retval( CREATESTRUCT &cs ); ! BOOL retval( char * &ret ); ! BOOL retval( WCHAR *&ret ); BOOL retval( CString &ret ); BOOL retval( MSG *msg); --- 314,320 ---- BOOL retval( PyObject* &ret ); BOOL retval( CREATESTRUCT &cs ); ! // Note the lack of 'char *' or 'WCHAR *' support - this makes it ! // too hard for memory management when converting between strings and ! // unicode. Use the CString one instead. BOOL retval( CString &ret ); BOOL retval( MSG *msg); Index: win32virt.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/win32virt.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** win32virt.cpp 13 Nov 2008 04:04:50 -0000 1.7 --- win32virt.cpp 6 Dec 2008 00:35:20 -0000 1.8 *************** *** 545,580 **** } - BOOL CVirtualHelper::retval( char *&ret ) - { - ASSERT(retVal); - if (!retVal) - return FALSE; // failed - assume didnt work in non debug - if (retVal==Py_None) { - ret = NULL; - return TRUE; - } - CEnterLeavePython _celp; - ret = PyString_AsString(retVal); - if (ret == NULL) { - gui_print_error(); - return FALSE; - } - return TRUE; - } - - BOOL CVirtualHelper::retval(WCHAR *&ret ) - { - ASSERT(retVal); - if (!retVal) - return FALSE; // failed - assume didnt work in non debug - CEnterLeavePython _celp; - // ??? This leaks memory, but this overload is not actually used anywhere ??? - if (!PyWinObject_AsWCHAR(retVal, &ret, TRUE)){ - gui_print_error(); - return FALSE; - } - return TRUE; - } - BOOL CVirtualHelper::retval( CString &ret ) { --- 545,548 ---- |
|
From: Mark H. <mha...@us...> - 2008-12-06 00:34:12
|
Update of /cvsroot/pywin32/pywin32/Pythonwin In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20504/Pythonwin Modified Files: ddeconv.cpp ddemodule.h stddde.cpp Log Message: Fix broken memory allocation in DDE module and support for unicode builds without leaking mem Index: ddemodule.h =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/ddemodule.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ddemodule.h 13 Nov 2008 04:04:50 -0000 1.2 --- ddemodule.h 6 Dec 2008 00:34:06 -0000 1.3 *************** *** 24,28 **** }; - template <class T> class PythonDDETopicFramework : public T --- 24,27 ---- *************** *** 39,43 **** return !rc; } ! virtual BOOL NSRequest(const TCHAR * szItem, void** ppData, DWORD* dwSize) { PyObject *args = Py_BuildValue("(N)", PyWinObject_FromTCHAR(szItem)); --- 38,42 ---- return !rc; } ! virtual BOOL NSRequest(const TCHAR *szItem, CDDEAllocator &allocr) { PyObject *args = Py_BuildValue("(N)", PyWinObject_FromTCHAR(szItem)); *************** *** 45,55 **** CVirtualHelper helper("Request", this); if (helper.call_args(args) ) { ! TCHAR * strret ; if (helper.retval(strret)) { ! PyObject * look ; ! helper.retval(look) ; ! *dwSize = PyObject_Length(look)+1 ; ! *ppData = (void*)strret ; ! return TRUE ; } } --- 44,52 ---- CVirtualHelper helper("Request", this); if (helper.call_args(args) ) { ! CString strret; if (helper.retval(strret)) { ! // seems strange we can't use DdeCreateStringHandle, but that is ! // a different handle type ! return allocr.Alloc(strret); } } Index: ddeconv.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/ddeconv.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ddeconv.cpp 13 Nov 2008 04:04:50 -0000 1.2 --- ddeconv.cpp 6 Dec 2008 00:34:06 -0000 1.3 *************** *** 82,95 **** if (!PyWinObject_AsTCHAR(obCmd, &szCmd, FALSE)) return NULL; GUI_BGN_SAVE; ! void *ppData ; ! DWORD pdwSize ; ! BOOL ok = pConv->Request(szCmd, &ppData, &pdwSize); GUI_END_SAVE; PyWinObject_FreeTCHAR(szCmd); if (!ok) RETURN_DDE_ERR("Request failed"); ! PyObject * result = PyWinObject_FromTCHAR((TCHAR *)ppData); ! free(ppData) ; return result ; } --- 82,93 ---- if (!PyWinObject_AsTCHAR(obCmd, &szCmd, FALSE)) return NULL; + CString ret; GUI_BGN_SAVE; ! BOOL ok = pConv->Request(szCmd, ret); GUI_END_SAVE; PyWinObject_FreeTCHAR(szCmd); if (!ok) RETURN_DDE_ERR("Request failed"); ! PyObject * result = PyWinObject_FromTCHAR((const TCHAR *)ret); return result ; } Index: stddde.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/stddde.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** stddde.cpp 13 Nov 2008 09:48:01 -0000 1.7 --- stddde.cpp 6 Dec 2008 00:34:06 -0000 1.8 *************** *** 178,182 **** } ! BOOL CDDEItem::Request(UINT wFmt, void** ppData, DWORD* pdwSize) { return FALSE; --- 178,182 ---- } ! BOOL CDDEItem::Request(UINT wFmt, CDDEAllocator &allocr) { return FALSE; *************** *** 184,188 **** //CT BEGIN ! BOOL CDDEItem::NSRequest(const TCHAR* szItem, void** ppData, DWORD* pdwSize) { return FALSE; --- 184,188 ---- //CT BEGIN ! BOOL CDDEItem::NSRequest(const TCHAR* szItem, CDDEAllocator &allocr) { return FALSE; *************** *** 240,250 **** } ! BOOL CDDEStringItem::Request(UINT wFmt, void** ppData, DWORD* pdwSize) { ASSERT(wFmt == CF_TEXT); ! ASSERT(ppData); ! *ppData = (void*)(const TCHAR*)m_strData; ! *pdwSize = m_strData.GetLength() + 1; // allow for the null ! return TRUE; } --- 240,247 ---- } ! BOOL CDDEStringItem::Request(UINT wFmt, CDDEAllocator &allocr) { ASSERT(wFmt == CF_TEXT); ! return allocr.Alloc(m_strData); } *************** *** 320,324 **** BOOL CDDETopic::Request(UINT wFmt, const TCHAR* pszItem, ! void** ppData, DWORD* pdwSize) { // --- 317,321 ---- BOOL CDDETopic::Request(UINT wFmt, const TCHAR* pszItem, ! CDDEAllocator &allocr) { // *************** *** 331,343 **** //CT BEGIN if (pItem->m_strName == "") { ! BOOL ret = NSRequest(pszItem, ppData, pdwSize); return ret ; } //CT END ! return pItem->Request(wFmt, ppData, pdwSize); } //CT BEGIN ! BOOL CDDETopic::NSRequest(const TCHAR * szItem, void** ppData, DWORD* dwsize) { return FALSE ; --- 328,340 ---- //CT BEGIN if (pItem->m_strName == "") { ! BOOL ret = NSRequest(pszItem, allocr); return ret ; } //CT END ! return pItem->Request(wFmt, allocr); } //CT BEGIN ! BOOL CDDETopic::NSRequest(const TCHAR *szItem, CDDEAllocator &allocr) { return FALSE ; *************** *** 542,551 **** } ! BOOL CDDEConv::Request(const TCHAR* pszItem, void** ppData, DWORD* pdwSize) { ASSERT(m_pServer); ASSERT(pszItem); - ASSERT(ppData); - ASSERT(pdwSize); CHSZ hszItem (m_pServer, pszItem); --- 539,546 ---- } ! BOOL CDDEConv::Request(const TCHAR* pszItem, CString &ret) { ASSERT(m_pServer); ASSERT(pszItem); CHSZ hszItem (m_pServer, pszItem); *************** *** 554,558 **** --- 549,557 ---- m_hConv, hszItem, + #if defined(UNICODE) + CF_UNICODETEXT, + #else CF_TEXT, + #endif XTYP_REQUEST, DDE_TIMEOUT, *************** *** 560,567 **** if (!hData) { - - // Failed - *pdwSize = 0; - *ppData = NULL; return FALSE; } --- 559,562 ---- *************** *** 570,581 **** // Copy the result data // ! ! BYTE* pData = ::DdeAccessData(hData, pdwSize); ! ASSERT(*pdwSize); ! *ppData = new char[*pdwSize]; ! ASSERT(*ppData); ! memcpy(*ppData, pData, *pdwSize); ::DdeUnaccessData(hData); ! return TRUE; } --- 565,578 ---- // Copy the result data // ! DWORD dwSize; ! BYTE* pData = ::DdeAccessData(hData, &dwSize); ! DWORD nChars = (dwSize / sizeof(TCHAR))-1; ! ret = CString((TCHAR *)pData, nChars); ::DdeUnaccessData(hData); ! // MSDN sez 'When an application has finished using the data handle ! // returned by DdeClientTransaction, the application should free the ! // handle by calling the DdeFreeDataHandle function.' - which would ! // be about now! ! ::DdeFreeDataHandle(hData); return TRUE; } *************** *** 693,697 **** IMPLEMENT_DYNCREATE(CDDESystemItem_TopicList, CDDESystemItem); ! BOOL CDDESystemItem_TopicList::Request(UINT wFmt, void** ppData, DWORD* pdwSize) { // --- 690,694 ---- IMPLEMENT_DYNCREATE(CDDESystemItem_TopicList, CDDESystemItem); ! BOOL CDDESystemItem_TopicList::Request(UINT wFmt, CDDEAllocator &allocr) { // *************** *** 728,740 **** // Set up the return info // ! ! *ppData = (void*)(const TCHAR*)strTopics; ! *pdwSize = strTopics.GetLength() + 1; // include room for the NULL ! return TRUE; } IMPLEMENT_DYNCREATE(CDDESystemItem_ItemList, CDDESystemItem); ! BOOL CDDESystemItem_ItemList::Request(UINT wFmt, void** ppData, DWORD* pdwSize) { // --- 725,734 ---- // Set up the return info // ! return allocr.Alloc(strTopics); } IMPLEMENT_DYNCREATE(CDDESystemItem_ItemList, CDDESystemItem); ! BOOL CDDESystemItem_ItemList::Request(UINT wFmt, CDDEAllocator &allocr) { // *************** *** 769,781 **** // Set up the return info // ! ! *ppData = (void*)(const TCHAR*)strItems; ! *pdwSize = strItems.GetLength() + 1; // include room for the NULL ! return TRUE; } IMPLEMENT_DYNCREATE(CDDESystemItem_FormatList, CDDESystemItem); ! BOOL CDDESystemItem_FormatList::Request(UINT wFmt, void** ppData, DWORD* pdwSize) { // --- 763,772 ---- // Set up the return info // ! return allocr.Alloc(strItems); } IMPLEMENT_DYNCREATE(CDDESystemItem_FormatList, CDDESystemItem); ! BOOL CDDESystemItem_FormatList::Request(UINT wFmt, CDDEAllocator &allocr) { // *************** *** 850,857 **** // Set up the return info // ! ! *ppData = (void*)(const TCHAR*)strFormats; ! *pdwSize = strFormats.GetLength() + 1; // include romm for the NULL ! return TRUE; } --- 841,845 ---- // Set up the return info // ! return allocr.Alloc(strFormats); } *************** *** 859,866 **** BOOL CDDEServerSystemTopic::Request(UINT wFmt, const TCHAR* pszItem, ! void** ppData, DWORD* pdwSize) { m_pServer->Status(_T("System topic request: %s"), pszItem); ! return CDDETopic::Request(wFmt, pszItem, ppData, pdwSize); } --- 847,854 ---- BOOL CDDEServerSystemTopic::Request(UINT wFmt, const TCHAR* pszItem, ! CDDEAllocator &allocr) { m_pServer->Status(_T("System topic request: %s"), pszItem); ! return CDDETopic::Request(wFmt, pszItem, allocr); } *************** *** 1694,1702 **** // a generic one for the topic // Status(_T("Request %s|%s"), (const TCHAR*)strTopic, (const TCHAR*)strItem); dwLength = 0; ! if (!Request(wFmt, strTopic, strItem, &pData, &dwLength)) { ! // // Nobody accepted the request --- 1682,1691 ---- // a generic one for the topic // + { // scope for locals. + CDDEAllocator allocr(m_dwDDEInstance, hszItem, wFmt, phReturnData); Status(_T("Request %s|%s"), (const TCHAR*)strTopic, (const TCHAR*)strItem); dwLength = 0; ! if (!Request(wFmt, strTopic, strItem, allocr)) { // // Nobody accepted the request *************** *** 1710,1725 **** } ! // ! // There is some data so build a DDE data object to return ! // ! ! *phReturnData = ::DdeCreateDataHandle(m_dwDDEInstance, ! (unsigned char*)pData, ! dwLength, ! 0, ! hszItem, ! wFmt, ! 0); ! break; --- 1699,1704 ---- } ! } // end locals scope ! // Data already setup via 'allocr' param, so we are done. break; *************** *** 1805,1809 **** BOOL CDDEServer::Request(UINT wFmt, const TCHAR* pszTopic, const TCHAR* pszItem, ! void** ppData, DWORD* pdwSize) { // --- 1784,1788 ---- BOOL CDDEServer::Request(UINT wFmt, const TCHAR* pszTopic, const TCHAR* pszItem, ! CDDEAllocator &allocr) { // *************** *** 1814,1818 **** if (!pTopic) return FALSE; ! return pTopic->Request(wFmt, pszItem, ppData, pdwSize); } --- 1793,1797 ---- if (!pTopic) return FALSE; ! return pTopic->Request(wFmt, pszItem, allocr); } |
|
From: Mark H. <mha...@us...> - 2008-12-06 00:34:12
|
Update of /cvsroot/pywin32/pywin32/win32/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20504/win32/src Modified Files: stddde.h Log Message: Fix broken memory allocation in DDE module and support for unicode builds without leaking mem Index: stddde.h =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/src/stddde.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** stddde.h 13 Nov 2008 09:48:01 -0000 1.2 --- stddde.h 6 Dec 2008 00:34:06 -0000 1.3 *************** *** 43,46 **** --- 43,76 ---- static CString GetFormatName(WORD wFmt); + // A class used for memory allocation; designed to be created on the stack, + // then passed around. + class CDDEAllocator + { + public: + CDDEAllocator(DWORD instance, HSZ hszItem, UINT wFmt, HDDEDATA *hret) : + m_instance(instance), m_hszItem(hszItem), m_wFmt(wFmt), m_hret(hret) {;} + BOOL Alloc(CString &cs) { + // XXX - should we check wFmt is CF_TEXT vs CF_UNICODETEXT?? + return Alloc((LPBYTE)(const TCHAR *)cs, (cs.GetLength() + 1) * sizeof(TCHAR)); + } + BOOL Alloc(LPBYTE p, DWORD cb) { + // XXX - should we check wFmt is CF_TEXT vs CF_UNICODETEXT?? + *m_hret = ::DdeCreateDataHandle(m_instance, + p, + cb, + 0, + m_hszItem, + m_wFmt, + 0); + return TRUE; + } + protected: + UINT m_wFmt; + DWORD m_instance; + HSZ m_hszItem; + HDDEDATA *m_hret; + + }; + // // Generic counted object class *************** *** 97,107 **** void Create(const TCHAR* pszName); void PostAdvise(); ! virtual BOOL Request(UINT wFmt, void** ppData, DWORD* pdwSize); //CT BEGIN ! virtual BOOL NSRequest(const TCHAR* szItem, void** ppData, DWORD* pdwSize); ! virtual BOOL NSPoke(const TCHAR* szItem, void* pData, DWORD dwSize); ! virtual BOOL Poke(void* pData, DWORD dwSize); //CT END ! virtual BOOL Poke(UINT wFmt, void* pData, DWORD dwSize); virtual BOOL IsSupportedFormat(WORD wFormat); virtual WORD* GetFormatList() --- 127,137 ---- void Create(const TCHAR* pszName); void PostAdvise(); ! virtual BOOL Request(UINT wFmt, CDDEAllocator &allocr); //CT BEGIN ! virtual BOOL NSRequest(const TCHAR* szItem, CDDEAllocator &allocr); ! virtual BOOL NSPoke(const TCHAR* szItem, void* pData, DWORD dwSize); ! virtual BOOL Poke(void* pData, DWORD dwSize); //CT END ! virtual BOOL Poke(UINT wFmt, void* pData, DWORD dwSize); virtual BOOL IsSupportedFormat(WORD wFormat); virtual WORD* GetFormatList() *************** *** 131,135 **** protected: ! virtual BOOL Request(UINT wFmt, void** ppData, DWORD* pdwSize); virtual BOOL Poke(UINT wFmt, void* pData, DWORD dwSize); virtual WORD* GetFormatList(); --- 161,165 ---- protected: ! virtual BOOL Request(UINT wFmt, CDDEAllocator &allocr); virtual BOOL Poke(UINT wFmt, void* pData, DWORD dwSize); virtual WORD* GetFormatList(); *************** *** 167,175 **** void Create(const TCHAR* pszName); BOOL AddItem(CDDEItem* pItem); ! virtual BOOL Request(UINT wFmt, const TCHAR* pszItem, ! void** ppData, DWORD* pdwSize); //CT BEGIN ! virtual BOOL NSRequest(const TCHAR * szItem, void** ppData, DWORD* pdwSize); ! virtual BOOL NSPoke(const TCHAR * szItem, void* pData, DWORD dwSize); virtual BOOL Poke(const TCHAR* pszItem, void* pData, DWORD dwSize); --- 197,206 ---- void Create(const TCHAR* pszName); BOOL AddItem(CDDEItem* pItem); ! virtual BOOL Request(UINT wFmt, const TCHAR* pszItem, CDDEAllocator &allocr); //CT BEGIN ! virtual BOOL NSRequest(const TCHAR *szItem, CDDEAllocator &allocr); ! // Note: If poke ever needs to return data, it should do like NSRequest, ! // otherwise memory management becomes impossible. ! virtual BOOL NSPoke(const TCHAR * szItem, void* pData, DWORD dwSize); virtual BOOL Poke(const TCHAR* pszItem, void* pData, DWORD dwSize); *************** *** 217,221 **** CDDEConv(CDDEServer* pServer); CDDEConv(CDDEServer* pServer, HCONV hConv, HSZ hszTopic); ! BOOL Connected() {return (m_hConv != NULL);} virtual ~CDDEConv(); virtual BOOL ConnectTo(const TCHAR* pszService, const TCHAR* pszTopic); --- 248,252 ---- CDDEConv(CDDEServer* pServer); CDDEConv(CDDEServer* pServer, HCONV hConv, HSZ hszTopic); ! BOOL Connected() {return (m_hConv != NULL);} virtual ~CDDEConv(); virtual BOOL ConnectTo(const TCHAR* pszService, const TCHAR* pszTopic); *************** *** 223,227 **** virtual BOOL AdviseData(UINT wFmt, const TCHAR* pszTopic, const TCHAR* pszItem, void* pData, DWORD dwSize); ! virtual BOOL Request(const TCHAR* pszItem, void** ppData, DWORD* pdwSize); virtual BOOL Advise(const TCHAR* pszItem); virtual BOOL Exec(const TCHAR* pszCmd); --- 254,258 ---- virtual BOOL AdviseData(UINT wFmt, const TCHAR* pszTopic, const TCHAR* pszItem, void* pData, DWORD dwSize); ! virtual BOOL Request(const TCHAR* pszItem, CString &ret); virtual BOOL Advise(const TCHAR* pszItem); virtual BOOL Exec(const TCHAR* pszCmd); *************** *** 269,273 **** DECLARE_DYNCREATE(CDDESystemItem_TopicList); protected: ! virtual BOOL Request(UINT wFmt, void** ppData, DWORD* pdwSize); }; --- 300,304 ---- DECLARE_DYNCREATE(CDDESystemItem_TopicList); protected: ! virtual BOOL Request(UINT wFmt, CDDEAllocator &allocr); }; *************** *** 276,280 **** DECLARE_DYNCREATE(CDDESystemItem_ItemList); protected: ! virtual BOOL Request(UINT wFmt, void** ppData, DWORD* pdwSize); }; --- 307,311 ---- DECLARE_DYNCREATE(CDDESystemItem_ItemList); protected: ! virtual BOOL Request(UINT wFmt, CDDEAllocator &allocr); }; *************** *** 283,287 **** DECLARE_DYNCREATE(CDDESystemItem_FormatList); protected: ! virtual BOOL Request(UINT wFmt, void** ppData, DWORD* pdwSize); }; --- 314,318 ---- DECLARE_DYNCREATE(CDDESystemItem_FormatList); protected: ! virtual BOOL Request(UINT wFmt, CDDEAllocator &allocr); }; *************** *** 291,295 **** protected: virtual BOOL Request(UINT wFmt, const TCHAR* pszItem, ! void** ppData, DWORD* pdwSize); }; --- 322,326 ---- protected: virtual BOOL Request(UINT wFmt, const TCHAR* pszItem, ! CDDEAllocator &allocr); }; *************** *** 327,331 **** virtual BOOL Request(UINT wFmt, const TCHAR* pszTopic, const TCHAR* pszItem, ! void** ppData, DWORD* pdwSize); virtual BOOL Poke(UINT wFmt, const TCHAR* pszTopic, const TCHAR* pszItem, void* pData, DWORD dwSize); --- 358,362 ---- virtual BOOL Request(UINT wFmt, const TCHAR* pszTopic, const TCHAR* pszItem, ! CDDEAllocator &allocr); virtual BOOL Poke(UINT wFmt, const TCHAR* pszTopic, const TCHAR* pszItem, void* pData, DWORD dwSize); |
|
From: Mark H. <mha...@us...> - 2008-12-06 00:21:14
|
Update of /cvsroot/pywin32/pywin32/win32/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17826/win32/src Modified Files: win32rasmodule.cpp Log Message: fix module init error introduced in 3k merge Index: win32rasmodule.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/src/win32rasmodule.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** win32rasmodule.cpp 3 Dec 2008 22:16:53 -0000 1.12 --- win32rasmodule.cpp 6 Dec 2008 00:21:07 -0000 1.13 *************** *** 846,849 **** // module_error = PyString_FromString("win32ras error"); PyDict_SetItemString(dict, "error", module_error); ! AddConstants(dict); } --- 846,849 ---- // module_error = PyString_FromString("win32ras error"); PyDict_SetItemString(dict, "error", module_error); ! AddConstants(module); } |
|
From: Mark H. <mha...@us...> - 2008-12-05 23:59:19
|
Update of /cvsroot/pywin32/pywin32 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12275 Modified Files: pywin32_postinstall.py Log Message: One more raise statement to modern syntax Index: pywin32_postinstall.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/pywin32_postinstall.py,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** pywin32_postinstall.py 4 Dec 2008 06:56:36 -0000 1.29 --- pywin32_postinstall.py 5 Dec 2008 23:59:14 -0000 1.30 *************** *** 99,103 **** csidl = getattr(shellcon, maybe) return shell.SHGetSpecialFolderPath(0, csidl, False) ! raise ValueError, "%s is an unknown path ID" % (path_name,) def CopyTo(desc, src, dest): --- 99,103 ---- csidl = getattr(shellcon, maybe) return shell.SHGetSpecialFolderPath(0, csidl, False) ! raise ValueError("%s is an unknown path ID" % (path_name,)) def CopyTo(desc, src, dest): |
|
From: Mark H. <mha...@us...> - 2008-12-05 23:58:33
|
Update of /cvsroot/pywin32/pywin32 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12097 Modified Files: CHANGES.txt Log Message: Add notes about Pythonwin updates from Rémi Paucher Index: CHANGES.txt =================================================================== RCS file: /cvsroot/pywin32/pywin32/CHANGES.txt,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** CHANGES.txt 13 Nov 2008 04:04:50 -0000 1.33 --- CHANGES.txt 5 Dec 2008 23:58:28 -0000 1.34 *************** *** 9,12 **** --- 9,16 ---- ---------------- + * Pythonwin updates from Rémi Paucher; enter completes auto-complete in + the editor and interactive windows, auto-complete should now work on French + keyboards. + * Lots of work to better support unicode, py3k and 64bits from Roger. Most of these changes will be invisible, and those that are not |
|
From: Mark H. <mha...@us...> - 2008-12-04 12:45:55
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29496/scintilla Modified Files: bindings.py Log Message: >From Rémi Paucher; enable auto-expand on french keyboards Index: bindings.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla/bindings.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** bindings.py 14 Nov 2008 00:22:25 -0000 1.6 --- bindings.py 4 Dec 2008 12:45:51 -0000 1.7 *************** *** 172,175 **** --- 172,180 ---- # (XXX - which do not work :-( event = self.keymap.get( keyinfo ) + #Enable autoexpand an autocompletion on French keyborads + if keyinfo == (190, 16): + event = "KeyDot" + elif keyinfo == (222, 0): + event = "<<expand-word>>" if event is None: ## if key == 220: # Dead key |
|
From: Mark H. <mha...@us...> - 2008-12-04 12:44:49
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29446/framework Modified Files: interact.py Log Message: Patch from Rémi Paucher; enter completes auto-complete Index: interact.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/interact.py,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** interact.py 26 Nov 2008 08:39:32 -0000 1.18 --- interact.py 4 Dec 2008 12:44:44 -0000 1.19 *************** *** 443,446 **** --- 443,452 ---- # def ProcessEnterEvent(self, event ): + #If autocompletion has been triggered, complete and do not process event + if self.SCIAutoCActive(): + self.SCIAutoCComplete() + self.SCICancel() + return + self.SCICancel() # First, check for an error message |
|
From: Mark H. <mha...@us...> - 2008-12-04 12:44:48
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor/color In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29446/framework/editor/color Modified Files: coloreditor.py Log Message: Patch from Rémi Paucher; enter completes auto-complete Index: coloreditor.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor/color/coloreditor.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** coloreditor.py 2 Sep 2008 20:56:16 -0000 1.14 --- coloreditor.py 4 Dec 2008 12:44:44 -0000 1.15 *************** *** 335,338 **** --- 335,339 ---- # Handle auto-complete first. if self.SCIAutoCActive(): + self.SCIAutoCComplete() self.SCIAutoCCancel() # Call the IDLE event. |
|
From: Mark H. <mha...@us...> - 2008-12-04 07:32:12
|
Update of /cvsroot/pywin32/pywin32/win32/Lib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4678/win32/Lib Modified Files: Tag: py3k win32pdhquery.py win32timezone.py Log Message: many more py3k syntax improvements thanks to 2to3 Index: win32pdhquery.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32pdhquery.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 *** win32pdhquery.py 27 Nov 2008 11:31:07 -0000 1.3.4.1 --- win32pdhquery.py 4 Dec 2008 07:32:06 -0000 1.3.4.2 *************** *** 126,130 **** # Feb 12, 98 - MH added "rawaddcounter" so caller can get exception details. ! import win32pdh, win32api,time, thread,copy class BaseQuery: --- 126,130 ---- # Feb 12, 98 - MH added "rawaddcounter" so caller can get exception details. ! import win32pdh, win32api,time, _thread,copy class BaseQuery: *************** *** 475,479 **** ''' self.collectdatawhile_active = 1 ! thread.start_new_thread(self.collectdatawhile_slave,(period,)) def collectdatawhile_stop(self): ''' --- 475,479 ---- ''' self.collectdatawhile_active = 1 ! _thread.start_new_thread(self.collectdatawhile_slave,(period,)) def collectdatawhile_stop(self): ''' Index: win32timezone.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32timezone.py,v retrieving revision 1.9.2.5 retrieving revision 1.9.2.6 diff -C2 -d -r1.9.2.5 -r1.9.2.6 *** win32timezone.py 27 Nov 2008 11:31:10 -0000 1.9.2.5 --- win32timezone.py 4 Dec 2008 07:32:06 -0000 1.9.2.6 *************** *** 129,133 **** import os ! import _winreg import struct import datetime --- 129,133 ---- import os ! import winreg import struct import datetime *************** *** 153,157 **** if not name: key, name = os.path.split(key) ! value, type = _winreg.QueryValueEx(key, name) self.__init_from_bytes__(value) --- 153,157 ---- if not name: key, name = os.path.split(key) ! value, type = winreg.QueryValueEx(key, name) self.__init_from_bytes__(value) *************** *** 232,236 **** tzRegKeyPath = os.path.join(self.tzRegKey, timeZoneName) try: ! key = _winreg.OpenKeyEx(_winreg.HKEY_LOCAL_MACHINE, tzRegKeyPath) except: raise ValueError('Timezone Name %s not found.' % timeZoneName) --- 232,236 ---- tzRegKeyPath = os.path.join(self.tzRegKey, timeZoneName) try: ! key = winreg.OpenKeyEx(_winreg.HKEY_LOCAL_MACHINE, tzRegKeyPath) except: raise ValueError('Timezone Name %s not found.' % timeZoneName) *************** *** 243,249 **** """Loads the information from an opened time zone registry key into relevant fields of this TZI object""" ! self.displayName = _winreg.QueryValueEx(key, "Display")[0] ! self.standardName = _winreg.QueryValueEx(key, "Std")[0] ! self.daylightName = _winreg.QueryValueEx(key, "Dlt")[0] self.staticInfo = WinTZI(key, "TZI") self._LoadDynamicInfoFromKey(key) --- 243,249 ---- """Loads the information from an opened time zone registry key into relevant fields of this TZI object""" ! self.displayName = winreg.QueryValueEx(key, "Display")[0] ! self.standardName = winreg.QueryValueEx(key, "Std")[0] ! self.daylightName = winreg.QueryValueEx(key, "Dlt")[0] self.staticInfo = WinTZI(key, "TZI") self._LoadDynamicInfoFromKey(key) *************** *** 251,255 **** def _LoadDynamicInfoFromKey(self, key): try: ! dkey = _winreg.OpenKeyEx(key, 'Dynamic DST') except WindowsError: return --- 251,255 ---- def _LoadDynamicInfoFromKey(self, key): try: ! dkey = winreg.OpenKeyEx(key, 'Dynamic DST') except WindowsError: return *************** *** 257,262 **** del info['FirstEntry'] del info['LastEntry'] ! years = map(int, info.keys()) ! values = map(WinTZI, info.values()) # create a range mapping that searches by descending year and matches # if the target year is greater or equal. --- 257,262 ---- del info['FirstEntry'] del info['LastEntry'] ! years = map(int, list(info.keys())) ! values = map(WinTZI, list(info.values())) # create a range mapping that searches by descending year and matches # if the target year is greater or equal. *************** *** 347,353 **** def _get_time_zone_key(subkey=None): "Return the registry key that stores time zone details" ! key = _winreg.OpenKeyEx(_winreg.HKEY_LOCAL_MACHINE, TimeZoneInfo.tzRegKey) if subkey: ! key = _winreg.OpenKeyEx(key, subkey) return key _get_time_zone_key = staticmethod(_get_time_zone_key) --- 347,353 ---- def _get_time_zone_key(subkey=None): "Return the registry key that stores time zone details" ! key = winreg.OpenKeyEx(_winreg.HKEY_LOCAL_MACHINE, TimeZoneInfo.tzRegKey) if subkey: ! key = winreg.OpenKeyEx(key, subkey) return key _get_time_zone_key = staticmethod(_get_time_zone_key) *************** *** 365,369 **** def get_index_value(key_name): key = TimeZoneInfo._get_time_zone_key(key_name) ! value, type = _winreg.QueryValueEx(key, index_key) return value values = map(get_index_value, key_names) --- 365,369 ---- def get_index_value(key_name): key = TimeZoneInfo._get_time_zone_key(key_name) ! value, type = winreg.QueryValueEx(key, index_key) return value values = map(get_index_value, key_names) *************** *** 397,404 **** def _RegKeyEnumerator(key): ! return _RegEnumerator(key, _winreg.EnumKey) def _RegValueEnumerator(key): ! return _RegEnumerator(key, _winreg.EnumValue) def _RegEnumerator(key, func): --- 397,404 ---- def _RegKeyEnumerator(key): ! return _RegEnumerator(key, winreg.EnumKey) def _RegValueEnumerator(key): ! return _RegEnumerator(key, winreg.EnumValue) def _RegEnumerator(key, func): *************** *** 414,418 **** values = _RegValueEnumerator(key) values = tuple(values) ! return dict(map(lambda name_value_type: (name_value_type[0],name_value_type[1]), values)) # for backward compatibility --- 414,418 ---- values = _RegValueEnumerator(key) values = tuple(values) ! return dict(map(lambda (name,value,type): (name,value), values)) # for backward compatibility *************** *** 455,459 **** """ tzRegKey = r'SYSTEM\CurrentControlSet\Control\TimeZoneInformation' ! key = _winreg.OpenKeyEx(_winreg.HKEY_LOCAL_MACHINE, tzRegKey) local = _RegKeyDict(key) # if the user has not checked "Automatically adjust clock for daylight --- 455,459 ---- """ tzRegKey = r'SYSTEM\CurrentControlSet\Control\TimeZoneInformation' ! key = winreg.OpenKeyEx(_winreg.HKEY_LOCAL_MACHINE, tzRegKey) local = _RegKeyDict(key) # if the user has not checked "Automatically adjust clock for daylight |
|
From: Mark H. <mha...@us...> - 2008-12-04 07:32:11
|
Update of /cvsroot/pywin32/pywin32/win32/Demos/security In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4678/win32/Demos/security Modified Files: Tag: py3k security_enums.py Log Message: many more py3k syntax improvements thanks to 2to3 Index: security_enums.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Demos/security/security_enums.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 *** security_enums.py 27 Nov 2008 11:31:05 -0000 1.2.2.2 --- security_enums.py 4 Dec 2008 07:32:06 -0000 1.2.2.3 *************** *** 20,24 **** def lookup_name(self, const_val): """Looks up the name of a particular value.""" ! for k,v in list(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__.items(): if v==const_val: return k *************** *** 29,33 **** flag_names=[] unknown_flags=flags ! for k,v in list(self.__dict__.items()): if flags & v == v: flag_names.append(k) --- 29,33 ---- flag_names=[] unknown_flags=flags ! for k,v in self.__dict__.items(): if flags & v == v: flag_names.append(k) |
|
From: Mark H. <mha...@us...> - 2008-12-04 07:32:11
|
Update of /cvsroot/pywin32/pywin32/com/win32comext/axdebug In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4678/com/win32comext/axdebug Modified Files: Tag: py3k adb.py contexts.py documents.py expressions.py stackframe.py Log Message: many more py3k syntax improvements thanks to 2to3 Index: adb.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/adb.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 *** adb.py 4 Dec 2008 05:04:32 -0000 1.6.2.2 --- adb.py 4 Dec 2008 07:32:05 -0000 1.6.2.3 *************** *** 8,12 **** import axdebug, stackframe import win32api, pythoncom ! import thread, os def fnull(*args): --- 8,12 ---- import axdebug, stackframe import win32api, pythoncom ! import _thread, os def fnull(*args): *************** *** 73,77 **** self.recursiveData = [] # Data saved for each reentery on this thread. bdb.Bdb.__init__(self) ! self._threadprotectlock = thread.allocate_lock() self.reset() --- 73,77 ---- self.recursiveData = [] # Data saved for each reentery on this thread. bdb.Bdb.__init__(self) ! self._threadprotectlock = _thread.allocate_lock() self.reset() Index: expressions.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/expressions.py,v retrieving revision 1.5.4.1 retrieving revision 1.5.4.2 diff -C2 -d -r1.5.4.1 -r1.5.4.2 *** expressions.py 26 Nov 2008 09:03:29 -0000 1.5.4.1 --- expressions.py 4 Dec 2008 07:32:06 -0000 1.5.4.2 *************** *** 1,5 **** import axdebug, gateways ! from util import _wrap, _wrap_remove, RaiseNotImpl ! import cStringIO, traceback from pprint import pprint from win32com.server.exception import COMException --- 1,5 ---- import axdebug, gateways ! from .util import _wrap, _wrap_remove, RaiseNotImpl ! import io, traceback from pprint import pprint from win32com.server.exception import COMException *************** *** 10,14 **** # Given an object, return a nice string def MakeNiceString(ob): ! stream = cStringIO.StringIO() pprint(ob, stream) return string.strip(stream.getvalue()) --- 10,14 ---- # Given an object, return a nice string def MakeNiceString(ob): ! stream = io.StringIO() pprint(ob, stream) return string.strip(stream.getvalue()) Index: contexts.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/contexts.py,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** contexts.py 18 Jun 2006 13:18:26 -0000 1.2 --- contexts.py 4 Dec 2008 07:32:05 -0000 1.2.4.1 *************** *** 6,11 **** # Utility function for wrapping object created by this module. ! from util import _wrap, _wrap_remove, trace ! import adb class DebugCodeContext(gateways.DebugCodeContext, gateways.DebugDocumentContext): --- 6,11 ---- # Utility function for wrapping object created by this module. ! from .util import _wrap, _wrap_remove, trace ! from . import adb class DebugCodeContext(gateways.DebugCodeContext, gateways.DebugDocumentContext): Index: documents.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/documents.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 *** documents.py 26 Nov 2008 09:03:29 -0000 1.2.4.1 --- documents.py 4 Dec 2008 07:32:06 -0000 1.2.4.2 *************** *** 4,11 **** import axdebug, gateways import pythoncom ! from util import _wrap, _wrap_remove, RaiseNotImpl, trace from win32com.server.util import unwrap ! import codecontainer ! import contexts from win32com.server.exception import Exception import win32api, winerror, os, string, sys --- 4,11 ---- import axdebug, gateways import pythoncom ! from .util import _wrap, _wrap_remove, RaiseNotImpl, trace from win32com.server.util import unwrap ! from . import codecontainer ! from . import contexts from win32com.server.exception import Exception import win32api, winerror, os, string, sys Index: stackframe.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/stackframe.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 *** stackframe.py 26 Nov 2008 09:03:29 -0000 1.4.4.1 --- stackframe.py 4 Dec 2008 07:32:06 -0000 1.4.4.2 *************** *** 4,14 **** """ import sys ! from util import _wrap, RaiseNotImpl import expressions, gateways, axdebug, winerror import pythoncom from win32com.server.exception import COMException - import repr, string ! from util import trace #def trace(*args): # pass --- 4,13 ---- """ import sys ! from .util import _wrap, RaiseNotImpl import expressions, gateways, axdebug, winerror import pythoncom from win32com.server.exception import COMException ! from .util import trace #def trace(*args): # pass *************** *** 140,144 **** def EnumMembers(self, dwFieldSpec, nRadix, iid): print("EnumMembers", dwFieldSpec, nRadix, iid) ! import expressions return expressions.MakeEnumDebugProperty(self.frame.f_locals, dwFieldSpec, nRadix, iid, self.frame) --- 139,143 ---- def EnumMembers(self, dwFieldSpec, nRadix, iid): print("EnumMembers", dwFieldSpec, nRadix, iid) ! from . import expressions return expressions.MakeEnumDebugProperty(self.frame.f_locals, dwFieldSpec, nRadix, iid, self.frame) |
|
From: Mark H. <mha...@us...> - 2008-12-04 07:32:11
|
Update of /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/servers In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4678/com/win32comext/shell/demos/servers Modified Files: Tag: py3k column_provider.py context_menu.py copy_hook.py empty_volume_cache.py folder_view.py icon_handler.py shell_view.py Log Message: many more py3k syntax improvements thanks to 2to3 Index: column_provider.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/servers/column_provider.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 *** column_provider.py 26 Nov 2008 09:03:30 -0000 1.1.4.1 --- column_provider.py 4 Dec 2008 07:32:06 -0000 1.1.4.2 *************** *** 79,94 **** def DllRegisterServer(): ! import _winreg # Special ColumnProvider key ! key = _winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, "Folder\\ShellEx\\ColumnHandlers\\" + \ str(ColumnProvider._reg_clsid_ )) ! _winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, ColumnProvider._reg_desc_) print(ColumnProvider._reg_desc_, "registration complete.") def DllUnregisterServer(): ! import _winreg try: ! key = _winreg.DeleteKey(_winreg.HKEY_CLASSES_ROOT, "Folder\\ShellEx\\ColumnHandlers\\" + \ str(ColumnProvider._reg_clsid_) ) --- 79,94 ---- def DllRegisterServer(): ! import winreg # Special ColumnProvider key ! key = winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, "Folder\\ShellEx\\ColumnHandlers\\" + \ str(ColumnProvider._reg_clsid_ )) ! winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, ColumnProvider._reg_desc_) print(ColumnProvider._reg_desc_, "registration complete.") def DllUnregisterServer(): ! import winreg try: ! key = winreg.DeleteKey(_winreg.HKEY_CLASSES_ROOT, "Folder\\ShellEx\\ColumnHandlers\\" + \ str(ColumnProvider._reg_clsid_) ) Index: copy_hook.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/servers/copy_hook.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 *** copy_hook.py 26 Nov 2008 09:03:30 -0000 1.2.4.1 --- copy_hook.py 4 Dec 2008 07:32:06 -0000 1.2.4.2 *************** *** 32,50 **** def DllRegisterServer(): ! import _winreg ! key = _winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, "directory\\shellex\\CopyHookHandlers\\" + ShellExtension._reg_desc_) ! _winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, ShellExtension._reg_clsid_) ! key = _winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, "*\\shellex\\CopyHookHandlers\\" + ShellExtension._reg_desc_) ! _winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, ShellExtension._reg_clsid_) print(ShellExtension._reg_desc_, "registration complete.") def DllUnregisterServer(): ! import _winreg try: ! key = _winreg.DeleteKey(_winreg.HKEY_CLASSES_ROOT, "directory\\shellex\\CopyHookHandlers\\" + ShellExtension._reg_desc_) --- 32,50 ---- def DllRegisterServer(): ! import winreg ! key = winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, "directory\\shellex\\CopyHookHandlers\\" + ShellExtension._reg_desc_) ! winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, ShellExtension._reg_clsid_) ! key = winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, "*\\shellex\\CopyHookHandlers\\" + ShellExtension._reg_desc_) ! winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, ShellExtension._reg_clsid_) print(ShellExtension._reg_desc_, "registration complete.") def DllUnregisterServer(): ! import winreg try: ! key = winreg.DeleteKey(_winreg.HKEY_CLASSES_ROOT, "directory\\shellex\\CopyHookHandlers\\" + ShellExtension._reg_desc_) *************** *** 54,58 **** raise try: ! key = _winreg.DeleteKey(_winreg.HKEY_CLASSES_ROOT, "*\\shellex\\CopyHookHandlers\\" + ShellExtension._reg_desc_) --- 54,58 ---- raise try: ! key = winreg.DeleteKey(_winreg.HKEY_CLASSES_ROOT, "*\\shellex\\CopyHookHandlers\\" + ShellExtension._reg_desc_) Index: empty_volume_cache.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/servers/empty_volume_cache.py,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** empty_volume_cache.py 26 Nov 2008 09:03:30 -0000 1.1.2.1 --- empty_volume_cache.py 4 Dec 2008 07:32:06 -0000 1.1.2.2 *************** *** 148,163 **** # HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches # See link at top of file. ! import _winreg kn = r"Software\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\%s" \ % (EmptyVolumeCache._reg_desc_,) ! key = _winreg.CreateKey(_winreg.HKEY_LOCAL_MACHINE, kn) ! _winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, EmptyVolumeCache._reg_clsid_) def DllUnregisterServer(): ! import _winreg kn = r"Software\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\%s" \ % (EmptyVolumeCache._reg_desc_,) try: ! key = _winreg.DeleteKey(_winreg.HKEY_LOCAL_MACHINE, kn) except WindowsError as details: import errno --- 148,163 ---- # HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches # See link at top of file. ! import winreg kn = r"Software\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\%s" \ % (EmptyVolumeCache._reg_desc_,) ! key = winreg.CreateKey(_winreg.HKEY_LOCAL_MACHINE, kn) ! winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, EmptyVolumeCache._reg_clsid_) def DllUnregisterServer(): ! import winreg kn = r"Software\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\%s" \ % (EmptyVolumeCache._reg_desc_,) try: ! key = winreg.DeleteKey(_winreg.HKEY_LOCAL_MACHINE, kn) except WindowsError as details: import errno Index: folder_view.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/servers/folder_view.py,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** folder_view.py 26 Nov 2008 09:03:30 -0000 1.1.2.1 --- folder_view.py 4 Dec 2008 07:32:06 -0000 1.1.2.2 *************** *** 677,692 **** def DllRegisterServer(): ! import _winreg if sys.getwindowsversion()[0] < 6: print("This sample only works on Vista") sys.exit(1) ! key = _winreg.CreateKey(_winreg.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\" \ "Explorer\\Desktop\\Namespace\\" + \ ShellFolder._reg_clsid_) ! _winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, ShellFolder._reg_desc_) # And special shell keys under our CLSID ! key = _winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, "CLSID\\" + ShellFolder._reg_clsid_ + "\\ShellFolder") # 'Attributes' is an int stored as a binary! use struct --- 677,692 ---- def DllRegisterServer(): ! import winreg if sys.getwindowsversion()[0] < 6: print("This sample only works on Vista") sys.exit(1) ! key = winreg.CreateKey(_winreg.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\" \ "Explorer\\Desktop\\Namespace\\" + \ ShellFolder._reg_clsid_) ! winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, ShellFolder._reg_desc_) # And special shell keys under our CLSID ! key = winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, "CLSID\\" + ShellFolder._reg_clsid_ + "\\ShellFolder") # 'Attributes' is an int stored as a binary! use struct *************** *** 695,708 **** import struct s = struct.pack("i", attr) ! _winreg.SetValueEx(key, "Attributes", 0, _winreg.REG_BINARY, s) # register the context menu handler under the FolderViewSampleType type. keypath = "%s\\shellex\\ContextMenuHandlers\\%s" % (ContextMenu._context_menu_type_, ContextMenu._reg_desc_) ! key = _winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, keypath) ! _winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, ContextMenu._reg_clsid_) propsys.PSRegisterPropertySchema(get_schema_fname()) print(ShellFolder._reg_desc_, "registration complete.") def DllUnregisterServer(): ! import _winreg paths = [ "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Desktop\\Namespace\\" + ShellFolder._reg_clsid_, --- 695,708 ---- import struct s = struct.pack("i", attr) ! winreg.SetValueEx(key, "Attributes", 0, _winreg.REG_BINARY, s) # register the context menu handler under the FolderViewSampleType type. keypath = "%s\\shellex\\ContextMenuHandlers\\%s" % (ContextMenu._context_menu_type_, ContextMenu._reg_desc_) ! key = winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, keypath) ! winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, ContextMenu._reg_clsid_) propsys.PSRegisterPropertySchema(get_schema_fname()) print(ShellFolder._reg_desc_, "registration complete.") def DllUnregisterServer(): ! import winreg paths = [ "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Desktop\\Namespace\\" + ShellFolder._reg_clsid_, *************** *** 711,715 **** for path in paths: try: ! _winreg.DeleteKey(_winreg.HKEY_LOCAL_MACHINE, path) except WindowsError as details: import errno --- 711,715 ---- for path in paths: try: ! winreg.DeleteKey(_winreg.HKEY_LOCAL_MACHINE, path) except WindowsError as details: import errno Index: shell_view.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/servers/shell_view.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 *** shell_view.py 26 Nov 2008 09:03:30 -0000 1.12.2.1 --- shell_view.py 4 Dec 2008 07:32:06 -0000 1.12.2.2 *************** *** 48,52 **** import sys, os ! import thread import pyclbr import pythoncom --- 48,52 ---- import sys, os ! import _thread import pyclbr import pythoncom *************** *** 812,823 **** def DllRegisterServer(): ! import _winreg ! key = _winreg.CreateKey(_winreg.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\" \ "Explorer\\Desktop\\Namespace\\" + \ ShellFolderRoot._reg_clsid_) ! _winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, ShellFolderRoot._reg_desc_) # And special shell keys under our CLSID ! key = _winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, "CLSID\\" + ShellFolderRoot._reg_clsid_ + "\\ShellFolder") # 'Attributes' is an int stored as a binary! use struct --- 812,823 ---- def DllRegisterServer(): ! import winreg ! key = winreg.CreateKey(_winreg.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\" \ "Explorer\\Desktop\\Namespace\\" + \ ShellFolderRoot._reg_clsid_) ! winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, ShellFolderRoot._reg_desc_) # And special shell keys under our CLSID ! key = winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, "CLSID\\" + ShellFolderRoot._reg_clsid_ + "\\ShellFolder") # 'Attributes' is an int stored as a binary! use struct *************** *** 826,836 **** import struct s = struct.pack("i", attr) ! _winreg.SetValueEx(key, "Attributes", 0, _winreg.REG_BINARY, s) print(ShellFolderRoot._reg_desc_, "registration complete.") def DllUnregisterServer(): ! import _winreg try: ! key = _winreg.DeleteKey(_winreg.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\" \ "Explorer\\Desktop\\Namespace\\" + \ --- 826,836 ---- import struct s = struct.pack("i", attr) ! winreg.SetValueEx(key, "Attributes", 0, _winreg.REG_BINARY, s) print(ShellFolderRoot._reg_desc_, "registration complete.") def DllUnregisterServer(): ! import winreg try: ! key = winreg.DeleteKey(_winreg.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\" \ "Explorer\\Desktop\\Namespace\\" + \ Index: icon_handler.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/servers/icon_handler.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 *** icon_handler.py 26 Nov 2008 09:03:30 -0000 1.1.4.1 --- icon_handler.py 4 Dec 2008 07:32:06 -0000 1.1.4.2 *************** *** 46,60 **** def DllRegisterServer(): ! import _winreg ! key = _winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, "Python.File\\shellex") ! subkey = _winreg.CreateKey(key, "IconHandler") ! _winreg.SetValueEx(subkey, None, 0, _winreg.REG_SZ, ShellExtension._reg_clsid_) print(ShellExtension._reg_desc_, "registration complete.") def DllUnregisterServer(): ! import _winreg try: ! key = _winreg.DeleteKey(_winreg.HKEY_CLASSES_ROOT, "Python.File\\shellex\\IconHandler") except WindowsError as details: --- 46,60 ---- def DllRegisterServer(): ! import winreg ! key = winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, "Python.File\\shellex") ! subkey = winreg.CreateKey(key, "IconHandler") ! winreg.SetValueEx(subkey, None, 0, _winreg.REG_SZ, ShellExtension._reg_clsid_) print(ShellExtension._reg_desc_, "registration complete.") def DllUnregisterServer(): ! import winreg try: ! key = winreg.DeleteKey(_winreg.HKEY_CLASSES_ROOT, "Python.File\\shellex\\IconHandler") except WindowsError as details: Index: context_menu.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/servers/context_menu.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 *** context_menu.py 26 Nov 2008 09:03:30 -0000 1.4.2.1 --- context_menu.py 4 Dec 2008 07:32:06 -0000 1.4.2.2 *************** *** 76,91 **** def DllRegisterServer(): ! import _winreg ! key = _winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, "Python.File\\shellex") ! subkey = _winreg.CreateKey(key, "ContextMenuHandlers") ! subkey2 = _winreg.CreateKey(subkey, "PythonSample") ! _winreg.SetValueEx(subkey2, None, 0, _winreg.REG_SZ, ShellExtension._reg_clsid_) print(ShellExtension._reg_desc_, "registration complete.") def DllUnregisterServer(): ! import _winreg try: ! key = _winreg.DeleteKey(_winreg.HKEY_CLASSES_ROOT, "Python.File\\shellex\\ContextMenuHandlers\\PythonSample") except WindowsError as details: --- 76,91 ---- def DllRegisterServer(): ! import winreg ! key = winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, "Python.File\\shellex") ! subkey = winreg.CreateKey(key, "ContextMenuHandlers") ! subkey2 = winreg.CreateKey(subkey, "PythonSample") ! winreg.SetValueEx(subkey2, None, 0, _winreg.REG_SZ, ShellExtension._reg_clsid_) print(ShellExtension._reg_desc_, "registration complete.") def DllUnregisterServer(): ! import winreg try: ! key = winreg.DeleteKey(_winreg.HKEY_CLASSES_ROOT, "Python.File\\shellex\\ContextMenuHandlers\\PythonSample") except WindowsError as details: |
|
From: Mark H. <mha...@us...> - 2008-12-04 07:32:11
|
Update of /cvsroot/pywin32/pywin32/com/win32com/test In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4678/com/win32com/test Modified Files: Tag: py3k testGIT.py testPyComTest.py Log Message: many more py3k syntax improvements thanks to 2to3 Index: testGIT.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testGIT.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 *** testGIT.py 27 Nov 2008 04:58:41 -0000 1.1.4.2 --- testGIT.py 4 Dec 2008 07:32:05 -0000 1.1.4.3 *************** *** 22,26 **** """ ! import thread, traceback import win32com.client import win32event, win32api --- 22,26 ---- """ ! import _thread, traceback import win32com.client import win32event, win32api *************** *** 78,82 **** for i in range(numThreads): hEvent = win32event.CreateEvent(None, 0, 0, None) ! thread.start_new(TestInterpInThread, (hEvent, cookie)) ret.append(hEvent) return ret --- 78,82 ---- for i in range(numThreads): hEvent = win32event.CreateEvent(None, 0, 0, None) ! _thread.start_new(TestInterpInThread, (hEvent, cookie)) ret.append(hEvent) return ret Index: testPyComTest.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testPyComTest.py,v retrieving revision 1.32.2.6 retrieving revision 1.32.2.7 diff -C2 -d -r1.32.2.6 -r1.32.2.7 *** testPyComTest.py 4 Dec 2008 05:08:41 -0000 1.32.2.6 --- testPyComTest.py 4 Dec 2008 07:32:05 -0000 1.32.2.7 *************** *** 510,515 **** def NullThreadFunc(): pass ! import thread ! thread.start_new( NullThreadFunc, () ) if "-v" in sys.argv: verbose = 1 --- 510,515 ---- def NullThreadFunc(): pass ! import _thread ! _thread.start_new( NullThreadFunc, () ) if "-v" in sys.argv: verbose = 1 |
|
From: Mark H. <mha...@us...> - 2008-12-04 07:32:11
|
Update of /cvsroot/pywin32/pywin32/com/win32com/demos In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4678/com/win32com/demos Modified Files: Tag: py3k excelAddin.py iebutton.py ietoolbar.py outlookAddin.py Log Message: many more py3k syntax improvements thanks to 2to3 Index: ietoolbar.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/demos/ietoolbar.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 *** ietoolbar.py 27 Nov 2008 11:31:04 -0000 1.1.4.4 --- ietoolbar.py 4 Dec 2008 07:32:05 -0000 1.1.4.5 *************** *** 23,27 **** import win32com import pythoncom ! import _winreg from win32com.shell import shell --- 23,27 ---- import win32com import pythoncom ! import winreg from win32com.shell import shell *************** *** 284,289 **** try: print("Trying to register Toolbar.\n") ! hkey = _winreg.CreateKey( _winreg.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Internet Explorer\\Toolbar" ) ! subKey = _winreg.SetValueEx( hkey, comclass._reg_clsid_, 0, _winreg.REG_BINARY, "\0" ) except WindowsError: print("Couldn't set registry value.\nhkey: %d\tCLSID: %s\n" % ( hkey, comclass._reg_clsid_ )) --- 284,289 ---- try: print("Trying to register Toolbar.\n") ! hkey = winreg.CreateKey( _winreg.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Internet Explorer\\Toolbar" ) ! subKey = winreg.SetValueEx( hkey, comclass._reg_clsid_, 0, _winreg.REG_BINARY, "\0" ) except WindowsError: print("Couldn't set registry value.\nhkey: %d\tCLSID: %s\n" % ( hkey, comclass._reg_clsid_ )) *************** *** 299,304 **** try: print("Trying to unregister Toolbar.\n") ! hkey = _winreg.CreateKey( _winreg.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Internet Explorer\\Toolbar" ) ! _winreg.DeleteValue( hkey, comclass._reg_clsid_ ) except WindowsError: print("Couldn't delete registry value.\nhkey: %d\tCLSID: %s\n" % ( hkey, comclass._reg_clsid_ )) --- 299,304 ---- try: print("Trying to unregister Toolbar.\n") ! hkey = winreg.CreateKey( _winreg.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Internet Explorer\\Toolbar" ) ! winreg.DeleteValue( hkey, comclass._reg_clsid_ ) except WindowsError: print("Couldn't delete registry value.\nhkey: %d\tCLSID: %s\n" % ( hkey, comclass._reg_clsid_ )) Index: excelAddin.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/demos/excelAddin.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 *** excelAddin.py 26 Nov 2008 09:03:29 -0000 1.1.4.1 --- excelAddin.py 4 Dec 2008 07:32:05 -0000 1.1.4.2 *************** *** 116,131 **** def RegisterAddin(klass): ! import _winreg ! key = _winreg.CreateKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Excel\\Addins") ! subkey = _winreg.CreateKey(key, klass._reg_progid_) ! _winreg.SetValueEx(subkey, "CommandLineSafe", 0, _winreg.REG_DWORD, 0) ! _winreg.SetValueEx(subkey, "LoadBehavior", 0, _winreg.REG_DWORD, 3) ! _winreg.SetValueEx(subkey, "Description", 0, _winreg.REG_SZ, "Excel Addin") ! _winreg.SetValueEx(subkey, "FriendlyName", 0, _winreg.REG_SZ, "A Simple Excel Addin") def UnregisterAddin(klass): ! import _winreg try: ! _winreg.DeleteKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Excel\\Addins\\" + klass._reg_progid_) except WindowsError: pass --- 116,131 ---- def RegisterAddin(klass): ! import winreg ! key = winreg.CreateKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Excel\\Addins") ! subkey = winreg.CreateKey(key, klass._reg_progid_) ! winreg.SetValueEx(subkey, "CommandLineSafe", 0, _winreg.REG_DWORD, 0) ! winreg.SetValueEx(subkey, "LoadBehavior", 0, _winreg.REG_DWORD, 3) ! winreg.SetValueEx(subkey, "Description", 0, _winreg.REG_SZ, "Excel Addin") ! winreg.SetValueEx(subkey, "FriendlyName", 0, _winreg.REG_SZ, "A Simple Excel Addin") def UnregisterAddin(klass): ! import winreg try: ! winreg.DeleteKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Excel\\Addins\\" + klass._reg_progid_) except WindowsError: pass Index: outlookAddin.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/demos/outlookAddin.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 *** outlookAddin.py 26 Nov 2008 09:03:29 -0000 1.2.4.1 --- outlookAddin.py 4 Dec 2008 07:32:05 -0000 1.2.4.2 *************** *** 91,106 **** def RegisterAddin(klass): ! import _winreg ! key = _winreg.CreateKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Outlook\\Addins") ! subkey = _winreg.CreateKey(key, klass._reg_progid_) ! _winreg.SetValueEx(subkey, "CommandLineSafe", 0, _winreg.REG_DWORD, 0) ! _winreg.SetValueEx(subkey, "LoadBehavior", 0, _winreg.REG_DWORD, 3) ! _winreg.SetValueEx(subkey, "Description", 0, _winreg.REG_SZ, klass._reg_progid_) ! _winreg.SetValueEx(subkey, "FriendlyName", 0, _winreg.REG_SZ, klass._reg_progid_) def UnregisterAddin(klass): ! import _winreg try: ! _winreg.DeleteKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Outlook\\Addins\\" + klass._reg_progid_) except WindowsError: pass --- 91,106 ---- def RegisterAddin(klass): ! import winreg ! key = winreg.CreateKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Outlook\\Addins") ! subkey = winreg.CreateKey(key, klass._reg_progid_) ! winreg.SetValueEx(subkey, "CommandLineSafe", 0, _winreg.REG_DWORD, 0) ! winreg.SetValueEx(subkey, "LoadBehavior", 0, _winreg.REG_DWORD, 3) ! winreg.SetValueEx(subkey, "Description", 0, _winreg.REG_SZ, klass._reg_progid_) ! winreg.SetValueEx(subkey, "FriendlyName", 0, _winreg.REG_SZ, klass._reg_progid_) def UnregisterAddin(klass): ! import winreg try: ! winreg.DeleteKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Outlook\\Addins\\" + klass._reg_progid_) except WindowsError: pass Index: iebutton.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/demos/iebutton.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 *** iebutton.py 26 Nov 2008 09:03:29 -0000 1.3.4.2 --- iebutton.py 4 Dec 2008 07:32:05 -0000 1.3.4.3 *************** *** 130,144 **** def register(classobj): ! import _winreg subKeyCLSID = "SOFTWARE\\Microsoft\\Internet Explorer\\Extensions\\%38s" % classobj._reg_clsid_ try: ! hKey = _winreg.CreateKey( _winreg.HKEY_LOCAL_MACHINE, subKeyCLSID ) ! subKey = _winreg.SetValueEx( hKey, "ButtonText", 0, _winreg.REG_SZ, classobj._button_text_ ) ! _winreg.SetValueEx( hKey, "ClsidExtension", 0, _winreg.REG_SZ, classobj._reg_clsid_ ) # reg value for calling COM object ! _winreg.SetValueEx( hKey, "CLSID", 0, _winreg.REG_SZ, "{1FBA04EE-3024-11D2-8F1F-0000F87ABD16}" ) # CLSID for button that sends command to COM object ! _winreg.SetValueEx( hKey, "Default Visible", 0, _winreg.REG_SZ, "Yes" ) ! _winreg.SetValueEx( hKey, "ToolTip", 0, _winreg.REG_SZ, classobj._tool_tip_ ) ! _winreg.SetValueEx( hKey, "Icon", 0, _winreg.REG_SZ, classobj._icon_) ! _winreg.SetValueEx( hKey, "HotIcon", 0, _winreg.REG_SZ, classobj._hot_icon_) except WindowsError: print("Couldn't set standard toolbar reg keys.") --- 130,144 ---- def register(classobj): ! import winreg subKeyCLSID = "SOFTWARE\\Microsoft\\Internet Explorer\\Extensions\\%38s" % classobj._reg_clsid_ try: ! hKey = winreg.CreateKey( _winreg.HKEY_LOCAL_MACHINE, subKeyCLSID ) ! subKey = winreg.SetValueEx( hKey, "ButtonText", 0, _winreg.REG_SZ, classobj._button_text_ ) ! winreg.SetValueEx( hKey, "ClsidExtension", 0, _winreg.REG_SZ, classobj._reg_clsid_ ) # reg value for calling COM object ! winreg.SetValueEx( hKey, "CLSID", 0, _winreg.REG_SZ, "{1FBA04EE-3024-11D2-8F1F-0000F87ABD16}" ) # CLSID for button that sends command to COM object ! winreg.SetValueEx( hKey, "Default Visible", 0, _winreg.REG_SZ, "Yes" ) ! winreg.SetValueEx( hKey, "ToolTip", 0, _winreg.REG_SZ, classobj._tool_tip_ ) ! winreg.SetValueEx( hKey, "Icon", 0, _winreg.REG_SZ, classobj._icon_) ! winreg.SetValueEx( hKey, "HotIcon", 0, _winreg.REG_SZ, classobj._hot_icon_) except WindowsError: print("Couldn't set standard toolbar reg keys.") *************** *** 147,162 **** def unregister(classobj): ! import _winreg subKeyCLSID = "SOFTWARE\\Microsoft\\Internet Explorer\\Extensions\\%38s" % classobj._reg_clsid_ try: ! hKey = _winreg.CreateKey( _winreg.HKEY_LOCAL_MACHINE, subKeyCLSID ) ! subKey = _winreg.DeleteValue( hKey, "ButtonText" ) ! _winreg.DeleteValue( hKey, "ClsidExtension" ) # for calling COM object ! _winreg.DeleteValue( hKey, "CLSID" ) ! _winreg.DeleteValue( hKey, "Default Visible" ) ! _winreg.DeleteValue( hKey, "ToolTip" ) ! _winreg.DeleteValue( hKey, "Icon" ) ! _winreg.DeleteValue( hKey, "HotIcon" ) ! _winreg.DeleteKey( _winreg.HKEY_LOCAL_MACHINE, subKeyCLSID ) except WindowsError: print("Couldn't delete Standard toolbar regkey.") --- 147,162 ---- def unregister(classobj): ! import winreg subKeyCLSID = "SOFTWARE\\Microsoft\\Internet Explorer\\Extensions\\%38s" % classobj._reg_clsid_ try: ! hKey = winreg.CreateKey( _winreg.HKEY_LOCAL_MACHINE, subKeyCLSID ) ! subKey = winreg.DeleteValue( hKey, "ButtonText" ) ! winreg.DeleteValue( hKey, "ClsidExtension" ) # for calling COM object ! winreg.DeleteValue( hKey, "CLSID" ) ! winreg.DeleteValue( hKey, "Default Visible" ) ! winreg.DeleteValue( hKey, "ToolTip" ) ! winreg.DeleteValue( hKey, "Icon" ) ! winreg.DeleteValue( hKey, "HotIcon" ) ! winreg.DeleteKey( _winreg.HKEY_LOCAL_MACHINE, subKeyCLSID ) except WindowsError: print("Couldn't delete Standard toolbar regkey.") |
|
From: Mark H. <mha...@us...> - 2008-12-04 07:32:10
|
Update of /cvsroot/pywin32/pywin32/com/win32com/servers In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4678/com/win32com/servers Modified Files: Tag: py3k dictionary.py Log Message: many more py3k syntax improvements thanks to 2to3 Index: dictionary.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/servers/dictionary.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 *** dictionary.py 4 Dec 2008 05:08:41 -0000 1.3.4.2 --- dictionary.py 4 Dec 2008 07:32:05 -0000 1.3.4.3 *************** *** 108,112 **** if dispid == pythoncom.DISPID_NEWENUM: ! return util.NewEnum(self._obj_.keys()) raise COMException(scode=winerror.DISP_E_MEMBERNOTFOUND) --- 108,112 ---- if dispid == pythoncom.DISPID_NEWENUM: ! return util.NewEnum(list(self._obj_.keys())) raise COMException(scode=winerror.DISP_E_MEMBERNOTFOUND) |
|
From: Mark H. <mha...@us...> - 2008-12-04 07:32:09
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4678/Pythonwin/pywin/framework/editor Modified Files: Tag: py3k ModuleBrowser.py Log Message: many more py3k syntax improvements thanks to 2to3 Index: ModuleBrowser.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor/ModuleBrowser.py,v retrieving revision 1.8.4.3 retrieving revision 1.8.4.4 diff -C2 -d -r1.8.4.3 -r1.8.4.4 *** ModuleBrowser.py 23 Oct 2008 09:45:16 -0000 1.8.4.3 --- ModuleBrowser.py 4 Dec 2008 07:32:05 -0000 1.8.4.4 *************** *** 19,23 **** def GetSubList(self): ret = [] ! for item in self.clbrdata.itervalues(): if item.__class__ != pyclbr.Class: # ie, it is a pyclbr Function instance (only introduced post 1.5.2) ret.append(HierListCLBRFunction( item ) ) --- 19,23 ---- def GetSubList(self): ret = [] ! for item in self.clbrdata.values(): if item.__class__ != pyclbr.Class: # ie, it is a pyclbr Function instance (only introduced post 1.5.2) ret.append(HierListCLBRFunction( item ) ) *************** *** 77,81 **** r1.sort() r2=[] ! for meth, lineno in self.methods.iteritems(): r2.append(HierListCLBRMethod(meth, self.file, lineno)) r2.sort(key=lambda m:m.GetText()) --- 77,81 ---- r1.sort() r2=[] ! for meth, lineno in self.methods.items(): r2.append(HierListCLBRMethod(meth, self.file, lineno)) r2.sort(key=lambda m:m.GetText()) |
|
From: Mark H. <mha...@us...> - 2008-12-04 07:30:59
|
Update of /cvsroot/pywin32/pywin32/com/win32comext/ifilter/demo In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4608/com/win32comext/ifilter/demo Modified Files: Tag: py3k filterDemo.py Log Message: fix syntax error introduced by conversion to py3k syntax Index: filterDemo.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/ifilter/demo/filterDemo.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 *** filterDemo.py 26 Nov 2008 09:03:30 -0000 1.1.4.1 --- filterDemo.py 4 Dec 2008 07:30:55 -0000 1.1.4.2 *************** *** 191,195 **** def _usage(): import os ! print("Usage: %s filename [verbose [dumpbody]]" % (os.path.basename(sys.argv[0]),))) print() print("Where:-") --- 191,195 ---- def _usage(): import os ! print("Usage: %s filename [verbose [dumpbody]]" % (os.path.basename(sys.argv[0]),)) print() print("Where:-") |
|
From: Mark H. <mha...@us...> - 2008-12-04 07:30:33
|
Update of /cvsroot/pywin32/pywin32/com/win32comext/directsound/test In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4561/com/win32comext/directsound/test Modified Files: Tag: py3k ds_record.py Log Message: remove extra whitespace causing 2to3 to make different content Index: ds_record.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/directsound/test/ds_record.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 *** ds_record.py 13 Sep 2008 16:14:24 -0000 1.1.4.2 --- ds_record.py 4 Dec 2008 07:30:22 -0000 1.1.4.3 *************** *** 24,29 **** sdesc.lpwfxFormat.wBitsPerSample = 16 ! print (sdesc) ! print (d) buffer = d.CreateCaptureBuffer(sdesc) --- 24,29 ---- sdesc.lpwfxFormat.wBitsPerSample = 16 ! print(sdesc) ! print(d) buffer = d.CreateCaptureBuffer(sdesc) |
|
From: Mark H. <mha...@us...> - 2008-12-04 07:28:52
|
Update of /cvsroot/pywin32/pywin32/win32/test In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4381/win32/test Modified Files: Tag: py3k test_win32trace.py Log Message: merge more various changes from the trunk Index: test_win32trace.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/test/test_win32trace.py,v retrieving revision 1.5.4.1 retrieving revision 1.5.4.2 diff -C2 -d -r1.5.4.1 -r1.5.4.2 *** test_win32trace.py 26 Nov 2008 09:03:31 -0000 1.5.4.1 --- test_win32trace.py 4 Dec 2008 07:28:46 -0000 1.5.4.2 *************** *** 157,161 **** CheckNoOtherReaders() self.threads = [WriterThread() for each in range(self.FullBucket)] ! self.buckets = range(self.BucketCount) for each in self.buckets: self.buckets[each] = 0 --- 157,161 ---- CheckNoOtherReaders() self.threads = [WriterThread() for each in range(self.FullBucket)] ! self.buckets = list(range(self.BucketCount)) for each in self.buckets: self.buckets[each] = 0 *************** *** 255,259 **** TraceWriteProcess.BucketCount = self.BucketCount self.setUpWriters() ! self.buckets = range(self.BucketCount) for each in self.buckets: self.buckets[each] = 0 --- 255,259 ---- TraceWriteProcess.BucketCount = self.BucketCount self.setUpWriters() ! self.buckets = list(range(self.BucketCount)) for each in self.buckets: self.buckets[each] = 0 *************** *** 309,318 **** threads = [WriterThread() for each in range(threadCount)] win32trace.InitWrite() ! for thread in threads: ! thread.start() ! for thread in threads: ! thread.join() ! for thread in threads: ! if not thread.verifyWritten(): sys.exit(-1) --- 309,318 ---- threads = [WriterThread() for each in range(threadCount)] win32trace.InitWrite() ! for t in threads: ! t.start() ! for t in threads: ! t.join() ! for t in threads: ! if not t.verifyWritten(): sys.exit(-1) |
|
From: Mark H. <mha...@us...> - 2008-12-04 07:28:52
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4381/Pythonwin/pywin/tools Modified Files: Tag: py3k browser.py Log Message: merge more various changes from the trunk Index: browser.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools/browser.py,v retrieving revision 1.10.2.4 retrieving revision 1.10.2.5 diff -C2 -d -r1.10.2.4 -r1.10.2.5 *** browser.py 27 Nov 2008 11:31:03 -0000 1.10.2.4 --- browser.py 4 Dec 2008 07:28:46 -0000 1.10.2.5 *************** *** 329,333 **** dt = [ ! ["Python Object Browser", (0, 0, 200, 200), style, 0, (8, "MS Sans Serif")], ["SysTreeView32", None, win32ui.IDC_LIST1, (0, 0, 200, 200), cs] ] --- 329,333 ---- dt = [ ! ["Python Object Browser", (0, 0, 200, 200), style, None, (8, "MS Sans Serif")], ["SysTreeView32", None, win32ui.IDC_LIST1, (0, 0, 200, 200), cs] ] |
|
From: Mark H. <mha...@us...> - 2008-12-04 07:28:51
|
Update of /cvsroot/pywin32/pywin32/win32/Demos In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4381/win32/Demos Modified Files: Tag: py3k win32gui_menu.py win32gui_taskbar.py Log Message: merge more various changes from the trunk Index: win32gui_taskbar.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Demos/win32gui_taskbar.py,v retrieving revision 1.9.2.3 retrieving revision 1.9.2.4 diff -C2 -d -r1.9.2.3 -r1.9.2.4 *** win32gui_taskbar.py 3 Oct 2008 01:09:55 -0000 1.9.2.3 --- win32gui_taskbar.py 4 Dec 2008 07:28:46 -0000 1.9.2.4 *************** *** 37,41 **** win32gui.UpdateWindow(self.hwnd) self._DoCreateIcons() ! def _DoCreateIcons(self): # Try and find a custom icon --- 37,41 ---- win32gui.UpdateWindow(self.hwnd) self._DoCreateIcons() ! def _DoCreateIcons(self): # Try and find a custom icon Index: win32gui_menu.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Demos/win32gui_menu.py,v retrieving revision 1.8.2.2 retrieving revision 1.8.2.3 diff -C2 -d -r1.8.2.2 -r1.8.2.3 *** win32gui_menu.py 11 Sep 2008 07:48:21 -0000 1.8.2.2 --- win32gui_menu.py 4 Dec 2008 07:28:46 -0000 1.8.2.3 *************** *** 166,170 **** DeleteDC(hdcBitmap) item, extras = PackMENUITEMINFO(text="Menu with icon", ! hbmpItem=hbm, wID=1011) InsertMenuItem(menu, 0, 1, item) --- 166,170 ---- DeleteDC(hdcBitmap) item, extras = PackMENUITEMINFO(text="Menu with icon", ! hbmpItem=hbm.Detach(), wID=1011) InsertMenuItem(menu, 0, 1, item) |
|
From: Mark H. <mha...@us...> - 2008-12-04 07:28:51
|
Update of /cvsroot/pywin32/pywin32/win32/scripts/VersionStamp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4381/win32/scripts/VersionStamp Modified Files: Tag: py3k bulkstamp.py Log Message: merge more various changes from the trunk Index: bulkstamp.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/scripts/VersionStamp/bulkstamp.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 *** bulkstamp.py 27 Nov 2008 11:31:10 -0000 1.6.4.2 --- bulkstamp.py 4 Dec 2008 07:28:46 -0000 1.6.4.3 *************** *** 35,39 **** import verstamp import fnmatch - import string import win32api --- 35,38 ---- *************** *** 80,87 **** for i in range(len(lines)): ! line = string.strip(lines[i]) if line != '' and line[0] != '#': ! idx1 = string.find(line, ' ') ! idx2 = string.find(line, '\t') if idx1 == -1 or idx2 < idx1: idx1 = idx2 --- 79,86 ---- for i in range(len(lines)): ! line = lines[i].strip() if line != '' and line[0] != '#': ! idx1 = line.find(' ') ! idx2 = line.find('\t') if idx1 == -1 or idx2 < idx1: idx1 = idx2 *************** *** 91,95 **** key = line[:idx1] ! val = string.strip(line[idx1:]) if key in vars: retvars[key] = val --- 90,94 ---- key = line[:idx1] ! val = line[idx1:].strip() if key in vars: retvars[key] = val *************** *** 113,117 **** numStamped = 0 try: ! build = string.atoi(build) except ValueError: print('ERROR: build number is not a number: %s' % build) --- 112,116 ---- numStamped = 0 try: ! build = int(build) except ValueError: print('ERROR: build number is not a number: %s' % build) |
|
From: Mark H. <mha...@us...> - 2008-12-04 07:28:51
|
Update of /cvsroot/pywin32/pywin32/com/win32comext/axdebug In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4381/com/win32comext/axdebug Modified Files: Tag: py3k debugger.py gateways.py Log Message: merge more various changes from the trunk Index: gateways.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/gateways.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 *** gateways.py 26 Nov 2008 09:03:29 -0000 1.3.4.1 --- gateways.py 4 Dec 2008 07:28:46 -0000 1.3.4.2 *************** *** 8,12 **** import win32com.server.connect import winerror - import string class EnumDebugCodeContexts(ListEnumeratorGateway): --- 8,11 ---- *************** *** 71,76 **** """Provides the functionality of IDebugDocumentProvider, plus a context within a project tree. """ ! _public_methods_ = string.split("""EnumChildren GetParent SetDocumentProvider ! Close Attach Detach""") + \ DebugDocumentProvider._public_methods_ _com_interfaces_ = [axdebug.IID_IDebugDocumentProvider] + \ --- 70,75 ---- """Provides the functionality of IDebugDocumentProvider, plus a context within a project tree. """ ! _public_methods_ = """EnumChildren GetParent SetDocumentProvider ! Close Attach Detach""".split() + \ DebugDocumentProvider._public_methods_ _com_interfaces_ = [axdebug.IID_IDebugDocumentProvider] + \ *************** *** 100,104 **** """Event interface for DebugApplicationNode object. """ ! _public_methods_ = string.split("onAddChild onRemoveChild onDetach") _com_interfaces_ = [axdebug.IID_IDebugApplicationNodeEvents] def __init__(self): --- 99,103 ---- """Event interface for DebugApplicationNode object. """ ! _public_methods_ = "onAddChild onRemoveChild onDetach".split() _com_interfaces_ = [axdebug.IID_IDebugApplicationNodeEvents] def __init__(self): *************** *** 204,209 **** class DebugDocumentTextEvents: ! _public_methods_ = string.split("""onDestroy onInsertText onRemoveText ! onReplaceText onUpdateTextAttributes onUpdateDocumentAttributes""") _com_interfaces_ = [ axdebug.IID_IDebugDocumentTextEvents ] def __init__(self): --- 203,209 ---- class DebugDocumentTextEvents: ! _public_methods_ = """onDestroy onInsertText onRemoveText ! onReplaceText onUpdateTextAttributes ! onUpdateDocumentAttributes""".split() _com_interfaces_ = [ axdebug.IID_IDebugDocumentTextEvents ] def __init__(self): Index: debugger.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/debugger.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 *** debugger.py 26 Nov 2008 09:03:29 -0000 1.3.4.1 --- debugger.py 4 Dec 2008 07:28:46 -0000 1.3.4.2 *************** *** 41,45 **** node = ModuleTreeNode(module) built_nodes[module] = node ! realNode = apply(create_node_fn, (node,)+create_node_args) node.realNode = realNode --- 41,45 ---- node = ModuleTreeNode(module) built_nodes[module] = node ! realNode = create_node_fn(*(node,)+create_node_args) node.realNode = realNode *************** *** 57,61 **** def RefreshAllModules(builtItems, rootNode, create_node, create_node_args): ! for module in sys.modules.values(): BuildModule(module, builtItems, rootNode, create_node, create_node_args) --- 57,61 ---- def RefreshAllModules(builtItems, rootNode, create_node, create_node_args): ! for module in list(sys.modules.values()): BuildModule(module, builtItems, rootNode, create_node, create_node_args) *************** *** 194,198 **** def test(): Break() ! raw_input("Waiting...") dosomething() print("Done") --- 194,198 ---- def test(): Break() ! input("Waiting...") dosomething() print("Done") |
