Skip to content


Subversion checkout URL

You can clone with
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: akaariai/django
base: de79d23ce0
head fork: akaariai/django
compare: 329bb9296f
Commits on May 12, 2012
@marcneuwirth marcneuwirth Removed 'return false' in favor of preventDefault.
Moved preventDefault to the top
@claudep claudep Added missing relative imports in test files. 33ffd28
@claudep claudep Replaced im_func and im_self by __func__ and __self__.
The new names are Python 3 compatible.
Commits on May 14, 2012
@aaugustin aaugustin Fixed #10890: added prev/next_week in the context
of per-week date-based generic views. Thanks ee_lars for the report.
Commits on May 15, 2012
@claudep claudep Fixed #18019 -- Use threaded runserver only when database supports it. bb4452f
@aaugustin aaugustin Updated installation instructions.
Django 1.5 requires Python 2.6 or 2.7, and install over a
previous installation doesn't work.
Commits on May 16, 2012
@jezdez jezdez Fixed #17896 -- Added file_hash method to CachedStaticFilesStorage to…
… be able to customize the way the hashed name of a file is created. Thanks to mkai for the initial patch.
@techtonik techtonik Fix issue #18267 - document `settings.configured` property. 59d2b8a
@adrianholovaty adrianholovaty Merge pull request #43 from techtonik/patch-1
Fixed #18267 -- document `settings.configured` property.
@BooBSD BooBSD Fixing my e-mail duplicates. e656ca9
@tswicegood tswicegood Make sure these functions don't bleed into the global scope
This makes sure that all of these functions are assigned to variables
assigned to the current scope, rather than the global scope.  It also
adds a trailing semi-colon to make sure various linters are happy.
@tswicegood tswicegood Remove `var` declaration---this variable is already delcared as an ar…
@tswicegood tswicegood Add missing semi-colons 6e3b996
@tswicegood tswicegood Swap out to === for the true comparison to avoid possible coercion is…
@claudep claudep Hidden __pycache__ dirs for FilePathField. Refs #17393.
This will be tested as soon as tests will run under Python 3. Patch
taken from Vinay Sajip's Python 3 branch.
Commits on May 17, 2012
@claudep claudep Fixed #18326 -- Stripped ending chars in LiveServerViews tests.
Ending chars might be different depending on git crlf setting.
Thanks Michael Manfre for the report and the patch.
@aaugustin aaugustin Fixed #17535 -- Optimized list generic views.
When allow_empty is False, prevented the view from loading
the entire queryset in memory when pagination is enabled.
@aaugustin aaugustin Fixed #17449 -- Added OPTIONS to generic views.
Thanks estebistec for the report and patch.
@aaugustin aaugustin Mentioned the previous commit in the release notes 82a76ef
@aaugustin aaugustin Fixed #9893 -- Validated the length of file names
after the full file name is generated by the storage class.

Thanks Refefer for the report, carsongee for the patch, and
everyone else involved in the discussion.
@aaugustin aaugustin Fixed #18323 -- Refactored date arithmetic
in date based generic views, in order to deal properly with both
DateFields and DateTimeFields.
@aaugustin aaugustin Added a test for DayArchiveView. Refs #17192. ab268e1
@aaugustin aaugustin Fixed #6916 -- Wrong spelling of Spanish province. 4774875
@jcowgar jcowgar Added load i18n code to the base wizard form template documentation a…
…s it uses the trans tag.
@SmileyChris SmileyChris Small change to a template in the FormWizard docs
Specifically, the template was referred to as a "full example template"
but didn't {% load i18n %} even though {% trans %} was used.
Commits on May 18, 2012
@claudep claudep Fixed #18334 -- Fixed detection of supports_stddev backend feature.
Thanks to Michael Manfre for the report and Anssi Kääriäinen for the
Stratos Moros remove mention of from cbv topic
The class based views topic mentions that the weblog
is built using the date-based generic views, but looking at the code,
it actually uses the deprecated pre-1.3 function based generic views.
@claudep claudep Fixed broken ES localflavor test after 4774875. 45f55a9
@claudep claudep Got rid of old __cmp__methods replaced by rich comparison.
The __cmp__ methods are unsupported in Python 3. has been left untouched because it is likely it will
not be migrated to Python 3.
@claudep claudep Added more relative imports in contrib.gis. 02eca6c
@claudep claudep Cleaned up WSGIRequestHandler get_environ to be Python 3 compatible
headers.type/typeheader attributes are gone in Python 3. Thanks
Vinay Sajip for the inspiration of his Python 3 branch.
@adrianholovaty adrianholovaty Merge pull request #79 from stratoukos/master
Removed mention of from cbv topic
@adrianholovaty adrianholovaty Merge pull request #70 from tswicegood/fix-js-scope
Cleaned up various JavaScript in admin JS.
@adrianholovaty adrianholovaty Merge pull request #68 from BooBSD/patch-1
Fixed e-mail duplicates in the AUTHORS.
@adrianholovaty adrianholovaty Merge pull request #24 from marcneuwirth/master
Removed 'return false' in favor of preventDefault in admin JS.
@glenrobertson glenrobertson Fixed typo on GeoQuerySet.geohash method. 9a7261f
Commits on May 19, 2012
@akaariai Merge pull request #81 from glenrobertson/patch-1
Fixed doc typo on GeoQuerySet.geohash method.
@claudep claudep Fixed #18340 -- Fixed formtools form_hmac with Unicode input
Using cPickle, two apparently identical Unicode strings could
generate different pickled results depending on previous operations
on those strings.
@claudep claudep Fixed test failures after commit 1a66f53. Refs #18340 078ea51
@claudep claudep Fixed #18325 -- Wrapped self.stdout/stderr in OutputWrapper class 822d6d6
@claudep claudep Marked bytestrings with b prefix. Refs #18269
This is a preparation for unicode literals general usage in
Django (Python 3 compatibility).
@aaugustin aaugustin Followed a best practice in the time zones docs.
Prevented localize from swallowing non existent or ambiguous
@claudep claudep Imported reduce from functools for forward compatibility.
In Python 3, reduce has to be imported from functools.
Commits on May 20, 2012
@aaugustin aaugustin Documented next/previous_week. Refs #10890. b0c1e5c
@aaugustin aaugustin Fixed #18354 -- Performance issue in CBV.
Prevented repeating a query twice when the model isn't ordered by
-date_field (in Meta), allow_empty is False and pagination isn't
@jezdez jezdez Regenerated the minified versions of the admin actions and admin inli…
…nes JavaScript files forgotten in 04785d2 and f92c7c5 (and previous).
Commits on May 21, 2012
@carljm carljm Fixed #18115 - added warning about overlaid install. now warns if it detects that Django is being installed over top
of a previous installation that was never removed. This should only
happen when installing with ``python install``, as pip
automatically uninstalls before installing a new version and
easy_install installs as an egg directory.

Also generally updated the installation doc.
Commits on May 22, 2012
@claudep claudep Fixed #18113 -- Corrected get_template_names docstrings.
Thanks Keryn Knight for the report.
@claudep claudep Replaced print statement by print function in new install instructions. cafa5bf
@claudep claudep Fixed #18167 -- Gave advice on checking Django version in the tutorial.
Thanks smuss for the initial patch.
@claudep claudep Fixed #18244 -- Documented that formset.has_changed is a 1.4 addition. 6219591
@akaariai Fixed #18304 -- Optimized save() when update_can_self_select=False
Databases with update_can_self_select = False (MySQL for example)
generated non-necessary queries when saving a multitable inherited
model, and when the save resulted in update.
@claudep claudep Replaced 'next' testing by collections.Iterator testing.
The new construct is also Python 3 compatible (where 'next' has
been renamed to '__next__').
@akaariai Fixed #18317 -- Removed db specific raw SQL function from tests
A test in model_fields used LEN() in raw SQL. This function is not
available on some 3rd party backends. I removed this function and
ensured that the test works correctly (breaks pre e9bbdb3) with
the change.
@akaariai Fixed #18318 -- Changed some tests to be 3rd party DB friendly
Thanks to manfre for report and patch.
@akaariai Fixed #18319 -- Added 'supports_sequence_reset' DB feature
Added a new feature to allow 3rd party backends to skip tests which
test sequence resetting.

Thanks to manfre for report and patch.
Commits on May 23, 2012
@claudep claudep Replaced types.NoneType occurrences
In Python 3, types.NoneType is no more available.
Commits on May 24, 2012
@claudep claudep Modernized contrib.gis layermapping tests.
In particular, make tests independent of each other.
@claudep claudep Fixed #18367 -- Allowed LayerMapping to store strings in TextField.
Thanks for the report.
@aaugustin aaugustin Fixed #18353 -- Inconsistency in date-based CBVs. 3b2993e
@aaugustin aaugustin Fixed #18177 -- Cached known related instances.
This was recently fixed for one-to-one relations; this patch adds
support for foreign keys. Thanks kaiser.yann for the report and
the initial version of the patch.
@claudep claudep Stopped converting match dict keys to bytestrings when resolving URLs.
Test suite is passing, but if any regression would be detected,
we might replace smart_str by force_unicode.
@akaariai Fixed qs.order_by() join promotion for already existing joins
When order_by causes new joins to be added to the query, the joins must
be LEFT OUTER joins for nullable relations, otherwise the order_by
could cause the results to be altered. This commit fixes the logic to
only promote new joins, previously all joins in the order_by lookup
path were promoted.

Thanks to Bruno Desthuilliers for spotting this corner case.
@claudep claudep Removed unneeded smart_str in generic views. 2042f53
Commits on May 25, 2012
@akaariai Added tests for nested exclude/negate queries 323b414
@aaugustin aaugustin Fixed #17371 -- Made the test client more flexible
The OPTIONS, PUT and DELETE methods no longer apply arbitrary
data encoding (in the query string or in the request body).
@claudep claudep Specified when open should use binary mode.
Thanks Vinaj Sajip for the help of his django3 branch.
@claudep claudep Fixed #14886 -- Added wms_options dict to GeoModelAdmin.
It is now possible to set WMS options by overriding wms_options
in a subclass of GeoModelAdmin.
Thanks slinkp for the report and the initial patch.
@claudep claudep Fixed #17929 -- Improved tutorial wording and capitalization.
Thanks rmattb for the report and the patch.
@claudep claudep Updated WMS URL in geoadmin test. c2139bb
Commits on May 26, 2012
@claudep claudep Fixed #5423 -- Made dumpdata output one row at a time.
This should prevent storing all rows in memory when big sets of
data are dumped.
See ticket for heroic contributors.
@claudep claudep Removed unneeded sys import added in previous commit 12f4bd7
@claudep claudep Added entry in 1.5 release notes about dumpdata improvements. fb871f6
@claudep claudep Removed a duplicate test in fixtures_regress.
test_abort_loaddata_on_error was exactly the same test as
test_empty (error is tested in test_error_message).
Commits on May 27, 2012
@akaariai Fixed #18343 -- Cleaned up deferred model implementation
Generic cleanup and dead code removal in deferred model field loading
and model.__reduce__().

Also fixed an issue where if an inherited model with a parent field
chain parent_ptr_id -> id would be deferred loaded, then accessing
the id field caused caused a database query, even if the id field's
value is already loaded in the parent_ptr_id field.
@newmaniese newmaniese Fixed #18135 -- Close connection used for db version checking
On MySQL when checking the server version, a new connection could be
created but never closed. This could result in open connections on
server startup.
@claudep claudep Fixed #18387 -- Do not call sys.exit during call_command.
Moved sys.exit(1) so as failing management commands reach it
only when running from command line.
@claudep claudep Used CommandError in createcachetable command.
Raising CommandError whenever a management command meets an error
condition is the standard way to handle errors in commands.
@claudep claudep Used call_command in i18n compilation tests.
Now that call_command does not raise SystemExit any more, we can
use call_command again for testing compilemessages.
Commits on May 28, 2012
@claudep claudep Removed numbering of GEOS tests. a768b1d
@claudep claudep Used call_command stdout parameter to capture output in staticfiles t…
@jphalip jphalip Fixed #18393 -- Prevented blocktrans to crash when a variable name is…
… badly formatted.
@claudep claudep Removed unneeded smart_str in cache utils. 28e4245
Commits on May 30, 2012
Julien Phalip Merge pull request #94 from jphalip/tickets/18393-blocktrans-valueerror
Fixed #18393 -- Prevented blocktrans to crash when a variable name is badly formatted.
Commits on May 31, 2012
@claudep claudep Fixed #14681 -- Do not set mode to None on file-like objects.
gzip.GzipFile does not support files with mode set to None.
@claudep claudep Rewrote test_error_messages with helper test utility. 473c272
@danielroseman danielroseman Use render shortcut in form example. 5c59e43
@claudep claudep Fixed #18407 -- Made model field's to_python methods fully accept uni…

When generating error message in to_python, any unicode string
containing non-ascii characters triggered a UnicodeEncodeError for
most field types.
@claudep claudep Moved test_client_regress tests from to 4553f51
@claudep claudep Cleaned up test_client_regress tests ea4e0aa
@datajockey datajockey Fixed #18408 -- Isolated flatpages tests from existing sites.
Resolves Flatpages test issues by:
 - Creating an example_site fixture
 - Overriding project SITE_ID setting to 1
 - Normalizing the use of the hardcoded (1) site_id to settings.SITE_ID
@jphalip jphalip Fixed #18409 -- Made RegexField work with unicode characters. f6fc83c
@jphalip jphalip Merge pull request #101 from jphalip/tickets/18409-regexfield-unicode
Fixed #18409 -- Made RegexField work with unicode characters.
Commits on Jun 01, 2012
@aaugustin aaugustin Fixed a typo in a comment. Refs #17742. 939af5a
Commits on Jun 02, 2012
@ramiro ramiro Made inspectdb tests deal with a smaller generated file.
Implemented this by adding a stealth table_name_filter option for the
@ramiro ramiro Removed debugging code added in last commit. d4648a3
@claudep claudep Fixed #18259 -- Specified that ROOT_URLCONF might be needed.
When using the template system in standalone mode and if the url
template tag is used, ROOT_URLCONF has to be defined.
Thanks techtonik for the report.
@claudep claudep Fixed settings override in mail regression tests
self.settings_override from test subclasses were overwriting parent
@claudep claudep Fixed override_settings usage in test_client_regress 566ac30
@claudep claudep Made sitemaps tests use override_settings. Refs #14478 7676d6e
@claudep claudep Fixed #14478 -- Isolated messages tests from custom TEMPLATE_CONTEXT_…
Commits on Jun 03, 2012
Samuel Sutch Remove the summary attribute of the table
In the discussion here:
it was decided that using the caption for this previously
non-visible part of the table element was not semantic, so in this
patch is moves that summary to the `title` attribute of the `a`
tag which when overed over, on most browsers, will show the text.
@HonzaKral HonzaKral Fixed incorrect assert in test_filepathfield_folders f823ae3
@HonzaKral HonzaKral Unittest2 style assertTrue instead of assert_ 71d9a2a
@HonzaKral HonzaKral Changed FilePathField tests to use it's own directory with test files.
In previous version it used /django/forms/ which was fragile - for some
users .pyc files were not generated and this tests failed.
Commits on Jun 04, 2012
@jphalip jphalip Merge pull request #104 from samuraisam/17138-html5-remove-summary
Fixed #17138 -- Removed the 'summary' attribute from the admin index tables to be html5-valid.
@jphalip jphalip Fixed #17138 -- Made the sensitive_variables decorator work with obje…
…ct methods.
@claudep claudep Used skipUnless decorator to skip tests in geos tests. 5ef599c
@adrianholovaty adrianholovaty Merge pull request #99 from danielroseman/master
Docs: "Form in a view" example doesn't use RequestContext
@spookylukey spookylukey Rewrote security.txt SSL docs, noting SECURE_PROXY_SSL_HEADER. 0199bdc
@spookylukey spookylukey Noted that SECURE_PROXY_SSL_HEADER is needed by CSRF protection.
Both false positives and false negatives of HttpRequest.is_secure can be
Commits on Jun 05, 2012
@bohyn bohyn Ticket #17804 fix. fbb7389
@bohyn bohyn Merge branch 'master' of eee791e
@HonzaKral HonzaKral Merge pull request #112 from bohyn/master
Django Admin's input for BigIntegerField should be larger, Fixes #17804
@HonzaKral HonzaKral Fixed #15926 -- Added option --no-initial-data to syncdb and flush.
Thanks msiedlarek, jpaugh64 and vlinhart!
Commits on Jun 06, 2012
@claudep claudep Fixed #17736 -- Kept maximal floating-point accuracy in from_bbox
When constructing a polygon with Polygon.from_bbox, do not convert
parameters to strings at this stage (str defaults to 12 significant
Thanks for the report and David Eklung for the patch.
@aaugustin aaugustin Added alt attribute to img tags in docs.
This is a good practice for accessibility.
Thanks Jessica McKellar for the report.
@claudep claudep Fixed #17328 -- Added OpenLayersWidget _has_changed method
Thanks Will Hardy for the report and the patch.
@claudep claudep Delayed encoding of password and salt in password checking.
Applied the rule that string encoding should happen as late as
possible. This is also a preparation for Python 3 compatibility.
@claudep claudep Fixed #18184 -- Moved algorithm identification code to hashers module
Thanks Eli Collins for the report and the patch.
@jacobian jacobian Replaced documentation snippets using "gender" with less sensitive ex…
@claudep claudep Made TestNoInitialDataLoading pass with MySQL (Refs #15926) f0664dc
@spookylukey spookylukey Fixed #18309 - Prefetch related does not work for fkey to multitable …
…inherited model

Thanks to milosu for the report, tests and initial patch.
@spookylukey spookylukey Small cleanup in prefetch_related code f5ce179
@claudep claudep Prevented TestNoInitialDataLoading to pollute other tests (Refs #15926)
Tests were still failing with MySQL. It seems a rollback is solving
the issue.
Commits on Jun 07, 2012
@aaugustin aaugustin Fixed #14502 -- Added a verbatim template tag.
Thanks SmileyChris for the patch.
@claudep claudep Fixed #10200 -- Raised CommandError when errors happen in loaddata. 6fd1950
@aaugustin aaugustin Fixed #18411 -- Clarified HttpRequest doc slightly.
Thanks torkel.bjornson AT for the report.
@aaugustin aaugustin Fixed #18396 -- Changed Spatialite download URLs.
Thanks gabrielcw AT for the report.
@aaugustin aaugustin Fixed #18397 -- Avoided referencing
This commit includes multiple small related changes, see the ticket
for a full discussion.
@aaugustin aaugustin Fixed #16916 -- Documented default headers for the test client.
Thanks sailorfred AT for the report and raulcd
for the initial version of the patch.
@juanriaza juanriaza Fixed #18380 -- Improve installation instructions for MySQLdb bac6a68
@aaugustin aaugustin Merge pull request #117 from juanriaza/master
Fixed #18380 -- Improved installation instructions for MySQLdb.
@claudep claudep Added more precise assertions on two fixture tests. 6492e8e
@aaugustin aaugustin Removed references to changes made in 1.2.
Thanks Florian Apolloner for the patch.
@jakul jakul fix bad locale names 0e36948
@aaugustin aaugustin Merge pull request #122 from jakul/issue-18442
Fixed #18442 -- Invalid locale name in docs.
@apollo13 apollo13 Don't escape object ids when passing to the contenttypes.shortcut view.
This commit also changes the string pk to string_pk instead of id, to test
if the admin uses .pk throughout the codebase.
@claudep claudep Fixed #18269 -- Applied unicode_literals for Python 3 compatibility.
Thanks Vinay Sajip for the support of his django3 branch and
Jannis Leidel for the review.
@adrianholovaty adrianholovaty Fixed #17933 -- Added intro note to writing-documentation.txt
Based on initial patch by Thomas Westfeld
@claudep claudep Fixed #18363 -- Added Python 3 compatibility layer.
Thanks Vinay Sajip for the support of his django3 branch
and Alex Gaynor, kezabelle, YorikSar for the review.
@JannKleen JannKleen Fixed #18432 -- Prevented the ForeignKey field from creating an inval…
…id query when chained. Thanks, Jann Kleen.
@aaugustin aaugustin Fixed #18436 -- Updated contributing docs for git.
Most of the credit for this large patch goes to Anssi Kääriäinen.
Many thanks to all the people who contributed to the discussion.
@aaugustin aaugustin Fixed #17933 -- Added a missing label to the docs. 6a66fc0
@dhepper dhepper Fixed #18433 -- Fixed "View on Site" link in inline admin for models …
…with custom PK
@aaugustin aaugustin Fixed #18445 -- Added a links in the docs.
Thanks Audrey Roy for the patch.
@spookylukey spookylukey Small corrections to committing-code docs f269f30
Commits on Jun 08, 2012
@aaugustin aaugustin Fixed #18125 -- Explained caveat with filters
Thanks ebrelsford AT and oinopion.
@aaugustin aaugustin Merge pull request #127 from dhepper/master
Fixed #18433 -- Fixed "View on Site" link in inline admin for models with custom PK

Thanks dhepper for the patch and apollo13 for the review.
@aaugustin aaugustin Merge pull request #123 from apollo13/ticket18381
Fixed #18381 -- Stopped escaping object ids

when passing them to the contenttypes.shortcut view.

Thanks apollo13 for the patch and dhepper for the review.
@aaugustin aaugustin Proof-read the new contributing guide.
Many thanks to Daniele Procida.