# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1337943271 -7200
# Node ID 14fe3554ad26ccf85f01f68ca07a869a1a20ef17
# Parent  a9a5e04f557f1af7cb27c09dc0b4d852e8fcac44
update django

diff -r a9a5e04f557f -r 14fe3554ad26 src/ldt/ldt/admin.py
--- a/src/ldt/ldt/admin.py	Thu May 24 17:55:54 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-##from django.contrib import admin
-#from ldt.management import test_cms
-#
-#"""
-#site admin pour cms page
-#"""
-#if test_cms():
-#    pass
-##    class AdminSite(admin.AdminSite):
-##        index_template = 'admin/page_index.html'
-##        login_template = 'admin/page_login.html'
-##        app_index_template = 'admin/page_app_index.html'    
-#        
-##    admin_site = AdminSite()
-#
-##    from cms.models import Page
-##    from cms.admin import pageadmin
-#
-##    class CmsPageAdmin(pageadmin.PageAdmin):
-##        change_list_template = "admin/cms_change_list.html"
-##       change_form_template = "admin/cms_change_form.html"
-#
-##    admin_site.register(Page, CmsPageAdmin)
-#
-##    from cms.plugins.snippet.models import Snippet
-##    from cms.plugins.snippet.admin import SnippetAdmin
-#
-##    class CmsSnippetAdmin(SnippetAdmin):
-##        change_form_template = "admin/page_change_form.html"
-##        change_list_template = "admin/page_change_list.html"
-##    admin_site.register(Snippet, CmsSnippetAdmin)
diff -r a9a5e04f557f -r 14fe3554ad26 virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Thu May 24 17:55:54 2012 +0200
+++ b/virtualenv/res/lib/lib_create_env.py	Fri May 25 12:54:31 2012 +0200
@@ -15,7 +15,7 @@
 URLS = {
     #'': {'setup': '', 'url':'', 'local':''},
     'DISTRIBUTE': {'setup': 'distribute', 'url':'http://pypi.python.org/packages/source/d/distribute/distribute-0.6.14.tar.gz', 'local':"distribute-0.6.14.tar.gz"},
-    'DJANGO': {'setup': 'django', 'url': 'http://www.djangoproject.com/download/1.3.1/tarball/', 'local':"Django-1.3.1.tar.gz"},
+    'DJANGO': {'setup': 'django', 'url': 'http://www.djangoproject.com/download/1.4/tarball/', 'local':"Django-1.4.tar.gz"},
     'DJANGO-EXTENSIONS': { 'setup': 'django-extensions', 'url':'https://github.com/django-extensions/django-extensions/tarball/0.6', 'local':"django-extensions-0.6.tar.gz"},
     'DJANGO-REGISTRATION': { 'setup': 'django-registration', 'url':'http://bitbucket.org/ubernostrum/django-registration/get/tip.tar.gz', 'local':"django-registration.tar.gz"},
     'DJANGO-TAGGING': { 'setup': 'django-tagging', 'url':'http://django-tagging.googlecode.com/files/django-tagging-0.3.1.tar.gz', 'local':"django-tagging-0.3.1.tar.gz"},
diff -r a9a5e04f557f -r 14fe3554ad26 virtualenv/res/src/Django-1.3.1.tar.gz
Binary file virtualenv/res/src/Django-1.3.1.tar.gz has changed
diff -r a9a5e04f557f -r 14fe3554ad26 virtualenv/res/src/Django-1.4.tar.gz
Binary file virtualenv/res/src/Django-1.4.tar.gz has changed
diff -r a9a5e04f557f -r 14fe3554ad26 web/ldtplatform/manage.py
--- a/web/ldtplatform/manage.py	Thu May 24 17:55:54 2012 +0200
+++ b/web/ldtplatform/manage.py	Fri May 25 12:54:31 2012 +0200
@@ -1,11 +1,9 @@
 #!/usr/bin/env python
-from django.core.management import execute_manager
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
+import os, sys
 
 if __name__ == "__main__":
-    execute_manager(settings)
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ldtplatform.settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)
\ No newline at end of file