summaryrefslogtreecommitdiffstats
path: root/wallace/module_gpgencrypt.py
diff options
context:
space:
mode:
Diffstat (limited to 'wallace/module_gpgencrypt.py')
-rw-r--r--wallace/module_gpgencrypt.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/wallace/module_gpgencrypt.py b/wallace/module_gpgencrypt.py
index e623fe1..e98bf0d 100644
--- a/wallace/module_gpgencrypt.py
+++ b/wallace/module_gpgencrypt.py
@@ -34,7 +34,7 @@ import email.mime.text
import email.encoders
import gnupg
-import modules
+from . import modules
import pykolab
@@ -102,7 +102,7 @@ def execute(*args, **kw):
if not os.path.isdir(os.path.join(mybasepath, stage)):
os.makedirs(os.path.join(mybasepath, stage))
- if kw.has_key('stage'):
+ if 'stage' in kw:
log.debug(_("Issuing callback after processing to stage %s") % (kw['stage']), level=8)
log.debug(_("Testing cb_action_%s()") % (kw['stage']), level=8)
if hasattr(modules, 'cb_action_%s' % (kw['stage'])):
@@ -286,7 +286,7 @@ def execute(*args, **kw):
os.unlink(filepath)
exec('modules.cb_action_%s(%r, %r)' % ('ACCEPT','gpgencrypt', new_filepath))
- except Exception, errmsg:
+ except Exception as errmsg:
log.error(_("An error occurred: %r") % (errmsg))
if conf.debuglevel > 8:
import traceback