Browse Source

[FIX] Unnecessary escaping

pull/286/head
Stefan Rijnhart 9 years ago
parent
commit
755bf2bf15
  1. 8
      fetchmail_attach_from_folder/model/fetchmail_server.py

8
fetchmail_attach_from_folder/model/fetchmail_server.py

@ -70,7 +70,7 @@ class fetchmail_server(models.Model):
connection = this.connect() connection = this.connect()
for folder in this.folder_ids.filtered('active'): for folder in this.folder_ids.filtered('active'):
this.with_context(safe_eval(folder.context or {}))\
this.with_context(safe_eval(folder.context or '{}'))\
.handle_folder(connection, folder) .handle_folder(connection, folder)
connection.close() connection.close()
@ -221,13 +221,13 @@ class fetchmail_server(models.Model):
connection.select() connection.select()
for folder in this.folder_ids.filtered('active'): for folder in this.folder_ids.filtered('active'):
try: try:
folder_context = safe_eval(folder.context or {})
folder_context = safe_eval(folder.context or '{}')
except Exception, e: except Exception, e:
raise exceptions.ValidationError( raise exceptions.ValidationError(
_('Invalid context \"%s\": %s') % (folder.context, e))
_('Invalid context "%s": %s') % (folder.context, e))
if not isinstance(folder_context, dict): if not isinstance(folder_context, dict):
raise exceptions.ValidationError( raise exceptions.ValidationError(
_('Context \"%s\" is not a dictionary.') %
_('Context "%s" is not a dictionary.') %
folder.context) folder.context)
if connection.select(folder.path)[0] != 'OK': if connection.select(folder.path)[0] != 'OK':
raise exceptions.ValidationError( raise exceptions.ValidationError(

Loading…
Cancel
Save