[pywin32-checkins] pywin32/win32/Lib commctrl.py, 1.6, 1.7 win32con.py, 1.23, 1.24 win32netcon.py, 1.6, 1.7 win32serviceutil.py, 1.26, 1.27

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

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

Modified Files:
	commctrl.py win32con.py win32netcon.py win32serviceutil.py 
Log Message:
various py3k compatible syntax modernizations merged from py3k branch; 
unnecessary 'L' suffixes, raise exceptions as objects, types module, etc


Index: win32con.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32con.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** win32con.py	4 May 2008 10:43:37 -0000	1.23
--- win32con.py	2 Oct 2008 12:09:53 -0000	1.24
***************
*** 456,460 ****
  MB_SETFOREGROUND = 65536
  MB_DEFAULT_DESKTOP_ONLY = 131072
! MB_TOPMOST = 262144L
  MB_RIGHT = 524288
  MB_RTLREADING = 1048576
--- 456,460 ----
  MB_SETFOREGROUND = 65536
  MB_DEFAULT_DESKTOP_ONLY = 131072
! MB_TOPMOST = 262144
  MB_RIGHT = 524288
  MB_RTLREADING = 1048576
***************
*** 566,570 ****
  MFS_UNHILITE = MF_UNHILITE
  MFS_DEFAULT = MF_DEFAULT
! MFS_MASK = 4235L
  MFS_HOTTRACKDRAWN = 268435456
  MFS_CACHEDBMP = 536870912
--- 566,570 ----
  MFS_UNHILITE = MF_UNHILITE
  MFS_DEFAULT = MF_DEFAULT
! MFS_MASK = 4235
  MFS_HOTTRACKDRAWN = 268435456
  MFS_CACHEDBMP = 536870912
***************
*** 794,798 ****
  BS_USERBUTTON = 8
  BS_AUTORADIOBUTTON = 9
! BS_OWNERDRAW = 11L
  BS_LEFTTEXT = 32
  BS_TEXT = 0
--- 794,798 ----
  BS_USERBUTTON = 8
  BS_AUTORADIOBUTTON = 9
! BS_OWNERDRAW = 11
  BS_LEFTTEXT = 32
  BS_TEXT = 0
***************
*** 2415,2422 ****
  IMAGE_SYM_CLASS_SECTION = 104
  IMAGE_SYM_CLASS_WEAK_EXTERNAL = 105
! N_BTMASK = 017
! N_TMASK = 060
! N_TMASK1 = 0300
! N_TMASK2 = 0360
  N_BTSHFT = 4
  N_TSHIFT = 2
--- 2415,2422 ----
  IMAGE_SYM_CLASS_SECTION = 104
  IMAGE_SYM_CLASS_WEAK_EXTERNAL = 105
! N_BTMASK = 15
! N_TMASK = 48
! N_TMASK1 = 192
! N_TMASK2 = 240
  N_BTSHFT = 4
  N_TSHIFT = 2
***************
*** 2431,2447 ****
  IMAGE_WEAK_EXTERN_SEARCH_ALIAS = 3
  IMAGE_SIZEOF_RELOCATION = 10
! IMAGE_REL_I386_SECTION = 012
! IMAGE_REL_I386_SECREL = 013
! IMAGE_REL_MIPS_REFHALF = 01
! IMAGE_REL_MIPS_REFWORD = 02
! IMAGE_REL_MIPS_JMPADDR = 03
! IMAGE_REL_MIPS_REFHI = 04
! IMAGE_REL_MIPS_REFLO = 05
! IMAGE_REL_MIPS_GPREL = 06
! IMAGE_REL_MIPS_LITERAL = 07
! IMAGE_REL_MIPS_SECTION = 012
! IMAGE_REL_MIPS_SECREL = 013
! IMAGE_REL_MIPS_REFWORDNB = 042
! IMAGE_REL_MIPS_PAIR = 045
  IMAGE_REL_ALPHA_ABSOLUTE = 0
  IMAGE_REL_ALPHA_REFLONG = 1
--- 2431,2447 ----
  IMAGE_WEAK_EXTERN_SEARCH_ALIAS = 3
  IMAGE_SIZEOF_RELOCATION = 10
! IMAGE_REL_I386_SECTION = 10
! IMAGE_REL_I386_SECREL = 11
! IMAGE_REL_MIPS_REFHALF = 1
! IMAGE_REL_MIPS_REFWORD = 2
! IMAGE_REL_MIPS_JMPADDR = 3
! IMAGE_REL_MIPS_REFHI = 4
! IMAGE_REL_MIPS_REFLO = 5
! IMAGE_REL_MIPS_GPREL = 6
! IMAGE_REL_MIPS_LITERAL = 7
! IMAGE_REL_MIPS_SECTION = 10
! IMAGE_REL_MIPS_SECREL = 11
! IMAGE_REL_MIPS_REFWORDNB = 34
! IMAGE_REL_MIPS_PAIR = 37
  IMAGE_REL_ALPHA_ABSOLUTE = 0
  IMAGE_REL_ALPHA_REFLONG = 1

Index: win32serviceutil.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32serviceutil.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** win32serviceutil.py	7 Feb 2008 03:33:15 -0000	1.26
--- win32serviceutil.py	2 Oct 2008 12:09:53 -0000	1.27
***************
*** 491,495 ****
      print "Usage: '%s [options] install|update|remove|start [...]|stop|restart [...]|debug [...]'" % fname
      print "Options for 'install' and 'update' commands only:"
!     print " --username domain\username : The Username the service is to run under"
      print " --password password : The password for the username"
      print " --startup [manual|auto|disabled] : How the service starts, default = manual"
--- 491,495 ----
      print "Usage: '%s [options] install|update|remove|start [...]|stop|restart [...]|debug [...]'" % fname
      print "Options for 'install' and 'update' commands only:"
!     print " --username domain\\username : The Username the service is to run under"
      print " --password password : The password for the username"
      print " --startup [manual|auto|disabled] : How the service starts, default = manual"

Index: commctrl.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/commctrl.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** commctrl.py	12 Apr 2005 03:03:53 -0000	1.6
--- commctrl.py	2 Oct 2008 12:09:53 -0000	1.7
***************
*** 110,115 ****
  CDIS_MARKED = 128
  CDIS_INDETERMINATE = 256
! CLR_NONE = 0xFFFFFFFFL
! CLR_DEFAULT = 0xFF000000L
  ILC_MASK = 1
  ILC_COLOR = 0
--- 110,115 ----
  CDIS_MARKED = 128
  CDIS_INDETERMINATE = 256
! CLR_NONE = -1 # 0xFFFFFFFFL
! CLR_DEFAULT = -16777216 # 0xFF000000L
  ILC_MASK = 1
  ILC_COLOR = 0
***************
*** 789,800 ****
  HOTKEY_CLASSA = "msctls_hotkey32"
  HOTKEY_CLASS = HOTKEY_CLASSA
! CCS_TOP = 0x00000001L
! CCS_NOMOVEY = 0x00000002L
! CCS_BOTTOM = 0x00000003L
! CCS_NORESIZE = 0x00000004L
! CCS_NOPARENTALIGN = 0x00000008L
! CCS_ADJUSTABLE = 0x00000020L
! CCS_NODIVIDER = 0x00000040L
! CCS_VERT = 0x00000080L
  CCS_LEFT = (CCS_VERT | CCS_TOP)
  CCS_RIGHT = (CCS_VERT | CCS_BOTTOM)
--- 789,800 ----
  HOTKEY_CLASSA = "msctls_hotkey32"
  HOTKEY_CLASS = HOTKEY_CLASSA
! CCS_TOP = 0x00000001
! CCS_NOMOVEY = 0x00000002
! CCS_BOTTOM = 0x00000003
! CCS_NORESIZE = 0x00000004
! CCS_NOPARENTALIGN = 0x00000008
! CCS_ADJUSTABLE = 0x00000020
! CCS_NODIVIDER = 0x00000040
! CCS_VERT = 0x00000080
  CCS_LEFT = (CCS_VERT | CCS_TOP)
  CCS_RIGHT = (CCS_VERT | CCS_BOTTOM)
***************
*** 1526,1542 ****
  TME_CANCEL = -2147483648
  HOVER_DEFAULT = -1
! WSB_PROP_CYVSCROLL = 0x00000001L
! WSB_PROP_CXHSCROLL = 0x00000002L
! WSB_PROP_CYHSCROLL = 0x00000004L
! WSB_PROP_CXVSCROLL = 0x00000008L
! WSB_PROP_CXHTHUMB = 0x00000010L
! WSB_PROP_CYVTHUMB = 0x00000020L
! WSB_PROP_VBKGCOLOR = 0x00000040L
! WSB_PROP_HBKGCOLOR = 0x00000080L
! WSB_PROP_VSTYLE = 0x00000100L
! WSB_PROP_HSTYLE = 0x00000200L
! WSB_PROP_WINSTYLE = 0x00000400L
! WSB_PROP_PALETTE = 0x00000800L
! WSB_PROP_MASK = 0x00000FFFL
  FSB_FLAT_MODE = 2
  FSB_ENCARTA_MODE = 1
--- 1526,1542 ----
  TME_CANCEL = -2147483648
  HOVER_DEFAULT = -1
! WSB_PROP_CYVSCROLL = 0x00000001
! WSB_PROP_CXHSCROLL = 0x00000002
! WSB_PROP_CYHSCROLL = 0x00000004
! WSB_PROP_CXVSCROLL = 0x00000008
! WSB_PROP_CXHTHUMB = 0x00000010
! WSB_PROP_CYVTHUMB = 0x00000020
! WSB_PROP_VBKGCOLOR = 0x00000040
! WSB_PROP_HBKGCOLOR = 0x00000080
! WSB_PROP_VSTYLE = 0x00000100
! WSB_PROP_HSTYLE = 0x00000200
! WSB_PROP_WINSTYLE = 0x00000400
! WSB_PROP_PALETTE = 0x00000800
! WSB_PROP_MASK = 0x00000FFF
  FSB_FLAT_MODE = 2
  FSB_ENCARTA_MODE = 1

Index: win32netcon.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32netcon.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** win32netcon.py	4 Jun 2008 08:18:55 -0000	1.6
--- win32netcon.py	2 Oct 2008 12:09:53 -0000	1.7
***************
*** 311,315 ****
  DEF_MIN_PWAGE = 0
  DEF_FORCE_LOGOFF = -1
! ONE_DAY = 01*24*3600
  GROUP_SPECIALGRP_USERS = "USERS"
  GROUP_SPECIALGRP_ADMINS = "ADMINS"
--- 311,315 ----
  DEF_MIN_PWAGE = 0
  DEF_FORCE_LOGOFF = -1
! ONE_DAY = 1*24*3600
  GROUP_SPECIALGRP_USERS = "USERS"
  GROUP_SPECIALGRP_ADMINS = "ADMINS"
***************
*** 353,357 ****
  SV_TYPE_DOMAIN_ENUM = -2147483648
  SV_TYPE_ALL = -1
! SV_NODISC = (-1L)
  SV_USERSECURITY = 1
  SV_SHARESECURITY = 0
--- 353,357 ----
  SV_TYPE_DOMAIN_ENUM = -2147483648
  SV_TYPE_ALL = -1
! SV_NODISC = -1
  SV_USERSECURITY = 1
  SV_SHARESECURITY = 0