tools/pythonpoint/pythonpoint.py
changeset 3326 ce725978d11c
parent 2967 ea62529bd1df
child 3617 ae5744e97c42
--- a/tools/pythonpoint/pythonpoint.py	Sat Feb 06 09:24:08 2010 +0000
+++ b/tools/pythonpoint/pythonpoint.py	Mon Feb 08 18:17:33 2010 +0000
@@ -70,7 +70,7 @@
 - save in combined presentation/handout mode (TODO)
 - add pyRXP support (TODO)
 """
-__version__='''$Id:$'''
+__version__='''$Id$'''
 import os, sys, imp, string, pprint, getopt, glob
 
 from reportlab import rl_config
@@ -489,7 +489,7 @@
             continue
             name = str(hash(graphic))
             #internalname = canv._doc.hasForm(name)
-            if definedForms.has_key(name):
+            if name in definedForms:
                 internalname = 1
             else:
                 internalname = None
@@ -747,8 +747,8 @@
             r,g,b = checkColor(self.strokeColor)
             canv.setStrokeColorRGB(r,g,b)
         canv.rect(self.x, self.y, self.width, self.height,
-                    stroke=(self.strokeColor<>None),
-                    fill = (self.fillColor<>None)
+                    stroke=(self.strokeColor!=None),
+                    fill = (self.fillColor!=None)
                     )
         canv.restoreState()
 
@@ -775,8 +775,8 @@
             canv.setStrokeColorRGB(r,g,b)
         canv.roundRect(self.x, self.y, self.width, self.height,
                     self.radius,
-                    stroke=(self.strokeColor<>None),
-                    fill = (self.fillColor<>None)
+                    stroke=(self.strokeColor!=None),
+                    fill = (self.fillColor!=None)
                     )
         canv.restoreState()
 
@@ -821,8 +821,8 @@
             r,g,b = checkColor(self.fillColor)
             canv.setFillColorRGB(r,g,b)
         canv.ellipse(self.x1, self.y1, self.x2, self.y2,
-                    stroke=(self.strokeColor<>None),
-                    fill = (self.fillColor<>None)
+                    stroke=(self.strokeColor!=None),
+                    fill = (self.fillColor!=None)
                      )
         canv.restoreState()
 
@@ -851,8 +851,8 @@
             path.lineTo(x,y)
         path.close()
         canv.drawPath(path,
-                      stroke=(self.strokeColor<>None),
-                      fill=(self.fillColor<>None))
+                      stroke=(self.strokeColor!=None),
+                      fill=(self.fillColor!=None))
         canv.restoreState()