diff options
Diffstat (limited to 'slave/autotua')
| -rw-r--r-- | slave/autotua/config.py | 2 | ||||
| -rw-r--r-- | slave/autotua/crypt/__init__.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/slave/autotua/config.py b/slave/autotua/config.py index 704a310..a168e52 100644 --- a/slave/autotua/config.py +++ b/slave/autotua/config.py @@ -47,7 +47,7 @@ try: exec('%s = %s' % (option, cfg.getboolean('global', option.lower()))) elif isinstance(value, int): exec('%s = %s' % (option, cfg.getint('global', option.lower()))) -except IOError, OSError: +except (IOError, OSError): print "!!! Unable to read %s/slave.cfg, ignoring..." % const.CONFIG_PATH if not AUTOTUA_MASTER: diff --git a/slave/autotua/crypt/__init__.py b/slave/autotua/crypt/__init__.py index 0ee5073..b4600ad 100644 --- a/slave/autotua/crypt/__init__.py +++ b/slave/autotua/crypt/__init__.py @@ -24,7 +24,7 @@ class Crypto(object): def _validate_gpghome(self): try: gpghome = open(self.gpghome+'/secring.gpg') - except IOError, OSError: + except (IOError, OSError): raise Exception('"%s": Unable to use GPG homedir' % self.gpghome) finally: gpghome.close() |