removed None vs int comparisons

samizdatco · samizdatco · commit 4ead30ec00e0 · 2015-06-29T21:42:12.000-04:00
diff --git a/plotdevice/gfx/bezier.py b/plotdevice/gfx/bezier.py
@@ -197,7 +197,7 @@ def line(self, x1, y1, x2, y2, ccw=None):
     def poly(self, x, y, radius, sides=4, points=None):
         # if `points` is defined, draw a regularized star, otherwise draw
         # a regular polygon with the given number of `sides`.
-        if points>4:
+        if points and points>4:
             inner = radius * cos(pi*2/points)/cos(pi/points)
             return self.star(x, y, points, inner, radius)
         elif points is not None:
diff --git a/plotdevice/gfx/image.py b/plotdevice/gfx/image.py
@@ -202,7 +202,7 @@ def _scalefactor(self):
         elif all([self.width, self.height]):
             factor = min(self.width/src.width, self.height/src.height)
         else:
-            dim, src_dim = max((self.width, src.width), (self.height, src.height))
+            dim, src_dim = max((self.width or 0, src.width), (self.height or 0, src.height))
             factor = dim/src_dim
         return factor
 
