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:
|
