--- a/tools/docco/graphdocpy.py	Sat Feb 06 09:24:08 2010 +0000
+++ b/tools/docco/graphdocpy.py	Mon Feb 08 18:17:33 2010 +0000
@@ -92,7 +92,7 @@
     def __init__(self, filename, **kw):
         frame1 = Frame(2.5*cm, 2.5*cm, 15*cm, 25*cm, id='F1')
         self.allowSplitting = 0
-        apply(BaseDocTemplate.__init__, (self, filename), kw)
+        BaseDocTemplate.__init__(self, filename, **kw)
         self.addPageTemplates(PageTemplate('normal', [frame1], mainPageFrame))
 
     def afterFlowable(self, flowable):
@@ -915,7 +915,7 @@
     optsDict = {}
     for k, v in opts:
         optsDict[k] = v
-    hasOpt = optsDict.has_key
+    hasOpt = optsDict.__contains__
 
     # On -h print usage and exit immediately.
     if hasOpt('-h'):