pywin32-checkins

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

Update of /cvsroot/pywin32/pywin32/com/win32comext/axscript/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28862/axscript/client

Modified Files:
	framework.py 
Log Message:
Move towards better unicode support - allow extended chars in comments.


Index: framework.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/client/framework.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** framework.py	11 Apr 2005 13:04:40 -0000	1.21
--- framework.py	18 Jun 2006 13:09:33 -0000	1.22
***************
*** 522,526 ****
  	def AddScriptlet(self, defaultName, code, itemName, subItemName, eventName, delimiter, sourceContextCookie, startLineNumber):
  #		trace ("AddScriptlet", defaultName, code, itemName, subItemName, eventName, delimiter, sourceContextCookie, startLineNumber)
! 		self.DoAddScriptlet(defaultName, str(code), itemName, subItemName, eventName, delimiter,sourceContextCookie, startLineNumber)
  
  	def ParseScriptText(self, code, itemName, context, delimiter, sourceContextCookie, startLineNumber, flags, bWantResult):
--- 522,526 ----
  	def AddScriptlet(self, defaultName, code, itemName, subItemName, eventName, delimiter, sourceContextCookie, startLineNumber):
  #		trace ("AddScriptlet", defaultName, code, itemName, subItemName, eventName, delimiter, sourceContextCookie, startLineNumber)
! 		self.DoAddScriptlet(defaultName, code, itemName, subItemName, eventName, delimiter,sourceContextCookie, startLineNumber)
  
  	def ParseScriptText(self, code, itemName, context, delimiter, sourceContextCookie, startLineNumber, flags, bWantResult):
***************
*** 536,540 ****
  			# About to execute the code.
  			self.RegisterNewNamedItems()
! 		return self.DoParseScriptText(str(code), sourceContextCookie, startLineNumber, bWantResult, flags)
  
  	#
--- 536,540 ----
  			# About to execute the code.
  			self.RegisterNewNamedItems()
! 		return self.DoParseScriptText(code, sourceContextCookie, startLineNumber, bWantResult, flags)
  
  	#
***************
*** 550,554 ****
  		# (but even for those blocks, the "onClick" information is still missing!?!?!?)
  
! #		self.DoAddScriptlet(None, str(code), itemName, subItemName, eventName, delimiter,sourceContextCookie, startLineNumber)
  		return None
  	#
--- 550,554 ----
  		# (but even for those blocks, the "onClick" information is still missing!?!?!?)
  
! #		self.DoAddScriptlet(None, code, itemName, subItemName, eventName, delimiter,sourceContextCookie, startLineNumber)
  		return None
  	#
***************
*** 653,657 ****
  	def AddNamedItem(self, name, flags):
  		if self.scriptSite is None: raise Exception(scode=winerror.E_INVALIDARG)
- 		name = str(name) # Convert from Unicode.
  		try:
  			unknown = self.scriptSite.GetItemInfo(name, axscript.SCRIPTINFO_IUNKNOWN)[0]
--- 653,656 ----