Fix raw_response feature inside Client.option ctx manager

Author: kabakchey

src/zeep/client.py

@@ -167,19 +167,21 @@ def options(self, timeout=NotSet, raw_response=NotSet):
 
 
         """
-        # Store current options
-        old_raw_raw_response = self.raw_response
+        if raw_response is not NotSet:
+            # Store current options
+            old_raw_response = self.raw_response
 
-        # Set new options
-        self.raw_response = raw_response
+            # Set new options
+            self.raw_response = raw_response
 
         if timeout is not NotSet:
             timeout_ctx = self.transport._options(timeout=timeout)
             timeout_ctx.__enter__()
 
         yield
 
-        self.raw_response = old_raw_raw_response
+        if raw_response is not NotSet:
+            self.raw_response = old_raw_response
 
         if timeout is not NotSet:
             timeout_ctx.__exit__(None, None, None)

tests/test_client.py

@@ -183,6 +183,20 @@ def test_set_context_options_timeout():
     assert obj.transport.operation_timeout is None
 
 
+def test_set_context_options_raw_response():
+    obj = client.Client('tests/wsdl_files/soap.wsdl')
+
+    assert obj.raw_response is False
+    with obj.options(raw_response=True):
+        assert obj.raw_response is True
+
+        with obj.options():
+            # Check that raw_response is not changed by default value
+            assert obj.raw_response is True
+    # Check that the original value returned
+    assert obj.raw_response is False
+
+
 @pytest.mark.requests
 def test_default_soap_headers():
     header = xsd.ComplexType(