Replace patched Django 1.2.7 with Django 1.6

 - Legacy-Id: 6871

Author: OleLaursen

django/.gitignore

@@ -1,16 +1,7 @@
-VERSION = (1, 2, 7, 'final', 0)
+VERSION = (1, 6, 0, 'final', 0)
 
-def get_version():
-    version = '%s.%s' % (VERSION[0], VERSION[1])
-    if VERSION[2]:
-        version = '%s.%s' % (version, VERSION[2])
-    if VERSION[3:] == ('alpha', 0):
-        version = '%s pre-alpha' % version
-    else:
-        if VERSION[3] != 'final':
-            version = '%s %s %s' % (version, VERSION[3], VERSION[4])
-    from django.utils.version import get_svn_revision
-    svn_rev = get_svn_revision()
-    if svn_rev != u'SVN-unknown':
-        version = "%s %s" % (version, svn_rev)
-    return version
+def get_version(*args, **kwargs):
+    # Don't litter django/__init__.py with all the get_version stuff.
+    # Only import if it's actually called.
+    from django.utils.version import get_version
+    return get_version(*args, **kwargs)

django/__init__.py

@@ -7,7 +7,13 @@
 sessions at the moment).
 """
 
+import warnings
+
 from django.core import management
 
 if __name__ == "__main__":
-    management.call_command('cleanup')
+    warnings.warn(
+        "The `daily_cleanup` script has been deprecated "
+        "in favor of `django-admin.py clearsessions`.",
+        DeprecationWarning)
+    management.call_command('clearsessions')

django/bin/.gitignore

@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+# This works exactly like 2to3, except that it uses Django's fixers rather
+# than 2to3's built-in fixers.
+
+import sys
+from lib2to3.main import main
+
+sys.exit(main("django.utils.2to3_fixes"))
+

django/bin/compile-messages.py

@@ -8,8 +8,9 @@
 """
 
 from hotshot import stats
+import os
 import pstats
-import sys, os
+import sys
 
 def gather_stats(p):
     profiles = {}
@@ -23,7 +24,7 @@ def gather_stats(p):
             prof = stats.load(os.path.join(p, f))
         else:
             continue
-        print "Processing %s" % f
+        print("Processing %s" % f)
         if path in profiles:
             profiles[path].add(prof)
         else:

django/bin/daily_cleanup.py

@@ -11,7 +11,7 @@ def unique_messages():
     elif os.path.isdir('locale'):
         basedir = os.path.abspath('locale')
     else:
-        print "this script should be run from the django svn tree or your project or app tree"
+        print("This script should be run from the Django Git tree or your project or app tree.")
         sys.exit(1)
 
     for (dirpath, dirnames, filenames) in os.walk(basedir):
@@ -22,7 +22,8 @@ def unique_messages():
                 cmd = 'msguniq "%s.po"' % pf
                 stdout = os.popen(cmd)
                 msg = stdout.read()
-                open('%s.po' % pf, 'w').write(msg)
+                with open('%s.po' % pf, 'w') as fp:
+                    fp.write(msg)
 
 if __name__ == "__main__":
     unique_messages()