Change `to_wire` to not mix explicit and implicit returns

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

diff --git a/regression-tests.auth-py/clientsubnetoption.py b/regression-tests.auth-py/clientsubnetoption.py
index ca956fa747d4f043c349acfb13ace4aadf7201c7..bb7022362287f62c9853075f484b2ca3c8d271e2 100644 (file)
--- a/regression-tests.auth-py/clientsubnetoption.py
+++ b/regression-tests.auth-py/clientsubnetoption.py
@@ -143,10 +143,10 @@ class ClientSubnetOption(dns.edns.Option):
 
         format = "!HBB%ds" % (mask_bits // 8)
         data = struct.pack(format, self.family, self.mask, self.scope, test)
-        if file:
-            file.write(data)
-        else:
+        if not file:
             return data
+        file.write(data)
+        return None
 
     def from_wire(cls, otype, wire, current, olen):
         """Read EDNS packet as defined in draft-vandergaast-edns-client-subnet-01.

diff --git a/regression-tests.dnsdist/clientsubnetoption.py b/regression-tests.dnsdist/clientsubnetoption.py
index 5da748ab0b0901758a0a5bb4349f75955599d229..83ab109d53951cdef2ddbaa8d86e004caf501619 100644 (file)
--- a/regression-tests.dnsdist/clientsubnetoption.py
+++ b/regression-tests.dnsdist/clientsubnetoption.py
@@ -143,10 +143,10 @@ class ClientSubnetOption(dns.edns.Option):
 
         format = "!HBB%ds" % (mask_bits // 8)
         data = struct.pack(format, self.family, self.mask, self.scope, test)
-        if file:
-            file.write(data)
-        else:
+        if not file:
             return data
+        file.write(data)
+        return None
 
     def from_wire(cls, otype, wire, current, olen):
         """Read EDNS packet as defined in draft-vandergaast-edns-client-subnet-01.

diff --git a/regression-tests.dnsdist/cookiesoption.py b/regression-tests.dnsdist/cookiesoption.py
index 8e4016d27b07c625070b8ee2b0de83842a580bb0..0cc42a9ebbb1d4c14ed0acd8c4512712f2e66ece 100644 (file)
--- a/regression-tests.dnsdist/cookiesoption.py
+++ b/regression-tests.dnsdist/cookiesoption.py
@@ -30,10 +30,10 @@ class CookiesOption(dns.edns.Option):
         else:
             data = self.client
 
-        if file:
-            file.write(data)
-        else:
+        if not file:
             return data
+        file.write(data)
+        return None
 
     def from_wire(cls, otype, wire, current, olen):
         """Read EDNS packet as defined in draft-ietf-dnsop-cookies-09.

diff --git a/regression-tests.dnsdist/randompaddingoption.py b/regression-tests.dnsdist/randompaddingoption.py
index b8a69cf4d3bbc7bf2e7ceb06ca25f6d99ed4a25e..c2673ecccfe1e7de07a2731a0d8bb11e4fef843d 100644 (file)
--- a/regression-tests.dnsdist/randompaddingoption.py
+++ b/regression-tests.dnsdist/randompaddingoption.py
@@ -14,7 +14,7 @@ class RandomPaddingOption(paddingoption.PaddingOption):
         """Create EDNS packet as defined in rfc7830 using random bytes in the payload."""
 
         payload = os.urandom(self.numberOfBytes)
-        if file:
-            file.write(payload)
-        else:
+        if not file:
             return payload
+        file.write(payload)
+        return None

diff --git a/regression-tests.recursor-dnssec/clientsubnetoption.py b/regression-tests.recursor-dnssec/clientsubnetoption.py
index 5da748ab0b0901758a0a5bb4349f75955599d229..83ab109d53951cdef2ddbaa8d86e004caf501619 100644 (file)
--- a/regression-tests.recursor-dnssec/clientsubnetoption.py
+++ b/regression-tests.recursor-dnssec/clientsubnetoption.py
@@ -143,10 +143,10 @@ class ClientSubnetOption(dns.edns.Option):
 
         format = "!HBB%ds" % (mask_bits // 8)
         data = struct.pack(format, self.family, self.mask, self.scope, test)
-        if file:
-            file.write(data)
-        else:
+        if not file:
             return data
+        file.write(data)
+        return None
 
     def from_wire(cls, otype, wire, current, olen):
         """Read EDNS packet as defined in draft-vandergaast-edns-client-subnet-01.

diff --git a/regression-tests.recursor-dnssec/extendederrors.py b/regression-tests.recursor-dnssec/extendederrors.py
index 29b68535e087aac8228210ab1bc4e88b29ee72c2..5646d8b761aea2d076f8bf6670f331049faec94f 100644 (file)
--- a/regression-tests.recursor-dnssec/extendederrors.py
+++ b/regression-tests.recursor-dnssec/extendederrors.py
@@ -22,10 +22,10 @@ class ExtendedErrorOption(dns.edns.Option):
 
         data = struct.pack('!H', self.code)
         data = data + self.extra
-        if file:
-            file.write(data)
-        else:
+        if not file:
             return data
+        file.write(data)
+        return None
 
     def from_wire(cls, otype, wire, current, olen):
         """Read EDNS packet.

diff --git a/regression-tests.recursor-dnssec/paddingoption.py b/regression-tests.recursor-dnssec/paddingoption.py
index db541f70c1089c64730f018441665934e9641a93..cb085d5bc0ea7652765627039097205b67ec7256 100644 (file)
--- a/regression-tests.recursor-dnssec/paddingoption.py
+++ b/regression-tests.recursor-dnssec/paddingoption.py
@@ -17,10 +17,10 @@ class PaddingOption(dns.edns.Option):
     def to_wire(self, file=None):
         """Create EDNS packet as defined in rfc7830."""
 
-        if file:
-            file.write(bytes(self.numberOfBytes))
-        else:
+        if not file:
             return bytes(self.numberOfBytes)
+        file.write(bytes(self.numberOfBytes))
+        return None
 
     def from_wire(cls, otype, wire, current, olen):
         """Read EDNS packet as defined in rfc7830.