Kaydet (Commit) 8eff33b5 authored tarafından Jack Jansen's avatar Jack Jansen

Added an optional debug handler that traps and prints all unknown appleevents.

üst d13c3854
...@@ -30,7 +30,7 @@ def main(): ...@@ -30,7 +30,7 @@ def main():
dummy = Res.GetResource('DLOG', ID_MAIN) dummy = Res.GetResource('DLOG', ID_MAIN)
except Res.Error: except Res.Error:
try: try:
Res.OpenResFile("PICTbrowse.rsrc") Res.FSpOpenResFile("PICTbrowse.rsrc", 1)
except Res.Error, arg: except Res.Error, arg:
EasyDialogs.Message("Cannot open PICTbrowse.rsrc: "+arg[1]) EasyDialogs.Message("Cannot open PICTbrowse.rsrc: "+arg[1])
sys.exit(1) sys.exit(1)
......
...@@ -25,7 +25,7 @@ def main(): ...@@ -25,7 +25,7 @@ def main():
dummy = Res.GetResource('DLOG', ID_MAIN) dummy = Res.GetResource('DLOG', ID_MAIN)
except Res.Error: except Res.Error:
try: try:
Res.OpenResFile("PICTbrowse.rsrc") Res.FSpOpenResFile("PICTbrowse.rsrc", 1)
except Res.Error, arg: except Res.Error, arg:
EasyDialogs.Message("Cannot open PICTbrowse.rsrc: "+arg[1]) EasyDialogs.Message("Cannot open PICTbrowse.rsrc: "+arg[1])
sys.exit(1) sys.exit(1)
......
...@@ -29,7 +29,7 @@ def main(): ...@@ -29,7 +29,7 @@ def main():
dummy = Res.GetResource('DLOG', ID_MAIN) dummy = Res.GetResource('DLOG', ID_MAIN)
except Res.Error: except Res.Error:
try: try:
Res.OpenResFile("PICTbrowse.rsrc") Res.FSpOpenResFile("PICTbrowse.rsrc", 1)
except Res.Error, arg: except Res.Error, arg:
EasyDialogs.Message("Cannot open PICTbrowse.rsrc: "+arg[1]) EasyDialogs.Message("Cannot open PICTbrowse.rsrc: "+arg[1])
sys.exit(1) sys.exit(1)
......
...@@ -30,7 +30,7 @@ def main(): ...@@ -30,7 +30,7 @@ def main():
dummy = Res.GetResource('DLOG', ID_MAIN) dummy = Res.GetResource('DLOG', ID_MAIN)
except Res.Error: except Res.Error:
try: try:
Res.OpenResFile("PICTbrowse.rsrc") Res.FSpOpenResFile("PICTbrowse.rsrc", 1)
except Res.Error, arg: except Res.Error, arg:
EasyDialogs.Message("Cannot open PICTbrowse.rsrc: "+arg[1]) EasyDialogs.Message("Cannot open PICTbrowse.rsrc: "+arg[1])
sys.exit(1) sys.exit(1)
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
from MiniAEFrame import AEServer, MiniApplication from MiniAEFrame import AEServer, MiniApplication
import MacOS import MacOS
debug=1
class CGITest(AEServer, MiniApplication): class CGITest(AEServer, MiniApplication):
def __init__(self): def __init__(self):
...@@ -12,6 +14,8 @@ class CGITest(AEServer, MiniApplication): ...@@ -12,6 +14,8 @@ class CGITest(AEServer, MiniApplication):
self.installaehandler('aevt', 'oapp', self.open_app) self.installaehandler('aevt', 'oapp', self.open_app)
self.installaehandler('aevt', 'quit', self.quit) self.installaehandler('aevt', 'quit', self.quit)
self.installaehandler('WWW\275', 'sdoc', self.cgihandler) self.installaehandler('WWW\275', 'sdoc', self.cgihandler)
if debug:
self.installaehandler('****', '****', self.otherhandler)
oldparams = MacOS.SchedParams(0, 0) oldparams = MacOS.SchedParams(0, 0)
self.mainloop() self.mainloop()
apply(MacOS.SchedParams, oldparams) apply(MacOS.SchedParams, oldparams)
...@@ -21,8 +25,15 @@ class CGITest(AEServer, MiniApplication): ...@@ -21,8 +25,15 @@ class CGITest(AEServer, MiniApplication):
def open_app(self, **args): def open_app(self, **args):
pass pass
def otherhandler(self, *args, **kwargs):
print 'Unknown AppleEvent'
print 'args', args
print 'kwargs', kwargs
def cgihandler(self, pathargs, **args): def cgihandler(self, pathargs, **args):
if debug:
print 'CGI request', pathargs, args
rv = """HTTP/1.0 200 OK rv = """HTTP/1.0 200 OK
Server: Unknown; python-cgi-script Server: Unknown; python-cgi-script
MIME-Version: 1.0 MIME-Version: 1.0
......
...@@ -20,7 +20,7 @@ ITEM_QUIT_BUTTON=4 ...@@ -20,7 +20,7 @@ ITEM_QUIT_BUTTON=4
def main(): def main():
"""Main routine: open resource file, call dialog handler""" """Main routine: open resource file, call dialog handler"""
try: try:
Res.OpenResFile("dnslookup-1.rsrc") Res.FSpOpenResFile("dnslookup-1.rsrc", 1)
except Res.Error: except Res.Error:
EasyDialogs.Message("Cannot open dnslookup-1.rsrc") EasyDialogs.Message("Cannot open dnslookup-1.rsrc")
sys.exit(1) sys.exit(1)
......
...@@ -19,7 +19,7 @@ def main(): ...@@ -19,7 +19,7 @@ def main():
dummy = Res.GetResource('DLOG', ID_MAIN) dummy = Res.GetResource('DLOG', ID_MAIN)
except Res.Error: except Res.Error:
try: try:
Res.OpenResFile("dnslookup-2.rsrc") Res.FSpOpenResFile("dnslookup-2.rsrc", 1)
except Res.Error: except Res.Error:
EasyDialogs.Message("Cannot open dnslookup-2.rsrc") EasyDialogs.Message("Cannot open dnslookup-2.rsrc")
sys.exit(1) sys.exit(1)
......
...@@ -72,7 +72,7 @@ class WasteWindow(ScrolledWindow): ...@@ -72,7 +72,7 @@ class WasteWindow(ScrolledWindow):
return None, None return None, None
oldrf = Res.CurResFile() oldrf = Res.CurResFile()
try: try:
rf = Res.OpenResFile(self.path) rf = Res.FSpOpenResFile(self.path, 1)
except Res.Error: except Res.Error:
return None, None return None, None
try: try:
...@@ -241,10 +241,10 @@ class WasteWindow(ScrolledWindow): ...@@ -241,10 +241,10 @@ class WasteWindow(ScrolledWindow):
# #
oldresfile = Res.CurResFile() oldresfile = Res.CurResFile()
try: try:
rf = Res.OpenResFile(self.path) rf = Res.FSpOpenResFile(self.path, 3)
except Res.Error: except Res.Error:
Res.CreateResFile(self.path) Res.CreateResFile(self.path)
rf = Res.OpenResFile(self.path) rf = Res.FSpOpenResFile(self.path, 3)
styles = Res.Resource('') styles = Res.Resource('')
soup = Res.Resource('') soup = Res.Resource('')
self.ted.WECopyRange(0, 0x3fffffff, None, styles, soup) self.ted.WECopyRange(0, 0x3fffffff, None, styles, soup)
......
...@@ -59,7 +59,7 @@ class WasteWindow(ScrolledWindow): ...@@ -59,7 +59,7 @@ class WasteWindow(ScrolledWindow):
return None, None return None, None
oldrf = Res.CurResFile() oldrf = Res.CurResFile()
try: try:
rf = Res.OpenResFile(self.path) rf = Res.FSpOpenResFile(self.path, 1)
except Res.Error: except Res.Error:
return None, None return None, None
try: try:
...@@ -210,10 +210,10 @@ class WasteWindow(ScrolledWindow): ...@@ -210,10 +210,10 @@ class WasteWindow(ScrolledWindow):
# #
oldresfile = Res.CurResFile() oldresfile = Res.CurResFile()
try: try:
rf = Res.OpenResFile(self.path) rf = Res.FSpOpenResFile(self.path, 3)
except Res.Error: except Res.Error:
Res.CreateResFile(self.path) Res.CreateResFile(self.path)
rf = Res.OpenResFile(self.path) rf = Res.FSpOpenResFile(self.path, 3)
styles = Res.Resource('') styles = Res.Resource('')
soup = Res.Resource('') soup = Res.Resource('')
self.ted.WECopyRange(0, 0x3fffffff, None, styles, soup) self.ted.WECopyRange(0, 0x3fffffff, None, styles, soup)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment