--- a/VirtualMailManager/ext/postconf.py Sun Nov 11 16:53:52 2012 +0000
+++ b/VirtualMailManager/ext/postconf.py Tue Nov 20 13:40:32 2012 +0000
@@ -81,8 +81,8 @@
"""Check that the `parameter` looks like a configuration parameter.
If not, a VMMError will be raised."""
if not self.__class__._parameter_re.match(parameter):
- raise VMMError(_(u"The value '%s' does not look like a valid "
- u"Postfix configuration parameter name.") %
+ raise VMMError(_("The value '%s' does not look like a valid "
+ "Postfix configuration parameter name.") %
parameter, VMM_ERROR)
def _expand_vars(self):
@@ -99,7 +99,7 @@
def _expand_multi_vars(self, old_new):
"""Replace all $vars in self._val with their values."""
- for old, new in old_new.iteritems():
+ for old, new in old_new.items():
self._val = self._val.replace('$' + old, new)
def _read(self, parameter):