Changeset 10:d5329a2a05b7 in mailjam for postman/models.py

Timestamp:

May 20, 2012, 9:39:51 AM (12 years ago)

Author:

Borja Lopez <borja@…>

Branch:

default

Phase:

public

Message:

Fully added support for the configuration file. Now all the code uses
postman.conf to read the configuration parameters from it

Added a tests/postman.conf configuration file with specific configurtion
to use while testing (mostly tmp paths)

Updated the run_tests script to delete the temporary directory where
data is saved while running tests

Updated the tests modules/files so they use the tests config file

File:

• postman/models.py (modified) (4 diffs)

postman/models.py

@@ -33 +33 @@
     """
 
-    def __init__(self, name, address, members={}, config={}):
+    def __init__(self, name, address, members={}, configfile=None):
+        self.configfile = configfile
+        self.storage_config = config.get_config_parameters('storage',
+                                                           configfile)
+        self.archive_config = config.get_config_parameters('archive',
+                                                           configfile)
+        self.mailing_config = config.get_config_parameters('mailing_lists',
+                                                           configfile)
         self.name = name
         self.address = address
         self.members = members
-        self.config = config
-        self._validate_config() # validate the config parameters
         
     def __repr__(self):
@@ -45 +50 @@
     def __str__(self):
         return self.address
-
-    def _validate_config(self):
-        if not 'storage' in self.config.keys():
-            self.config['storage'] = os.path.join(config.storage_path,
-                                                  'mailings/')
-        if not 'archive' in self.config.keys():
-            self.config['archive'] = config.archive_path
-        if not 'private' in self.config.keys():
-            self.config['private'] = config.private_mailing
         
     def _validate_member_object(self, member=None):
@@ -71 +67 @@
     @property
     def storage(self):
-        return Storage(os.path.join(self.config['storage'], self.address))
+        return Storage(os.path.join(self.storage_config['path'], self.address))
 
     @property
     def archive(self):
-        return Storage(os.path.join(self.config['archive'], self.address))
+        return Storage(os.path.join(self.archive_config['path'], self.address))
     
     def members_addresses(self):
@@ -109 +105 @@
         # automagically generates the dict from the instance attributes
         return {'name': self.name, 'address': self.address,
-                'members': self.members, 'config': self.config}
+                'members': self.members, 'configfile': self.configfile}
 
     def load(self):