Changeset 1768

Timestamp:

09/16/08 09:00:41 (18 months ago)

Author:

JensDiemer

Message:

• move ModelForm?2 into forms_utils and use it in install section, too.
• set version string to RC2

Location:

trunk/pylucid_project/PyLucid

Files:

• install/install.py (modified) (2 diffs)
• plugins_internal/auth/auth.py (modified) (2 diffs)
• tools/forms_utils.py (modified) (1 diff)
• __init__.py (modified) (2 diffs)

trunk/pylucid_project/PyLucid/install/install.py

@@ -14 +14 @@
 
 from PyLucid.install.BaseInstall import BaseInstall
+from PyLucid.tools.forms_utils import ModelForm2
 
 import sys, os
@@ -204 +205 @@
 
 
-class CreateUserForm(forms.ModelForm):
+class CreateUserForm(ModelForm2):
     """
     form for input the username, used in auth.login()

trunk/pylucid_project/PyLucid/plugins_internal/auth/auth.py

@@ -61 +61 @@
     warnings.warn("Debugmode is on", UserWarning)
 
-
 from django.conf import settings
+
 from PyLucid.tools import crypt
+from PyLucid.models import JS_LoginData, Page
+from PyLucid.tools.forms_utils import ModelForm2
 from PyLucid.system.BasePlugin import PyLucidBasePlugin
 from PyLucid.system.context_processors import add_dynamic_context
-from PyLucid.models import JS_LoginData, Page
+
 
 
@@ -160 +162 @@
 #______________________________________________________________________________
 # FORMS
-
-class ModelForm2(forms.ModelForm):
-    def validate_unique(self):
-        """
-        Don't validate unique fields.
-        We used a ModelForm only for generating the forms and not for
-        create/update any database data. So a field unique Test would like
-        generate Errors like:
-            User with this Username already exists.
-        """
-        pass
-
 
 class UsernameForm(ModelForm2):

trunk/pylucid_project/PyLucid/tools/forms_utils.py

@@ -153 +153 @@
 
 
+class ModelForm2(forms.ModelForm):
+    """
+    A model form witch don't validate unique fields.
+    
+    This ModelForm is only for generating the forms and not for create/update
+    any database data. So a field unique Test would like generate Errors like:
+        User with this Username already exists.
+        
+    see also:
+    http://www.jensdiemer.de/_command/118/blog/detail/30/ (de)
+    http://www.python-forum.de/topic-16000.html (de)
+    """
+    def validate_unique(self):
+        pass
+
+
+
 
 if __name__ == "__main__":

trunk/pylucid_project/PyLucid/__init__.py

@@ -19 +19 @@
 try:
     from django.utils.version import get_svn_revision
-
+    
     svn_revision = get_svn_revision("PyLucid")
     if svn_revision == u'SVN-unknown':
@@ -36 +36 @@
 # - No spaces: "0.8.0 RC2" -> "0.8.0RC2"
 # http://peak.telecommunity.com/DevCenter/setuptools#specifying-your-project-s-version
-PYLUCID_VERSION = (0, 8, 5, svn_revision)
-PYLUCID_VERSION_STRING = "0.8.5" + svn_revision
+PYLUCID_VERSION = (0, 8, 5, "RC2", svn_revision)
+PYLUCID_VERSION_STRING = "0.8.5RC2" + svn_revision