Changeset 23:adc5b22efd7e in mailjam for mailjam/models.py

Timestamp:

May 22, 2012, 7:31:12 PM (12 years ago)

Author:

Borja Lopez <borja@…>

Branch:

default

Phase:

public

Message:

Added the first version of the CLI client, which implements a shell-like
interface where users can interact with a mailjam server.

This first versions adds no "big" features, but contains the basis to build
a complete shell interface (including history saving support, completion,
help for commands, etc)

Added a custom configuration file (conf/mailjam-cli.conf) for the CLI
client.

Added a new mailjam.config class (CLIClientConfig) that is used by the CLI
client to load its configuration file.

Updated the package information (setup.py, MANIFEST) to include the CLI
client data.

Modified the behaviour of the XMLRPC methods registered in the *XMLRPC classes
within the daemon module. Now instead of raising exceptions directly, they
catch such exceptions, returning only a string representation of the error
to the XMLRPC client. If there is no error, a nice "ok" message is returned.

File:

• mailjam/models.py (modified) (3 diffs)

mailjam/models.py

@@ -33 +33 @@
     def _validate_address(self, address):
         if not validate_email_address(address):
-            raise ValueError(address, ' is not a valid email address')
+            raise ValueError(str(address) + ' is not a valid email address')
         return address
 
@@ -63 +63 @@
     def _validate_member_object(self, member=None):
         if not isinstance(member, Member):
-            raise TypeError(member, ' is not a valid Member instance')
+            raise TypeError(str(member) + ' is not a valid Member instance')
         return member
 
@@ -72 +72 @@
     def _validate_member_by_address(self, address=None):
         if not validate_email_address(address):
-            raise ValueError(address, ' is not a valid email address')
+            raise ValueError(str(address) + ' is not a valid email address')
         return address in self.members_addresses()