Changeset 404

Timestamp:

07/16/10 15:21:40 (13 years ago)

Author:

bas

Message:

email2trac.py.in:

• used the SaraDict? class so we can use class attributes as dict values, eg:

b[k] = v is the same as b.k = v

• some more logging code added

File:

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

trunk/email2trac.py.in

@@ -75 +75 @@
 import logging
 import logging.handlers
+import UserDict
 
 
@@ -112 +113 @@
                 return self.ZERO
 
+class SaraDict(UserDict.UserDict):
+        def __init__(self, dictin = None):
+                UserDict.UserDict.__init__(self)
+                self.name = None 
+                
+                if dictin:
+                        if dictin.has_key('name'):
+                                self.name = dictin['name']
+                                del dictin['name']
+                        self.data = dictin 
+                        
+        def get_value(self, key):
+                if self.has_key(key):
+                        return self[key]
+                else:
+                        return None 
+                                
+        def __repr__(self):
+                return repr(self.data) 
+
+        def __str__(self):
+                return str(self.data) 
+                        
+        def __getattr__(self, name):
+                """
+                override the class attribute get method. Return the value
+                from the Userdict
+                """
+                if self.data.has_key(name):
+                        return self.data[name] 
+                else:
+                        return None
+                        
+        def __setattr__(self, name, value):
+                """
+                override the class attribute set method only when the UserDict
+                has set its class attribute
+                """
+                if self.__dict__.has_key('data'):
+                        self.data[name] = value
+                else:
+                        self.__dict__[name] = value
+
+        def __iter__(self):
+                return iter(self.data.keys())
 
 class TicketEmailParser(object):
@@ -140 +186 @@
                 self.VERSION = version
 
+                self.get_config = self.env.config.get
+
                 self.setup_log()
                 self.setup_parameters()
@@ -146 +194 @@
                 self.VERBOSE = parameters['verbose']
 
-                self.get_config = self.env.config.get
-
-
-        def setup_log():
+
+
+        def setup_log(self):
                 """
                 Setup loging
@@ -157 +204 @@
 
                 """
-                if not parameters.log_type:
-                        paramters.log_type = 'syslog'
-
-                if parameters.log_type = 'file'
+                if not self.parameters.log_type:
+                        self.parameters.log_type = 'syslog'
+
+                if self.parameters.log_type == 'file':
                         if not os.path.isabs(parameters.log_file):
-                                parameters.log_file = os.path.jpin(self.env.path. 'log')
+                                self.parameters.log_file = os.path.join(self.env.path, 'log')
                         hdlr = logging.FileHandler()
 
-                elif parameters.log_type in ('winlog', 'eventlog', 'nteventlog'):
+                elif self.parameters.log_type in ('winlog', 'eventlog', 'nteventlog'):
                         # Requires win32 extensions
                         hdlr = logging.handlers.NTEventLogHandler(logid, logtype='Application')
 
-                elif parameters.log_type in ('syslog', 'unix'):
+                elif self.parameters.log_type in ('syslog', 'unix'):
                         hdlr = logging.handlers.SysLogHandler('/dev/log')
 
-                elif parameters.log_type in ('stderr'):
+                elif self.parameters.log_type in ('stderr'):
                         hdlr = logging.StreamHandler(sys.stderr)
 
@@ -178 +225 @@
                         hdlr = logging.handlers.BufferingHandler(0)
 
-                if parameters.format:
-                        parameters.format = parameters.format.replace('$(', '%(')
-                else:
-                        parameters.format = 'Email2trac: %(message)s'
+                if self.parameters.log_format:
+                        self.parameters['log_format'] = self.parameters.log_format.replace('$(', '%(')
+                else:
+                        self.parameters.log_format = 'Email2trac: %(message)s'
 
 
@@ -189 +236 @@
                 
 
-        def setup_parameters():
+        def setup_parameters(self):
                 if self.parameters.has_key('umask'):
                         os.umask(int(self.parameters['umask'], 8))
@@ -2137 +2184 @@
                         sys.exit(1)
 
-                project =  dict()
+                project =  SaraDict()
                 for option, value in  config.options(name):
                         project[option] = value 
@@ -2144 +2191 @@
                 # use some trac internals to get the defaults
                 #
-                project = config.parser.defaults()
+                tmp = config.parser.defaults()
+                project =  SaraDict()
+
+                for option,value in tmp.items():
+                        project[option] = value 
 
         return project