aboutsummaryrefslogtreecommitdiff
path: root/slave
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek.chauhan@gmail.com>2009-02-24 20:47:42 +0530
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2009-02-24 20:47:42 +0530
commit2cfa0c6a7ceb997de860958157c6bab90f5b6138 (patch)
tree528ad667cd3805e248876eab40a5b4c1e0367f01 /slave
parentLet people edit the current status of master-install manually (diff)
downloadautotua-master.tar.gz
autotua-master.tar.bz2
autotua-master.zip
Explicitely use tuples for except:HEADmaster
This behaviour will change in Python 3.0, so we should make sure it's explicit right now.
Diffstat (limited to 'slave')
-rw-r--r--slave/autotua/config.py2
-rw-r--r--slave/autotua/crypt/__init__.py2
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()