[pywin32-checkins] pywin32/win32/Lib regcheck.py, 1.6.2.1, 1.6.2.2 regutil.py, 1.3.4.1, 1.3.4.2

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

Update of /cvsroot/pywin32/pywin32/win32/Lib
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8245/win32/Lib

Modified Files:
      Tag: py3k
	regcheck.py regutil.py 
Log Message:
merge various py3k friendly changes from the trunk.


Index: regutil.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/regutil.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
*** regutil.py	29 Aug 2008 04:59:25 -0000	1.3.4.1
--- regutil.py	23 Oct 2008 09:45:16 -0000	1.3.4.2
***************
*** 90,98 ****
  	try:
  		win32api.RegDeleteKey(GetRootKey(), GetAppPathsKey() + "\\" + exeAlias)
! 	except win32api.error as xxx_todo_changeme:
! 		(code, fn, details) = xxx_todo_changeme.args
  		from . import winerror
! 		if code!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise win32api.error(code, fn, desc)
  		return
  
--- 90,97 ----
  	try:
  		win32api.RegDeleteKey(GetRootKey(), GetAppPathsKey() + "\\" + exeAlias)
! 	except win32api.error as exc:
  		from . import winerror
! 		if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise
  		return
  
***************
*** 110,118 ****
  	try:
  		win32api.RegDeleteKey(GetRootKey(), keyStr)
! 	except win32api.error as xxx_todo_changeme1:
! 		(code, fn, details) = xxx_todo_changeme1.args
  		from . import winerror
! 		if code!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise win32api.error(code, fn, desc)
  		return
  
--- 109,116 ----
  	try:
  		win32api.RegDeleteKey(GetRootKey(), keyStr)
! 	except win32api.error as exc:
  		from . import winerror
! 		if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise
  		return
  
***************
*** 124,132 ****
  	try:
  		return win32api.RegQueryValue(GetRootKey(), keyStr)
! 	except win32api.error as xxx_todo_changeme2:
! 		(code, fn, details) = xxx_todo_changeme2.args
  		from . import winerror
! 		if code!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise win32api.error(code, fn, details)
  		return None
  
--- 122,129 ----
  	try:
  		return win32api.RegQueryValue(GetRootKey(), keyStr)
! 	except win32api.error as exc:
  		from . import winerror
! 		if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise
  		return None
  
***************
*** 157,165 ****
  		win32api.RegDeleteKey(GetRootKey(), 
  		                     BuildDefaultPythonKey() + "\\Modules\\%s" % modName)
! 	except win32api.error as xxx_todo_changeme3:
! 		(code, fn, desc) = xxx_todo_changeme3.args
  		from . import winerror
! 		if code!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise win32api.error(code, fn, desc)
  
  def GetRegisteredHelpFile(helpDesc):
--- 154,161 ----
  		win32api.RegDeleteKey(GetRootKey(), 
  		                     BuildDefaultPythonKey() + "\\Modules\\%s" % modName)
! 	except win32api.error as exc:
  		from . import winerror
! 		if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise
  
  def GetRegisteredHelpFile(helpDesc):
***************
*** 206,214 ****
  		try:
  			win32api.RegDeleteValue(key, helpFile)
! 		except win32api.error as xxx_todo_changeme4:
! 			(code, fn, desc) = xxx_todo_changeme4.args
  			from . import winerror
! 			if code!=winerror.ERROR_FILE_NOT_FOUND:
! 				raise win32api.error(code, fn, desc)
  	finally:
  		win32api.RegCloseKey(key)
--- 202,209 ----
  		try:
  			win32api.RegDeleteValue(key, helpFile)
! 		except win32api.error as exc:
  			from . import winerror
! 			if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND:
! 				raise
  	finally:
  		win32api.RegCloseKey(key)
***************
*** 219,227 ****
  		win32api.RegDeleteKey(GetRootKey(), 
  		                     BuildDefaultPythonKey() + "\\Help\\%s" % helpDesc)	
! 	except win32api.error as xxx_todo_changeme5:
! 		(code, fn, desc) = xxx_todo_changeme5.args
  		from . import winerror
! 		if code!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise win32api.error(code, fn, desc)
  
  def RegisterCoreDLL(coredllName = None):
--- 214,221 ----
  		win32api.RegDeleteKey(GetRootKey(), 
  		                     BuildDefaultPythonKey() + "\\Help\\%s" % helpDesc)	
! 	except win32api.error as exc:
  		from . import winerror
! 		if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise
  
  def RegisterCoreDLL(coredllName = None):

Index: regcheck.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/regcheck.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
*** regcheck.py	29 Aug 2008 04:59:25 -0000	1.6.2.1
--- regcheck.py	23 Oct 2008 09:45:16 -0000	1.6.2.2
***************
*** 32,38 ****
  	try:
  		appPath = win32api.RegQueryValue(regutil.GetRootKey(), regutil.BuildDefaultPythonKey() + "\\PythonPath")
! 	except win32api.error as xxx_todo_changeme:
! 		(code, fn, desc) = xxx_todo_changeme.args
! 		print("** does not exist - ", desc)
  	problem = CheckPathString(appPath)
  	if problem:
--- 32,37 ----
  	try:
  		appPath = win32api.RegQueryValue(regutil.GetRootKey(), regutil.BuildDefaultPythonKey() + "\\PythonPath")
! 	except win32api.error as exc:
! 		print("** does not exist - ", exc.strerror)
  	problem = CheckPathString(appPath)
  	if problem:
***************
*** 67,75 ****
  	try:
  		key = win32api.RegOpenKey(regutil.GetRootKey(), regutil.BuildDefaultPythonKey() + "\\Help", 0, win32con.KEY_READ)
! 	except win32api.error as xxx_todo_changeme1:
! 		(code, fn, details) = xxx_todo_changeme1.args
  		from . import winerror
! 		if code!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise win32api.error(code, fn, details)
  		return
  		
--- 66,73 ----
  	try:
  		key = win32api.RegOpenKey(regutil.GetRootKey(), regutil.BuildDefaultPythonKey() + "\\Help", 0, win32con.KEY_READ)
! 	except win32api.error as exc:
  		from . import winerror
! 		if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise
  		return
  		
***************
*** 88,96 ****
  					print("** Help file %s does not exist" % helpFile)
  				keyNo = keyNo + 1
! 			except win32api.error as xxx_todo_changeme2:
! 				(code, fn, desc) = xxx_todo_changeme2.args
  				from . import winerror
! 				if code!=winerror.ERROR_NO_MORE_ITEMS:
! 					raise win32api.error(code, fn, desc)
  				break
  	finally:
--- 86,93 ----
  					print("** Help file %s does not exist" % helpFile)
  				keyNo = keyNo + 1
! 			except win32api.error as exc:
  				from . import winerror
! 				if exc.winerror!=winerror.ERROR_NO_MORE_ITEMS:
! 					raise
  				break
  	finally:
***************
*** 103,111 ****
  		keyhandle = win32api.RegOpenKey(regutil.GetRootKey(), k)
  		print("WARNING: 'Modules' registry entry is deprectated and evil!")
! 	except win32api.error as xxx_todo_changeme3:
! 		(code, fn, details) = xxx_todo_changeme3.args
  		from . import winerror
! 		if code!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise win32api.error(code, fn, details)
  		return
  
--- 100,107 ----
  		keyhandle = win32api.RegOpenKey(regutil.GetRootKey(), k)
  		print("WARNING: 'Modules' registry entry is deprectated and evil!")
! 	except win32api.error as exc:
  		from . import winerror
! 		if exc.strerror!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise
  		return