From bafbb5b7a4b7db2ca230f292eb45be7e67985259 Mon Sep 17 00:00:00 2001
From: BonfaceKilz
Date: Wed, 19 Aug 2020 02:05:05 +0300
Subject: Remove erroneous `if .. else` branch

* wqflask/utility/svg.py [roct, ellipse, SVGelement]: Raise only a single value error
if either height or width is not defined. Fixes parsing error when running
`2to3-3.8 -f apply -w .`
---
 wqflask/utility/svg.py | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

(limited to 'wqflask/utility/svg.py')

diff --git a/wqflask/utility/svg.py b/wqflask/utility/svg.py
index c850feb8..d66c954e 100644
--- a/wqflask/utility/svg.py
+++ b/wqflask/utility/svg.py
@@ -445,12 +445,8 @@ class rect(SVGelement):
 
     def __init__(self, x=None, y=None, width=None, height=None, fill=None, stroke=None, stroke_width=None, **args):
         if width == None or height == None:
-                raise ValueError, 'height is required'
-                raise ValueError, 'width is required'
-            if width!=None:
-            if height!=None:
-            else:
-                raise ValueError, 'both height and width are required'
+            raise ValueError, 'both height and width are required'
+
         SVGelement.__init__(self,'rect',{'width':width,'height':height},**args)
         if x!=None:
             self.attributes['x']=x
@@ -470,12 +466,8 @@ class ellipse(SVGelement):
     """
     def __init__(self,cx=None,cy=None,rx=None,ry=None,fill=None,stroke=None,stroke_width=None,**args):
         if rx==None or ry== None:
-                raise ValueError, 'rx is required'
-                raise ValueError, 'ry is required'
-            if rx!=None:
-            if ry!=None:
-            else:
-                raise ValueError, 'both rx and ry are required'
+            raise ValueError, 'both rx and ry are required'
+
         SVGelement.__init__(self,'ellipse',{'rx':rx,'ry':ry},**args)
         if cx!=None:
             self.attributes['cx']=cx
@@ -722,12 +714,7 @@ class image(SVGelement):
     """
     def __init__(self,url,x=None,y=None,width=None,height=None,**args):
         if width==None or height==None:
-                raise ValueError, 'height is required'
-                raise ValueError, 'width is required'
-            if width!=None:
-            if height!=None:
-            else:
-                raise ValueError, 'both height and width are required'
+            raise ValueError, 'both height and width are required'
         SVGelement.__init__(self,'image',{'xlink:href':url,'width':width,'height':height},**args)
         if x!=None:
             self.attributes['x']=x
-- 
cgit v1.2.3