magic-removal: Merged to [1853]

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1854 bcc190cf-cafb-0310-a4f2-bffc1f526a37

AUTHORS

@@ -81,6 +81,7 @@ answer newbie questions, and generally made Django that much better:
     phaedo <http://phaedo.cx/>
     Luke Plant <http://lukeplant.me.uk/>
     plisk
+    Brian Ray <http://brianray.chipy.org/>
     Oliver Rutherfurd <http://rutherfurd.net/>
     David Schein
     sopel

django/conf/locale/ru/LC_MESSAGES/django.po

@@ -408,7 +408,7 @@ msgstr "
 #: contrib/admin/views/main.py:423 contrib/admin/views/main.py:501
 #, python-format
 msgid "You may add another %s below."
-msgstr "Вы можете добавить % внизу."
+msgstr "Вы можете добавить %s внизу."
 
 #: contrib/admin/views/main.py:441
 #, python-format

django/contrib/auth/handlers/modpython.py

@@ -13,7 +13,7 @@ def authenhandler(req, **kwargs):
     from django.contrib.auth.models import User
 
     # check for PythonOptions
-    _str_to_bool = lambda s: s.lower() in '1', 'true', 'on', 'yes'
+    _str_to_bool = lambda s: s.lower() in ('1', 'true', 'on', 'yes')
 
     options = req.get_options()
     permission_name = options.get('DjangoPermissionName', None)

django/contrib/sessions/models.py

@@ -17,7 +17,7 @@ class SessionManager(models.Manager):
         # The random module is seeded when this Apache child is created.
         # Use person_id and SECRET_KEY as added salt.
         while 1:
-            session_key = md5.new(str(random.randint(0, sys.maxint - 1)) + SECRET_KEY).hexdigest()
+            session_key = md5.new(str(random.randint(0, sys.maxint - 1)) + str(random.randint(0, sys.maxint - 1)) + SECRET_KEY).hexdigest()
             try:
                 self.get_object(session_key__exact=session_key)
             except self.klass.DoesNotExist:

docs/i18n.txt

@@ -288,6 +288,10 @@ marked for translation. It creates (or updates) a message file in the directory
 ``conf/locale``. In the ``de`` example, the file will be
 ``conf/locale/de/LC_MESSAGES/django.po``.
 
+If run over your project source tree or your appliation source tree, it will
+do the same, but the location of the locale directory is ``locale/LANG/LC_MESSAGES``
+(note the missing ``conf`` prefix).
+
 .. admonition:: No gettext?
 
     If you don't have the ``gettext`` utilities installed, ``make-messages.py``