Changeset 451

Timestamp:

07/23/10 10:58:47 (14 years ago)

Author:

bas

Message:

Last variable SUBJECT_FIELD_SEPARATOR ported to UserDict?

File:

• trunk/email2trac.py.in (modified) (2 diffs)

trunk/email2trac.py.in

@@ -239 +239 @@
                         self.parameters.email_triggers_workflow = int(self.parameters.email_triggers_workflow)
 
-                if self.parameters.has_key('subject_field_separator'):
-                        self.SUBJECT_FIELD_SEPARATOR = self.parameters['subject_field_separator'].strip()
-                else:
-                        self.SUBJECT_FIELD_SEPARATOR = '&'
+                if not self.parameters.subject_field_separator:
+                        self.parameters.subject_field_separator = '&'
+                else:
+                        self.parameters.subject_field_separator = self.parameters.subject_field_separator.strip()
 
                 self.trac_smtp_from = self.get_config('notification', 'smtp_from')
@@ -576 +576 @@
                 self.logger.debug("function str_to_dict")
 
-                fields = string.split(s, self.SUBJECT_FIELD_SEPARATOR)
+                fields = string.split(s, self.parameters.subject_field_separator)
 
                 result = dict()