diff --git a/karborclient/common/utils.py b/karborclient/common/utils.py index 997a1f4..0f717ff 100644 --- a/karborclient/common/utils.py +++ b/karborclient/common/utils.py @@ -43,7 +43,7 @@ def env(*vars, **kwargs): returns the default defined in kwargs. """ for v in vars: - value = os.environ.get(v, None) + value = os.environ.get(v) if value: return value return kwargs.get('default', '') diff --git a/karborclient/tests/unit/base.py b/karborclient/tests/unit/base.py index c41ee62..3ebe613 100644 --- a/karborclient/tests/unit/base.py +++ b/karborclient/tests/unit/base.py @@ -44,11 +44,11 @@ class TestResponse(requests.Response): self._text = None super(TestResponse, self) if isinstance(data, dict): - self.status_code = data.get('status_code', None) - self.headers = data.get('headers', None) + self.status_code = data.get('status_code') + self.headers = data.get('headers') self.reason = data.get('reason', '') # Fake the text attribute to streamline Response creation - self._text = data.get('text', None) + self._text = data.get('text') else: self.status_code = data diff --git a/karborclient/tests/unit/v1/fakes.py b/karborclient/tests/unit/v1/fakes.py index 2d56689..4ace4d3 100644 --- a/karborclient/tests/unit/v1/fakes.py +++ b/karborclient/tests/unit/v1/fakes.py @@ -82,7 +82,7 @@ class FakeHTTPClient(base_client.HTTPClient): (method, url, callback)) # Note the call - self.callstack.append((method, url, kwargs.get('body', None))) + self.callstack.append((method, url, kwargs.get('body'))) status, headers, body = getattr(self, callback)(**kwargs) # add fake request-id header headers['x-openstack-request-id'] = REQUEST_ID diff --git a/karborclient/v1/checkpoints.py b/karborclient/v1/checkpoints.py index 0c5fe50..be430fe 100644 --- a/karborclient/v1/checkpoints.py +++ b/karborclient/v1/checkpoints.py @@ -25,7 +25,7 @@ class Checkpoint(base.Resource): return plan = self.protection_plan if plan is not None: - provider_id = plan.get("provider_id", None) + provider_id = plan.get("provider_id") new = self.manager.get(provider_id, self.id) if new: self._add_details(new._info)