mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Kill more lingering string exceptions in Lib/plat-mac/.

Browse source
This commit is contained in:
Collin Winter 2007-08-30 18:11:48 +00:00
parent b9678e71f3
commit 6cd2a2036d
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/plat-mac/FrameWork.py
View file

@ -229,7 +229,7 @@ class Application:
def asyncevents(self, onoff): def asyncevents(self, onoff):
"""asyncevents - Set asynchronous event handling on or off""" """asyncevents - Set asynchronous event handling on or off"""
if MacOS.runtimemodel == 'macho': if MacOS.runtimemodel == 'macho':
raise 'Unsupported in MachoPython' raise NotImplementedError('Unsupported in MachoPython')
old = self._doing_asyncevents old = self._doing_asyncevents
if old: if old:
MacOS.SetEventHandler() MacOS.SetEventHandler()
@ -577,7 +577,7 @@ class Menu:
def delitem(self, item): def delitem(self, item):
if item != len(self.items): if item != len(self.items):
raise 'Can only delete last item of a menu' raise ValueError('Can only delete last item of a menu')
self.menu.DeleteMenuItem(item) self.menu.DeleteMenuItem(item)
del self.items[item-1] del self.items[item-1]

3
Lib/plat-mac/MiniAEFrame.py
View file

@ -141,7 +141,8 @@ class AEServer:
elif ('****', '****') in self.ae_handlers: elif ('****', '****') in self.ae_handlers:
_function = self.ae_handlers[('****', '****')] _function = self.ae_handlers[('****', '****')]
else: else:
raise 'Cannot happen: AE callback without handler', (_class, _type) raise RuntimeError('AE callback without handler: '
+ str((_class, _type)))
# XXXX Do key-to-name mapping here # XXXX Do key-to-name mapping here

9
Lib/plat-mac/PixMapWrapper.py
View file

@ -93,7 +93,8 @@ class PixMapWrapper:
def __setattr__(self, attr, val): def __setattr__(self, attr, val):
if attr == 'baseAddr': if attr == 'baseAddr':
raise 'UseErr', "don't assign to .baseAddr -- assign to .data instead" raise RuntimeError("don't assign to .baseAddr "
"-- assign to .data instead")
elif attr == 'data': elif attr == 'data':
self.__dict__['data'] = val self.__dict__['data'] = val
self._stuff('baseAddr', id(self.data) + MacOS.string_id_to_buffer) self._stuff('baseAddr', id(self.data) + MacOS.string_id_to_buffer)
@ -121,7 +122,7 @@ class PixMapWrapper:
return self._unstuff('rowBytes') & 0x7FFF return self._unstuff('rowBytes') & 0x7FFF
elif attr == 'bounds': elif attr == 'bounds':
# return bounds in official Left, Top, Right, Bottom order! # return bounds in official Left, Top, Right, Bottom order!
return ( \ return (
self._unstuff('left'), self._unstuff('left'),
self._unstuff('top'), self._unstuff('top'),
self._unstuff('right'), self._unstuff('right'),
@ -161,7 +162,7 @@ class PixMapWrapper:
# so convert if necessary # so convert if necessary
if format != imgformat.macrgb and format != imgformat.macrgb16: if format != imgformat.macrgb and format != imgformat.macrgb16:
# (LATER!) # (LATER!)
raise "NotImplementedError", "conversion to macrgb or macrgb16" raise NotImplementedError("conversion to macrgb or macrgb16")
self.data = s self.data = s
self.bounds = (0,0,width,height) self.bounds = (0,0,width,height)
self.cmpCount = 3 self.cmpCount = 3
@ -182,7 +183,7 @@ class PixMapWrapper:
return self.data return self.data
# otherwise, convert to the requested format # otherwise, convert to the requested format
# (LATER!) # (LATER!)
raise "NotImplementedError", "data format conversion" raise NotImplementedError("data format conversion")
def fromImage(self,im): def fromImage(self,im):
"""Initialize this PixMap from a PIL Image object.""" """Initialize this PixMap from a PIL Image object."""