Merge branch '0.12-maintenance'

This commit is contained in:
Markus Unterwaditzer 2016-12-26 03:51:12 +01:00
commit f18fe15e6d
3 changed files with 24 additions and 3 deletions

View file

@ -126,7 +126,7 @@ class Config(dict):
d = types.ModuleType('config')
d.__file__ = filename
try:
with open(filename) as config_file:
with open(filename, mode='rb') as config_file:
exec(compile(config_file.read(), filename, 'exec'), d.__dict__)
except IOError as e:
if silent and e.errno in (errno.ENOENT, errno.EISDIR):