# HG changeset patch
# User Filip de Waard <fmw@vix.io>
# Date 1271985073 -7200
# Node ID 12bad6eff4c49cbfc8f0721df5ddb900679b49e1
# Parent  99c5e32ea2ed263ef8d91fd9ff49393ba14cbd3f
improved model.User docstring

diff -r 99c5e32ea2ed263ef8d91fd9ff49393ba14cbd3f -r 12bad6eff4c49cbfc8f0721df5ddb900679b49e1 vix/model/__init__.py
--- a/vix/model/__init__.py	Fri Apr 23 03:04:38 2010 +0200
+++ b/vix/model/__init__.py	Fri Apr 23 03:11:13 2010 +0200
@@ -50,12 +50,16 @@
 
     :param username: unique identifier for the user.
     :type username: unicode
-    :param password: Bcrypt encoded password
+    :param password: Bcrypt digest of the password
     :type password: unicode
     :param mail: e-mail address.
     :type mail: unicode
     :param real_name: the real name of the user.
     :type real_name: unicode
+    :param created: creation date.
+    :type created: datetime
+    :param updated: date of last update.
+    :type updated: datetime
     
     """
 
@@ -203,13 +207,13 @@
     token they can identify themselves for the duration of the session.
     
     :param id: authentication token (MD5 hash of random value).
-    :type id: TextField
+    :type id: unicode
     :param username: user asssociated with the session.
-    :type username: TextField
+    :type username: unicode
     :param created: date and time when the Session was created.
-    :type created: DateTimeField
+    :type created: datetime
     :param expires: date and time the Session will expire.
-    :type expires: DateTimeField
+    :type expires: datetime
 
     """
 
diff -r 99c5e32ea2ed263ef8d91fd9ff49393ba14cbd3f -r 12bad6eff4c49cbfc8f0721df5ddb900679b49e1 vix/tests/test_models.py
--- a/vix/tests/test_models.py	Fri Apr 23 03:04:38 2010 +0200
+++ b/vix/tests/test_models.py	Fri Apr 23 03:11:13 2010 +0200
@@ -241,7 +241,6 @@
         self.assertEquals(user.get_permissions('vix_tests', 'news'), None)
         
     #TODO: use mocks in other tests here
-    #TODO: clean up docstrings of model.User
 
     def test_Session(self):
         """Test session model object."""