[pywin32-checkins] pywin32/win32/Lib regcheck.py, 1.7, 1.8 regutil.py, 1.4, 1.5

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

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

Modified Files:
	regcheck.py regutil.py 
Log Message:
various improvements and modernizations from py3k branch.


Index: regutil.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/regutil.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** regutil.py	1 Oct 2008 14:44:53 -0000	1.4
--- regutil.py	23 Oct 2008 07:39:12 -0000	1.5
***************
*** 88,95 ****
  	try:
  		win32api.RegDeleteKey(GetRootKey(), GetAppPathsKey() + "\\" + exeAlias)
! 	except win32api.error, (code, fn, details):
  		import winerror
! 		if code!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise win32api.error(code, fn, desc)
  		return
  
--- 88,95 ----
  	try:
  		win32api.RegDeleteKey(GetRootKey(), GetAppPathsKey() + "\\" + exeAlias)
! 	except win32api.error, exc:
  		import winerror
! 		if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise
  		return
  
***************
*** 107,114 ****
  	try:
  		win32api.RegDeleteKey(GetRootKey(), keyStr)
! 	except win32api.error, (code, fn, details):
  		import winerror
! 		if code!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise win32api.error(code, fn, desc)
  		return
  
--- 107,114 ----
  	try:
  		win32api.RegDeleteKey(GetRootKey(), keyStr)
! 	except win32api.error, exc:
  		import winerror
! 		if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise
  		return
  
***************
*** 120,127 ****
  	try:
  		return win32api.RegQueryValue(GetRootKey(), keyStr)
! 	except win32api.error, (code, fn, details):
  		import winerror
! 		if code!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise win32api.error(code, fn, details)
  		return None
  
--- 120,127 ----
  	try:
  		return win32api.RegQueryValue(GetRootKey(), keyStr)
! 	except win32api.error, exc:
  		import winerror
! 		if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise
  		return None
  
***************
*** 152,159 ****
  		win32api.RegDeleteKey(GetRootKey(), 
  		                     BuildDefaultPythonKey() + "\\Modules\\%s" % modName)
! 	except win32api.error, (code, fn, desc):
  		import winerror
! 		if code!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise win32api.error(code, fn, desc)
  
  def GetRegisteredHelpFile(helpDesc):
--- 152,159 ----
  		win32api.RegDeleteKey(GetRootKey(), 
  		                     BuildDefaultPythonKey() + "\\Modules\\%s" % modName)
! 	except win32api.error, exc:
  		import winerror
! 		if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise
  
  def GetRegisteredHelpFile(helpDesc):
***************
*** 200,207 ****
  		try:
  			win32api.RegDeleteValue(key, helpFile)
! 		except win32api.error, (code, fn, desc):
  			import winerror
! 			if code!=winerror.ERROR_FILE_NOT_FOUND:
! 				raise win32api.error(code, fn, desc)
  	finally:
  		win32api.RegCloseKey(key)
--- 200,207 ----
  		try:
  			win32api.RegDeleteValue(key, helpFile)
! 		except win32api.error, exc:
  			import winerror
! 			if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND:
! 				raise
  	finally:
  		win32api.RegCloseKey(key)
***************
*** 212,219 ****
  		win32api.RegDeleteKey(GetRootKey(), 
  		                     BuildDefaultPythonKey() + "\\Help\\%s" % helpDesc)	
! 	except win32api.error, (code, fn, desc):
  		import winerror
! 		if code!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise win32api.error(code, fn, desc)
  
  def RegisterCoreDLL(coredllName = None):
--- 212,219 ----
  		win32api.RegDeleteKey(GetRootKey(), 
  		                     BuildDefaultPythonKey() + "\\Help\\%s" % helpDesc)	
! 	except win32api.error, exc:
  		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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** regcheck.py	1 Oct 2008 14:44:53 -0000	1.7
--- regcheck.py	23 Oct 2008 07:39:12 -0000	1.8
***************
*** 33,38 ****
  	try:
  		appPath = win32api.RegQueryValue(regutil.GetRootKey(), regutil.BuildDefaultPythonKey() + "\\PythonPath")
! 	except win32api.error, (code, fn, desc):
! 		print "** does not exist - ", desc
  	problem = CheckPathString(appPath)
  	if problem:
--- 33,38 ----
  	try:
  		appPath = win32api.RegQueryValue(regutil.GetRootKey(), regutil.BuildDefaultPythonKey() + "\\PythonPath")
! 	except win32api.error, exc:
! 		print "** does not exist - ", exc.strerror
  	problem = CheckPathString(appPath)
  	if problem:
***************
*** 67,74 ****
  	try:
  		key = win32api.RegOpenKey(regutil.GetRootKey(), 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
  		
--- 67,74 ----
  	try:
  		key = win32api.RegOpenKey(regutil.GetRootKey(), regutil.BuildDefaultPythonKey() + "\\Help", 0, win32con.KEY_READ)
! 	except win32api.error, exc:
  		import winerror
! 		if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise
  		return
  		
***************
*** 87,94 ****
  					print "** Help file %s does not exist" % 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 ----
  					print "** Help file %s does not exist" % helpFile
  				keyNo = keyNo + 1
! 			except win32api.error, exc:
  				import winerror
! 				if exc.winerror!=winerror.ERROR_NO_MORE_ITEMS:
! 					raise
  				break
  	finally:
***************
*** 101,113 ****
  		keyhandle = win32api.RegOpenKey(regutil.GetRootKey(), k)
  		print "WARNING: 'Modules' registry entry is deprectated and evil!"
! 	except win32api.error, (code, fn, details):
  		import winerror
! 		if code!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise win32api.error(code, fn, details)
  		return
  
  def CheckRegistry(verbose=0):
  	# check the registered modules
! 	if verbose and os.environ.has_key('pythonpath'):
  		print "Warning - PythonPath in environment - please check it!"
  	# Check out all paths on sys.path
--- 101,113 ----
  		keyhandle = win32api.RegOpenKey(regutil.GetRootKey(), k)
  		print "WARNING: 'Modules' registry entry is deprectated and evil!"
! 	except win32api.error, exc:
  		import winerror
! 		if exc.winerror!=winerror.ERROR_FILE_NOT_FOUND:
! 			raise
  		return
  
  def CheckRegistry(verbose=0):
  	# check the registered modules
! 	if verbose and 'pythonpath' in os.environ:
  		print "Warning - PythonPath in environment - please check it!"
  	# Check out all paths on sys.path