Skip to content

Commit

Permalink
Merge pull request conda#2380 from jseabold/monkeypatch-boto
Browse files Browse the repository at this point in the history
Workaround for boto/boto#2617
  • Loading branch information
kalefranz committed Apr 27, 2016
2 parents cad4937 + 7915ea7 commit c9c52de
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions conda/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,21 @@ def send(self, request, stream=None, timeout=None, verify=None, cert=None,

try:
import boto

# silly patch for AWS because
# TODO: remove or change to warning once boto >2.39.0 is released
# https://github.com/boto/boto/issues/2617
from boto.pyami.config import Config, ConfigParser

def get(self, section, name, default=None, **kw):
try:
val = ConfigParser.get(self, section, name, **kw)
except:
val = default
return val

Config.get = get

except ImportError:
stderrlog.info('\nError: boto is required for S3 channels. '
'Please install it with `conda install boto`\n'
Expand Down

0 comments on commit c9c52de

Please sign in to comment.