E574 [soc2010/test-refactor] Merged up to trunk. · alex-python/django@9315b44 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9315b44

Browse files
PaulMcMillanPaulMcMillan
committed
[soc2010/test-refactor] Merged up to trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13428 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1 parent ae2c227 commit 9315b44

File tree

14 files changed

+57
-38
lines changed

14 files changed

+57
-38
lines changed

‎django/contrib/admin/media/css/base.css‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,14 @@ ul.messagelist li {
445445
background: #ffc url(../img/admin/icon_success.gif) 5px .3em no-repeat;
446446
}
447447

448+
ul.messagelist li.warning{
449+
background-image: url(../img/admin/icon_alert.gif);
450+
}
451+
452+
ul.messagelist li.error{
453+
background-image: url(../img/admin/icon_error.gif);
454+
}
455+
448456
.errornote {
449457
font-size: 12px !important;
450458
display: block;

‎django/contrib/admin/templates/admin/base.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@
5656
{% endif %}
5757

5858
{% if messages %}
59-
<ul class="messagelist">{% for message in messages %}<li>{{ message }}</li>{% endfor %}</ul>
59+
<ul class="messagelist">{% for message in messages %}
60+
<li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
61+
{% endfor %}</ul>
6062
{% endif %}
6163

6264
<!-- Content -->

‎django/contrib/gis/gdal/libgdal.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
lib_names = None
1515
elif os.name == 'nt':
1616
# Windows NT shared library
17-
lib_names = ['gdal16', 'gdal15']
17+
lib_names = ['gdal17', 'gdal16', 'gdal15']
1818
elif os.name == 'posix':
1919
# *NIX library names.
20-
lib_names = ['gdal', 'GDAL', 'gdal1.6.0', 'gdal1.5.0', 'gdal1.4.0']
20+
lib_names = ['gdal', 'GDAL', 'gdal1.7.0', 'gdal1.6.0', 'gdal1.5.0', 'gdal1.4.0']
2121
else:
2222
raise OGRException('Unsupported OS "%s"' % os.name)
2323

‎django/middleware/csrf.py‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,27 @@ def accept():
126126
return accept()
127127

128128
if request.is_secure():
129-
# Strict referer checking for HTTPS
129+
# Suppose user visits http://example.com/
130+
# An active network attacker,(man-in-the-middle, MITM) sends a
131+
# POST form which targets https://example.com/detonate-bomb/ and
132+
# submits it via javascript.
133+
#
134+
# The attacker will need to provide a CSRF cookie and token, but
135+
# that is no problem for a MITM and the session independent
136+
# nonce we are using. So the MITM can circumvent the CSRF
137+
# protection. This is true for any HTTP connection, but anyone
138+
# using HTTPS expects better! For this reason, for
139+
C0D6 # https://example.com/ we need additional protection that treats
140+
# http://example.com/ as completely untrusted. Under HTTPS,
141+
# Barth et al. found that the Referer header is missing for
142+
# same-domain requests in only about 0.2% of cases or less, so
143+
# we can use strict Referer checking.
130144
referer = request.META.get('HTTP_REFERER')
131145
if referer is None:
132146
return reject("Referer checking failed - no Referer.")
133147

134148
# The following check ensures that the referer is HTTPS,
135-
# the domains match and the ports match. This might be too strict.
149+
# the domains match and the ports match - the same origin policy.
136150
good_referer = 'https://%s/' % request.get_host()
137151
if not referer.startswith(good_referer):
138152
return reject("Referer checking failed - %s does not match %s." %

‎docs/faq/install.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Do I lose anything by using Python 2.4 versus newer Python versions, such as Pyt
4646
-----------------------------------------------------------------------------------------------
4747

4848
Not in the core framework. Currently, Django itself officially supports any
49-
version of Python from 2.4 through 2.6, inclusive. However, newer versions of
49+
version of Python from 2.4 through 2.7, inclusive. However, newer versions of
5050
Python are often faster, have more features, and are better supported.
5151
Third-party applications for use with Django are, of course, free to set their
5252
own version requirements.
@@ -56,7 +56,7 @@ versions as part of a migration which will end with Django running on Python 3
5656
(see below for details).
5757

5858
All else being equal, we recommend that you use the latest 2.x release
59-
(currently Python 2.6). This will let you take advantage of the numerous
59+
(currently Python 2.7). This will let you take advantage of the numerous
6060
improvements and optimizations to the Python language since version 2.4, and
6161
will help ease the process of dropping support for older Python versions on
6262
the road to Python 3.

‎docs/intro/install.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Install Python
1212
--------------
1313

1414
Being a Python Web framework, Django requires Python. It works with any Python
15-
version from 2.4 to 2.6 (due to backwards
15+
version from 2.4 to 2.7 (due to backwards
1616
incompatibilities in Python 3.0, Django does not currently work with
1717
Python 3.0; see :ref:`the Django FAQ <faq-install>` for more
1818
information on supported Python versions and the 3.0 transition), but we recommend installing Python 2.5 or later. If you do so, you won't need to set up a database just yet: Python 2.5 or later includes a lightweight database called SQLite_.

‎docs/ref/contrib/gis/create_template_postgis-1.4.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
POSTGIS_SQL_PATH=`pg_config --sharedir`/contrib/postgis-1.4
2+
POSTGIS_SQL_PATH=`pg_config --sharedir`/contrib
33
createdb -E UTF8 template_postgis # Create the template spatial database.
44
createlang -d template_postgis plpgsql # Adding PLPGSQL language support.
55
psql -d postgres -c "UPDATE pg_database SET datistemplate='true' WHERE datname='template_postgis';"

‎docs/ref/contrib/gis/install.txt‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -383,9 +383,9 @@ Typically, SQLite packages are not compiled to include the `R*Tree module`__ --
383383
thus it must be compiled from source. First download the latest amalgamation
384384
source archive from the `SQLite download page`__, and extract::
385385

386-
$ wget http://www.sqlite.org/sqlite-amalgamation-3.6.22.tar.gz
387-
$ tar xzf sqlite-amalgamation-3.6.22.tar.gz
388-
$ cd sqlite-3.6.22
386+
$ wget http://sqlite.org/sqlite-amalgamation-3.6.23.1.tar.gz
387+
$ tar xzf sqlite-amalgamation-3.6.23.1.tar.gz
388+
$ cd sqlite-3.6.23.1
389389

390390
Next, run the ``configure`` script -- however the ``CFLAGS`` environment variable
391391
needs to be customized so that SQLite knows to build the R*Tree module::
@@ -449,12 +449,9 @@ Finally, do the same for the SpatiaLite tools::
449449
.. note::
450450

451451
For Mac OS X users building from source, the SpatiaLite library *and* tools
452-
need to be linked into the existing ``iconv`` library. While this happens
453-
automatically on Linux, the ``configure`` scripts need to know about the
454-
specific location on Mac OS X (via modification of the ``CFLAGS`` and
455-
``LDFLAGS`` environment variables prior to configuration)::
452+
need to have their ``target`` configured::
456453

457-
$ CFLAGS=-I/usr/include LDFLAGS="-L/usr/lib -liconv" ./configure
454+
$ ./configure --target=macosx
458455

459456
__ http://www.gaia-gis.it/spatialite/sources.html
460457

@@ -804,8 +801,8 @@ your ``.profile`` to be able to run the package programs from the command-line::
804801
export PATH=/Library/Frameworks/GDAL.framework/Programs:$PATH
805802
export PATH=/usr/local/pgsql/bin:$PATH
806803

807-
__ http://www.kyngchaos.com/wiki/software:frameworks
808-
__ http://www.kyngchaos.com/wiki/software:postgres
804+
__ http://www.kyngchaos.com/software/frameworks
805+
__ http://www.kyngchaos.com/software/postgres
809806

810807
.. note::
811808

‎docs/ref/validators.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Validators
55
==========
66

77
.. versionadded:: 1.2
8+
.. module:: django.core.validators
9+
:synopsis: Validation utilities and base classes
810

911
Writing validators
1012
==================

‎docs/topics/auth.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,6 @@ Anonymous users
435435
instead of ``False``.
436436
* :meth:`~django.contrib.auth.models.User.is_authenticated()` returns
437437
``False`` instead of ``True``.
438-
* :meth:`~django.contrib.auth.models.User.has_perm()` always returns
439-
``False``.
440438
* :meth:`~django.contrib.auth.models.User.set_password()`,
441439
:meth:`~django.contrib.auth.models.User.check_password()`,
442440
:meth:`~django.contrib.auth.models.User.save()`,

0 commit comments

Comments
 (0)
0