| Update of /cvsroot/pywin32/pywin32/win32/Lib
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3985/win32/Lib
Modified Files:
      Tag: py3k
	win32timezone.py 
Log Message:
merge various changes, particularly PyTime, from trunk
Index: win32timezone.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32timezone.py,v
retrieving revision 1.9.2.8
retrieving revision 1.9.2.9
diff -C2 -d -r1.9.2.8 -r1.9.2.9
*** win32timezone.py	3 Jan 2009 04:49:36 -0000	1.9.2.8
--- win32timezone.py	8 Jan 2009 03:45:50 -0000	1.9.2.9
***************
*** 471,478 ****
  	"""It may be a bug in Vista, but in standard Windows Vista install
  	(both 32-bit and 64-bit), it appears the TimeZoneKeyName returns a
! 	string with extraneous characters."""
  	# remove anything after and including the first null character.
! 	value, garbage = name.split('\x00',1)
! 	return value
  
  def GetTZCapabilities():
--- 471,482 ----
  	"""It may be a bug in Vista, but in standard Windows Vista install
  	(both 32-bit and 64-bit), it appears the TimeZoneKeyName returns a
! 	string with extraneous characters.
! 	>>> __TimeZoneKeyNameWorkaround("foo\\0xxx")
! 	'foo'
! 	>>> __TimeZoneKeyNameWorkaround("foo")
! 	'foo'
! 	"""
  	# remove anything after and including the first null character.
! 	return name.split('\x00',1)[0]
  
  def GetTZCapabilities():
 |