Fix GSBotoStorage connection kwargs

storages/backends/gs.py

@@ -80,6 +80,11 @@ class GSBotoStorage(S3BotoStorage):
  url_protocol = setting('GS_URL_PROTOCOL', 'http:')
  host = setting('GS_HOST', GSConnection.DefaultHost)
 
+ def _get_connection_kwargs(self):
+ kwargs = super(GSBotoStorage, self)._get_connection_kwargs()
+ del kwargs['security_token']
+ return kwargs
+
  def _save_content(self, key, content, headers):
  # only pass backwards incompatible arguments if they vary from the default
  options = {}

storages/backends/s3boto.py

@@ -246,19 +246,26 @@ def __init__(self, acl=None, bucket=None, **settings):
  @property
  def connection(self):
  if self._connection is None:
+ kwargs = self._get_connection_kwargs()
+
  self._connection = self.connection_class(
  self.access_key,
  self.secret_key,
- security_token=self.security_token,
- is_secure=self.use_ssl,
- calling_format=self.calling_format,
- host=self.host,
- port=self.port,
- proxy=self.proxy,
- proxy_port=self.proxy_port
+ **kwargs
  )
  return self._connection
 
+ def _get_connection_kwargs(self):
+ return dict(
+ security_token=self.security_token,
+ is_secure=self.use_ssl,
+ calling_format=self.calling_format,
+ host=self.host,
+ port=self.port,
+ proxy=self.proxy,
+ proxy_port=self.proxy_port
+ )
+
  @property
  def bucket(self):
  """