get_bucket_location returns NoneType error when client error is added

[samhine]

Problem

When adding a client error through get_bucket_location, rather than raise a ClientError (or the specified Service Error Code, we instead receive;

AttributeError: 'NoneType' object has no attribute 'stream'

Working Example (with get_bucket_logging)

import boto3
from botocore.stub import Stubber

client = boto3.client('s3')
stubber = Stubber(client)
stubber.add_client_error('get_bucket_logging', 'NoSuchBucket')
stubber.activate()

# Raises botocore.errorfactory.NoSuchBucket
client.get_bucket_logging(Bucket="meh")

Non-working Example (with get_bucket_location)

import boto3
from botocore.stub import Stubber

client = boto3.client('s3')
stubber = Stubber(client)
stubber.add_client_error('get_bucket_location', 'NoSuchBucket')
stubber.activate()

# Raises an AttributeError from within awsrequest.py
client.get_bucket_location(Bucket="meh")

The full stack response from this error is;

Traceback (most recent call last):
  File "untitled.py", line 24, in <module>
    client.get_bucket_location(Bucket="meh")
  File "/usr/local/lib/python3.7/site-packages/botocore/client.py", line 357, in _api_call
    return self._make_api_call(operation_name, kwargs)
  File "/usr/local/lib/python3.7/site-packages/botocore/client.py", line 655, in _make_api_call
    model=operation_model, context=request_context
  File "/usr/local/lib/python3.7/site-packages/botocore/hooks.py", line 356, in emit
    return self._emitter.emit(aliased_event_name, **kwargs)
  File "/usr/local/lib/python3.7/site-packages/botocore/hooks.py", line 228, in emit
    return self._emit(event_name, kwargs)
  File "/usr/local/lib/python3.7/site-packages/botocore/hooks.py", line 211, in _emit
    response = handler(**kwargs)
  File "/usr/local/lib/python3.7/site-packages/botocore/handlers.py", line 485, in parse_get_bucket_location
    response_body = http_response.content
  File "/usr/local/lib/python3.7/site-packages/botocore/awsrequest.py", line 587, in content
    self._content = bytes().join(self.raw.stream()) or bytes()
AttributeError: 'NoneType' object has no attribute 'stream'

Summary

I've tried searching open/closed issues but can't find something similar, nor a working example online using get_bucket_location. I fear this might be a bug within botocore.stub itself. Any help would be greatly appreciated! Thanks.

[swetashre]

@samhine - Thank you for your post. I am able to reproduce the issue. I would mark this as bug.