[Python-checkins] python/dist/src/Lib/plat-mac/Carbon ControlAccessor.py,1.1,1.2 Res.py,1.1,1.2

jackjansen@users.sourceforge.net jackjansen@users.sourceforge.net
Wed, 09 Apr 2003 06:25:21 -0700


Update of /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon
In directory sc8-pr-cvs1:/tmp/cvs-serv29021

Modified Files:
	ControlAccessor.py Res.py 
Log Message:
Detabbed.


Index: ControlAccessor.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/ControlAccessor.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ControlAccessor.py	30 Dec 2002 22:04:21 -0000	1.1
--- ControlAccessor.py	9 Apr 2003 13:25:19 -0000	1.2
***************
*** 6,57 ****
  # These needn't go through this module, but are here for completeness
  def SetControlData_Handle(control, part, selector, data):
! 	control.SetControlData_Handle(part, selector, data)
! 	
  def GetControlData_Handle(control, part, selector):
! 	return control.GetControlData_Handle(part, selector)
! 	
  _accessdict = {
! 	kControlPopupButtonMenuHandleTag: (SetControlData_Handle, GetControlData_Handle),
  }
  
  _codingdict = {
! 	kControlPushButtonDefaultTag : ("b", None, None),
! 	
! 	kControlEditTextTextTag: (None, None, None),
! 	kControlEditTextPasswordTag: (None, None, None),
! 	
! 	kControlPopupButtonMenuIDTag: ("h", None, None),
! 	
! 	kControlListBoxDoubleClickTag: ("b", None, None),
  }
  
  def SetControlData(control, part, selector, data):
! 	if _accessdict.has_key(selector):
! 		setfunc, getfunc = _accessdict[selector]
! 		setfunc(control, part, selector, data)
! 		return
! 	if not _codingdict.has_key(selector):
! 		raise KeyError, ('Unknown control selector', selector)
! 	structfmt, coder, decoder = _codingdict[selector]
! 	if coder:
! 		data = coder(data)
! 	if structfmt:
! 		data = struct.pack(structfmt, data)
! 	control.SetControlData(part, selector, data)
! 	
  def GetControlData(control, part, selector):
! 	if _accessdict.has_key(selector):
! 		setfunc, getfunc = _accessdict[selector]
! 		return getfunc(control, part, selector, data)
! 	if not _codingdict.has_key(selector):
! 		raise KeyError, ('Unknown control selector', selector)
! 	structfmt, coder, decoder = _codingdict[selector]
! 	data = control.GetControlData(part, selector)
! 	if structfmt:
! 		data = struct.unpack(structfmt, data)
! 	if decoder:
! 		data = decoder(data)
! 	if type(data) == type(()) and len(data) == 1:
! 		data = data[0]
! 	return data
! 	
--- 6,57 ----
  # These needn't go through this module, but are here for completeness
  def SetControlData_Handle(control, part, selector, data):
!     control.SetControlData_Handle(part, selector, data)
!     
  def GetControlData_Handle(control, part, selector):
!     return control.GetControlData_Handle(part, selector)
!     
  _accessdict = {
!     kControlPopupButtonMenuHandleTag: (SetControlData_Handle, GetControlData_Handle),
  }
  
  _codingdict = {
!     kControlPushButtonDefaultTag : ("b", None, None),
!     
!     kControlEditTextTextTag: (None, None, None),
!     kControlEditTextPasswordTag: (None, None, None),
!     
!     kControlPopupButtonMenuIDTag: ("h", None, None),
!     
!     kControlListBoxDoubleClickTag: ("b", None, None),
  }
  
  def SetControlData(control, part, selector, data):
!     if _accessdict.has_key(selector):
!         setfunc, getfunc = _accessdict[selector]
!         setfunc(control, part, selector, data)
!         return
!     if not _codingdict.has_key(selector):
!         raise KeyError, ('Unknown control selector', selector)
!     structfmt, coder, decoder = _codingdict[selector]
!     if coder:
!         data = coder(data)
!     if structfmt:
!         data = struct.pack(structfmt, data)
!     control.SetControlData(part, selector, data)
!     
  def GetControlData(control, part, selector):
!     if _accessdict.has_key(selector):
!         setfunc, getfunc = _accessdict[selector]
!         return getfunc(control, part, selector, data)
!     if not _codingdict.has_key(selector):
!         raise KeyError, ('Unknown control selector', selector)
!     structfmt, coder, decoder = _codingdict[selector]
!     data = control.GetControlData(part, selector)
!     if structfmt:
!         data = struct.unpack(structfmt, data)
!     if decoder:
!         data = decoder(data)
!     if type(data) == type(()) and len(data) == 1:
!         data = data[0]
!     return data
!     

Index: Res.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Res.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Res.py	30 Dec 2002 22:04:21 -0000	1.1
--- Res.py	9 Apr 2003 13:25:19 -0000	1.2
***************
*** 1,4 ****
  try:
! 	from OverrideFrom23._Res import *
  except ImportError:
! 	from _Res import *
--- 1,4 ----
  try:
!     from OverrideFrom23._Res import *
  except ImportError:
!     from _Res import *