# HG changeset patch
# User gibus
# Date 1287491419 -7200
# Node ID addba77f2f901c689d9abed3d4ce2c5d25fef5f1
# Parent  c7eac1e0b46ab158c42924c9887990b8e16abace
email_re has moved from django.form.fields to django.core.validators (Django 1.2 alpha 1)

diff -r c7eac1e0b46a -r addba77f2f90 src/cm/client.py
--- a/src/cm/client.py	Mon Oct 11 15:39:29 2010 +0200
+++ b/src/cm/client.py	Tue Oct 19 14:30:19 2010 +0200
@@ -1,4 +1,8 @@
-from django.forms.fields import email_re
+try:
+    from django.core.validators import email_re
+except ImportError:
+    # support for django pre 1.2 alpha 1
+    from django.forms.fields import email_re
 from django.http import HttpResponse, HttpResponseRedirect
 from django.core.exceptions import ObjectDoesNotExist
 from django.forms import ValidationError
diff -r c7eac1e0b46a -r addba77f2f90 src/cm/migrations/0004_uniqueness_to_keys_in_textversion.py
--- a/src/cm/migrations/0004_uniqueness_to_keys_in_textversion.py	Mon Oct 11 15:39:29 2010 +0200
+++ b/src/cm/migrations/0004_uniqueness_to_keys_in_textversion.py	Tue Oct 19 14:30:19 2010 +0200
@@ -13,9 +13,9 @@
 
         db.create_index('cm_textversion', ['adminkey', ], unique=True)
 
-        db.create_unique('cm_textversion', ['key', ])
+        #db.create_unique('cm_textversion', ['key', ])
 
-        db.create_unique('cm_textversion', ['adminkey', ])
+        #db.create_unique('cm_textversion', ['adminkey', ])
         
         
     def backwards(self, orm):