From b23b39342bbfc784bc1f160e2c6fdc2f849486ec Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Sun, 8 Jan 2006 05:56:45 +0000
Subject: [PATCH] magic-removal: Merged to [1853]

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 AUTHORS                                     |   1 +
 django/conf/locale/ru/LC_MESSAGES/django.mo | Bin 21077 -> 21078 bytes
 django/conf/locale/ru/LC_MESSAGES/django.po |   2 +-
 django/contrib/auth/handlers/modpython.py   |   2 +-
 django/contrib/sessions/models.py           |   2 +-
 docs/i18n.txt                               |   4 ++++
 6 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 73fe3078c9..10b41c2e7c 100644
--- a/AUTHORS
+++ b/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
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo
index a6d883785a4b536823442cfc8742381a7b9dbe93..32f732d60103f32af8c1812323238dbbea831085 100644
GIT binary patch
delta 535
zcmXZYKPW|E7{~GFb#eW<oO6o&NtD6OU?NiYmW+mT&$ZYntFnkJI<qX2MH!U4>6W^K
zC?=C^x|VCTD3dY~-(TmQKJW9K_xzsseVaA+T65Q>ARRNa-PmjjPjDG;aT0%U2q!9L
zMO?ss+`v3;qr*MazJ1K$G4|pq_TUBTzbg#z4nusZSZduYS~U9b-TQ?d)GjeAU>=8Y
z02MTY8dSm%m%LS+r`|;6o_R05b?l^ngUWwM(k$?ihHmtN5w^Uar~~|=4p^vWgGW&}
z8~0A*AoUz7cm*{m@vfnA)-l2@RNg_#B4lyoJ;#8$j(XC2R8SN3!yD>pKYafi+o^w1
kgWFcKye`!K5!C)7>P2S#_cH3jE^aJFN!jf*4&&$CKT9}4MF0Q*

delta 533
zcmXZYAxHyJ9LMqhW4fVJ?~Wl(M1x@(ObP>WBG?S>PJ>OsDj0`FxV|D{5e$MX$$~Ht
z2bxTRNz^c_MKB2_Mg0D_mp<?Rzjwd?d+)X7URv&|7Niqq)~K6R@EBL|2B+}{$8ah(
zo53oM;0_jWA00MO`wlRNM_9xY9K>_ff0r0w7ejoAEwup_JsQLK?)}1kYD>(9Adh7%
zp@Qa6gO)JF6>ox7>RnXssrSO$#ytINRQ_F(W`XxKbfYJXu;=|m9pDdjz~V+WcpP=J
zN$)I<QZJx_*HD9E?-nX&8zbC9<sGIhLKaQ$83xpC)RW$#f}T-7yrG`<!}q_jkNOui
i*llKc1=RjBYJUawBJ=)x4Rv9+-dT*2<xaEynEMBbBtVh?

diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po
index bef2607074..2443f3e095 100644
--- a/django/conf/locale/ru/LC_MESSAGES/django.po
+++ b/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
diff --git a/django/contrib/auth/handlers/modpython.py b/django/contrib/auth/handlers/modpython.py
index 2694a7cfdc..ca8e047a20 100644
--- a/django/contrib/auth/handlers/modpython.py
+++ b/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)
diff --git a/django/contrib/sessions/models.py b/django/contrib/sessions/models.py
index cac0a4d9db..8600ad7a9c 100644
--- a/django/contrib/sessions/models.py
+++ b/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:
diff --git a/docs/i18n.txt b/docs/i18n.txt
index f1b1d950ca..6e83158b97 100644
--- a/docs/i18n.txt
+++ b/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``