Update of /cvsroot/pywin32/pywin32/win32/Lib
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7876/win32/Lib
Modified Files:
Tag: py3k
win32gui_struct.py
Log Message:
some simple issues found by 2to3, but needs more py3k work
Index: win32gui_struct.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32gui_struct.py,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C2 -d -r1.11.2.1 -r1.11.2.2
*** win32gui_struct.py 11 Sep 2008 07:48:21 -0000 1.11.2.1
--- win32gui_struct.py 3 Jan 2009 04:51:00 -0000 1.11.2.2
***************
*** 289,293 ****
text_addr = text_len = 0
else:
! if isinstance(text, unicode):
text = text.encode("mbcs")
text_buffer = array.array("c", text+"\0")
--- 289,293 ----
text_addr = text_len = 0
else:
! if isinstance(text, str):
text = text.encode("mbcs")
text_buffer = array.array("c", text+"\0")
***************
*** 390,394 ****
else:
mask |= commctrl.LVIF_TEXT
! if isinstance(text, unicode):
text = text.encode("mbcs")
text_buffer = array.array("c", text+"\0")
--- 390,394 ----
else:
mask |= commctrl.LVIF_TEXT
! if isinstance(text, str):
text = text.encode("mbcs")
text_buffer = array.array("c", text+"\0")
***************
*** 473,477 ****
text_addr = text_len = 0
else:
! if isinstance(text, unicode):
text = text.encode("mbcs")
text_buffer = array.array("c", text+"\0")
--- 473,477 ----
text_addr = text_len = 0
else:
! if isinstance(text, str):
text = text.encode("mbcs")
text_buffer = array.array("c", text+"\0")
***************
*** 550,554 ****
text_addr = text_len = 0
else:
! if isinstance(text, unicode):
text = text.encode("mbcs")
text_buffer = array.array("c", text+"\0")
--- 550,554 ----
text_addr = text_len = 0
else:
! if isinstance(text, str):
text = text.encode("mbcs")
text_buffer = array.array("c", text+"\0")
***************
*** 578,582 ****
def PackDEV_BROADCAST_HANDLE(handle, hdevnotify=0, guid="\0"*16, name_offset=0, data="\0"):
return PackDEV_BROADCAST(win32con.DBT_DEVTYP_HANDLE, "PP16sl",
! (long(handle), long(hdevnotify), str(buffer(guid)), name_offset),
data)
--- 578,582 ----
def PackDEV_BROADCAST_HANDLE(handle, hdevnotify=0, guid="\0"*16, name_offset=0, data="\0"):
return PackDEV_BROADCAST(win32con.DBT_DEVTYP_HANDLE, "PP16sl",
! (int(handle), int(hdevnotify), str(buffer(guid)), name_offset),
data)
|
