summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2001-04-25 22:05:36 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2001-04-25 22:05:36 (GMT)
commitee677913df35c8c4c5ea91e3c85a3061f01bb26d (patch)
tree96eba0ae9713c586b92aa2b735bd251de3902841
parent9188b2194a11605d4da0386cac2abd48ab375639 (diff)
downloadcpython-ee677913df35c8c4c5ea91e3c85a3061f01bb26d.zip
cpython-ee677913df35c8c4c5ea91e3c85a3061f01bb26d.tar.gz
cpython-ee677913df35c8c4c5ea91e3c85a3061f01bb26d.tar.bz2
Don't crash if InfoScrap doesn't exist (as is the case in Carbon).
-rw-r--r--Mac/Demo/textedit/ped.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/Mac/Demo/textedit/ped.py b/Mac/Demo/textedit/ped.py
index 5c2d0f6..9b222a3 100644
--- a/Mac/Demo/textedit/ped.py
+++ b/Mac/Demo/textedit/ped.py
@@ -155,7 +155,6 @@ class TEWindow(ScrolledWindow):
self.parent.updatemenubar()
def menu_paste(self):
- print 'SCRAP', Scrap.InfoScrap(), `Scrap.InfoScrap()[1].data`
TE.TEFromScrap()
self.ted.TESelView()
self.ted.TEPaste()
@@ -224,7 +223,11 @@ class Ped(Application):
m.enable(on)
self.focusgroup_on = on
changed = 1
- on = (Scrap.InfoScrap()[0] <> 0)
+ if hasattr(Scrap, 'InfoScrap'):
+ on = (Scrap.InfoScrap()[0] <> 0)
+ else:
+ # Not there yet on Carbon, simply always enable
+ on = 1
if on <> self.pastegroup_on:
self.pasteitem.enable(on)
self.pastegroup_on = on