removed deprecated raw parameter for requests

Author: jlwalke2

src/sasctl/_services/service.py

@@ -95,7 +95,7 @@ def request(cls, verb, path, session=None, raw=False, format='auto', **kwargs):
         else:
             path = cls._SERVICE_ROOT + '/' + path
 
-        return core.request(verb, path, session, raw, format, **kwargs)
+        return core.request(verb, path, session, format, **kwargs)
 
     @classmethod
     def get(cls, *args, **kwargs):

src/sasctl/core.py

@@ -1544,7 +1544,7 @@ def delete(path, **kwargs):
     return request('delete', path, **kwargs)
 
 
-def request(verb, path, session=None, raw=False, format='auto', **kwargs):
+def request(verb, path, session=None, format='auto', **kwargs):
     """Send an HTTP request with a session.
 
     Parameters
@@ -1555,9 +1555,6 @@ def request(verb, path, session=None, raw=False, format='auto', **kwargs):
         Path portion of URL to request.
     session : Session, optional
         Defaults to `current_session()`.
-    raw : bool
-        Deprecated. Whether to return the raw `Response` object.
-        Defaults to False.
     format : {'auto', 'rest', 'response', 'content', 'json', 'text'}
         The format of the return response.  Defaults to `auto`.
         rest: `RestObj` constructed from JSON.
@@ -1579,14 +1576,6 @@ def request(verb, path, session=None, raw=False, format='auto', **kwargs):
     if session is None:
         raise TypeError('No `Session` instance found.')
 
-    if raw:
-        warnings.warn(
-            "The 'raw' parameter is deprecated and will be removed in"
-            " a future version.  Use format='response' instead.",
-            DeprecationWarning,
-        )
-        format = 'response'
-
     format = 'auto' if format is None else str(format).lower()
     if format not in ('auto', 'response', 'content', 'text', 'json', 'rest'):
         raise ValueError

tests/unit/test_auth.py

@@ -152,7 +152,7 @@ def test_write_token_cache():
 
     assert mock_open.call_count == 1
     handle = mock_open()
-    handle.write.assert_called()  # called for each line of yaml written
+    assert handle.write.call_count > 0   # called for each line of yaml written
 
 
 def test_automatic_token_refresh():

tests/unit/test_core.py

@@ -177,14 +177,6 @@ def test_request_formats():
         assert mock_sess.request.call_count == 1
         assert isinstance(resp, Response)
 
-        with pytest.warns(DeprecationWarning):
-            resp = request('GET', 'example.com', session=mock_sess, raw=True)
-
-            # Make sure old param is eventually cleaned up
-            if sasctl.__version__.startswith('1.6'):
-                pytest.fail("Deprecated 'raw' parameter should be removed.")
-            assert isinstance(resp, Response)
-
         resp = request('GET', 'example.com', session=mock_sess, format='json')
         assert isinstance(resp, dict)
         assert resp['name'] == 'test'