Commit Graph

2353 Commits

Author SHA1 Message Date
Aymeric Augustin 23d230f058 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.
2012-06-08 01:48:41 -07:00
Daniel Hepper 0ae727beda Fixed #18433 -- Fixed "View on Site" link in inline admin for models with custom PK 2012-06-07 21:08:36 +02:00
Claude Paroz 4a103086d5 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.
2012-06-07 18:08:47 +02:00
Florian Apolloner e1643e3535 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.
2012-06-07 17:52:12 +02:00
Aymeric Augustin 17f3e9258e Fixed #18397 -- Avoided referencing lawrence.com.
This commit includes multiple small related changes, see the ticket
for a full discussion.
2012-06-07 11:50:20 +02:00
Claude Paroz 70a0351fef Fixed #18184 -- Moved algorithm identification code to hashers module
Thanks Eli Collins for the report and the patch.
2012-06-06 11:06:33 +02:00
Claude Paroz eb286aa22f 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.
2012-06-06 10:53:16 +02:00
Claude Paroz 9c096ab981 Fixed #17328 -- Added OpenLayersWidget _has_changed method
Thanks Will Hardy for the report and the patch.
2012-06-06 10:42:14 +02:00
Claude Paroz 17824e2b74 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
digits).
Thanks tdihp@hotmail.com for the report and David Eklung for the patch.
2012-06-06 10:09:32 +02:00
martin.bohacek eee791e9b2 Merge branch 'master' of https://github.com/django/django 2012-06-05 13:29:33 +02:00
martin.bohacek fbb7389439 Ticket #17804 fix. 2012-06-05 13:28:32 +02:00
Claude Paroz 5ef599c7b3 Used skipUnless decorator to skip tests in geos tests. 2012-06-04 20:39:54 +02:00
Samuel Sutch 43a46e9004 Remove the summary attribute of the table
In the discussion here: https://code.djangoproject.com/ticket/17138
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.
2012-06-03 12:44:37 -07:00
Claude Paroz 6522283a71 Fixed #14478 -- Isolated messages tests from custom TEMPLATE_CONTEXT_PROCESSORS 2012-06-02 21:28:18 +02:00
Claude Paroz 7676d6e764 Made sitemaps tests use override_settings. Refs #14478 2012-06-02 21:24:18 +02:00
Jens Page ba10be7032 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
2012-05-31 18:03:49 +02:00
Claude Paroz a768b1d94a Removed numbering of GEOS tests. 2012-05-28 11:15:31 +02:00
Claude Paroz f2b6763ad7 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.
2012-05-27 20:38:47 +02:00
Claude Paroz c2139bbcef Updated WMS URL in geoadmin test. 2012-05-26 00:02:15 +02:00
Claude Paroz ce8f874b88 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.
2012-05-25 21:00:44 +02:00
Claude Paroz edfa95c22f Specified when open should use binary mode.
Thanks Vinaj Sajip for the help of his django3 branch.
2012-05-25 20:43:43 +02:00
Claude Paroz f4abba5200 Fixed #18367 -- Allowed LayerMapping to store strings in TextField.
Thanks geoffhing@gmail.com for the report.
2012-05-24 09:57:22 +02:00
Claude Paroz f1ebcdc7c2 Modernized contrib.gis layermapping tests.
In particular, make tests independent of each other.
2012-05-24 09:52:06 +02:00
Claude Paroz 817535d73e Replaced types.NoneType occurrences
In Python 3, types.NoneType is no more available.
2012-05-23 12:20:03 +02:00
Jannis Leidel 23b9418458 Regenerated the minified versions of the admin actions and admin inlines JavaScript files forgotten in 04785d2 and f92c7c5 (and previous). 2012-05-20 18:23:14 +02:00
Claude Paroz 35e6585568 Imported reduce from functools for forward compatibility.
In Python 3, reduce has to be imported from functools.
2012-05-20 00:25:46 +02:00
Claude Paroz 38408f8007 Marked bytestrings with b prefix. Refs #18269
This is a preparation for unicode literals general usage in
Django (Python 3 compatibility).
2012-05-19 17:43:34 +02:00
Claude Paroz 822d6d6dab Fixed #18325 -- Wrapped self.stdout/stderr in OutputWrapper class 2012-05-19 13:51:54 +02:00
Claude Paroz 078ea51b1c Fixed test failures after commit 1a66f53. Refs #18340 2012-05-19 12:32:59 +02:00
Claude Paroz 1a66f53f94 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.
2012-05-19 12:10:22 +02:00
Adrian Holovaty 04785d2697 Merge pull request #24 from marcneuwirth/master
Removed 'return false' in favor of preventDefault in admin JS.
2012-05-18 13:41:53 -07:00
Adrian Holovaty 4b75546b45 Merge pull request #70 from tswicegood/fix-js-scope
Cleaned up various JavaScript in admin JS.
2012-05-18 13:37:41 -07:00
Claude Paroz 02eca6c0e2 Added more relative imports in contrib.gis. 2012-05-18 17:06:25 +02:00
Claude Paroz d04f72fb31 Got rid of old __cmp__methods replaced by rich comparison.
The __cmp__ methods are unsupported in Python 3.
_doctest.py has been left untouched because it is likely it will
not be migrated to Python 3.
2012-05-18 14:52:24 +02:00
Aymeric Augustin 4774875896 Fixed #6916 -- Wrong spelling of Spanish province. 2012-05-17 22:04:47 +02:00
Travis Swicegood f92c7c5df2 Swap out to === for the true comparison to avoid possible coercion issues 2012-05-16 13:40:24 -05:00
Travis Swicegood 6e3b9962cc Add missing semi-colons 2012-05-16 13:38:23 -05:00
Travis Swicegood 67fd30e9ab Remove `var` declaration---this variable is already delcared as an argument 2012-05-16 13:38:02 -05:00
Travis Swicegood c647065b49 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.
2012-05-16 13:33:48 -05:00
Jannis Leidel 5f75ac91df 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. 2012-05-16 13:21:50 +02:00
Claude Paroz 33ffd28d76 Added missing relative imports in test files. 2012-05-12 19:58:32 +02:00
Marc Neuwirth b719cbb901 Removed 'return false' in favor of preventDefault.
Moved preventDefault to the top
2012-05-12 00:39:31 -04:00
Tyler Ball 1c30063faf Fixed #18298 -- Marked error strings as translatable in CA localflavor. 2012-05-11 08:53:36 +02:00
Aymeric Augustin 3dde02640c Fixed #17518 -- CSS glitch in StackedInline.
Thanks sebastian for the report and patch.
2012-05-10 22:44:40 +02:00
Aymeric Augustin 46648b641d Fixed #17798 -- Tweaked the CA localflavor.
Thanks shelldweller.
2012-05-10 22:19:01 +02:00
Aymeric Augustin b1155adcde Fixed #18093 -- Added a pk to AnonymousUser. 2012-05-10 21:42:13 +02:00
Claude Paroz 169b1a404c Replaced foo.next() by next(foo).
This new syntax for next() has been introduced in Python 2.6 and is
compatible with Python 3.
2012-05-10 20:15:49 +02:00
Jannis Leidel 1c1a229632 Set the post process cache when finished instead of one by one.
This should prevent a race condition if running collectstatic is
canceled or its cache is accessed from other processes, leaving the
cache in a corrupt state.
2012-05-10 18:31:48 +02:00
maurizio 6524ef501d Comment._get_userinfo is thread safe now 2012-05-08 17:25:31 +02:00
Claude Paroz 1aae1cba99 Imported zip from future_builtins instead of itertools.izip.
In Python 3, itertools.izip is not available any more (behaviour
integrated in standard zip).
2012-05-07 17:25:12 +02:00
Claude Paroz d7dfab59ea Replaced cStringIO.StringIO by io.BytesIO.
Also replaced StringIO.StringIO by BytesIO in some other appropriate
places. StringIO is not available in Python 3.
2012-05-05 21:41:44 +02:00
Claude Paroz 865cd35c9b Made more extensive usage of context managers with open. 2012-05-05 14:06:36 +02:00
Claude Paroz 11a5355517 Inserted more simplefilter calls to be sure warnings are emitted.
Thanks to Florian Apolloner for suggesting the patch.
2012-05-03 21:31:23 +02:00
Claude Paroz 00c0d3c44e Made warning assertions work with or without -Wall python switch 2012-05-03 20:18:05 +02:00
Claude Paroz 10cf3c6427 Used catch_warnings instead of save/restore methods. Refs #17049. 2012-05-03 18:30:07 +02:00
Claude Paroz b52672d778 Replaced deprecated TestCase methods. Refs #17049. 2012-05-03 16:39:16 +02:00
Aymeric Augustin e84f79f051 Fixed #18042 -- Advanced deprecation warnings.
Thanks Ramiro for the patch.
2012-05-03 15:27:01 +02:00
Anssi Kääriäinen 8fad77da95 Ensured tests pass using custom PASSWORD_HASHERS. 2012-04-30 22:10:27 +03:00
Anssi Kääriäinen 2a09404792 Reset password hashers cache on settings_changed. 2012-04-30 22:10:27 +03:00
Claude Paroz 596cb9c7e2 Replaced print statement by print function (forward compatibility syntax). 2012-04-30 20:45:03 +02:00
Claude Paroz eba4197c71 Fixed #18240 -- Made admindocs tests pass even when language is not en.
Thanks miguel.ventura@gmail.com for the report and the patch.
2012-04-30 09:41:59 +02:00
Alex Gaynor d5a277ba4d Switch a datastructure internal to the ORM to be a set, instead of a dictionary. 2012-04-29 22:18:30 -04:00
Adrian Holovaty 6ff118cdb9 Fixed #17644 -- Changed Query.alias_map to use namedtuples
This makes the code easier to understand and may even have a benefit in memory usage (namedtuples instead of dicts). Thanks, lrekucki and akaariai
2012-04-29 17:50:48 -05:00
Claude Paroz 3904b74a3f Fixed #18013 -- Use the new 'as' syntax for exceptions.
Thanks Clueless for the initial patch.
Note that unittest has been purposely left out (external package only used by Python 2.6).
2012-04-29 20:57:15 +02:00
Aymeric Augustin cec6bd5a59 Fixed #18023 -- Removed bundled simplejson.
And started the deprecation path for django.utils.simplejson.

Thanks Alex Ogier, Clueless, and other contributors for their
work on the patch.
2012-04-29 19:58:00 +02:00
Aymeric Augustin 3e8b40f479 Fixed #17992 -- Added a public API for localtime.
Thanks Bradley Ayers for the report.
2012-04-29 15:37:23 +02:00
Aymeric Augustin 905bd7fb44 Fixed #13196 -- Formatting in admin changelists.
Handled values returned by functions more like field values.
In particular, localized dates, times and datetimes properly,
and converted datetimes to the current timezone.
2012-04-29 11:51:12 +02:00
Mike Yumatov b1be28554f Fixed template syntax error, introduced in pull request #17 2012-04-29 11:03:12 +04:00
Aviral Dasgupta 9bea857957 Fixed #17967: Hide "Change Password" link in admin if user.has_usable_password is False. 2012-04-29 07:36:50 +05:30
Karen Tracey 75743c189d Fixed #18234: Avoided exception on flatpage add 2012-04-28 19:44:14 -04:00
Claude Paroz a6b2a15348 Removed deprecated gender check in cz localflavor. Refs #14593.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17939 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-26 17:48:50 +00:00
Claude Paroz be12c9e908 Fixed #18038 -- Removed the 'supports_inactive_user' backwards-compatibility flag. Thanks Aymeric Augustin for the initial patch and Ramiro Morales for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17938 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-26 17:15:40 +00:00
Claude Paroz eb351ac9cb Fixed #18037 -- Changed behaviour of url and ssi template tags to the new syntax, as per official deprecation timeline. Thanks Ramiro Morales and Jannis Leidel for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-24 19:55:52 +00:00
Claude Paroz 0e01023897 Converted more test assertions to assert[Not]Contains.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17910 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-14 13:35:25 +00:00
Claude Paroz 749243941c Fixed #18041 -- Removed support for Markdown versions < 2.1, following the 1.5 deprecation timeline. Thanks Ramiro Morales for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17909 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-14 12:35:31 +00:00
Claude Paroz 844e56e21a Fixed #18039 -- Changed geometry transform without a SRID raise a GEOSException.
This was planned in the official deprecation timeline for 1.5.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17903 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-12 16:35:28 +00:00
Julien Phalip 6f7aa51b2c Fixed #17864 -- Added Hong Kong localflavor. Thanks to mrkschan and Adrien Lemaire.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-09 17:25:02 +00:00
Claude Paroz 883c38c499 Fixed #17848 -- Added setting_changed signal for cases when TEMPLATE_CONTEXT_PROCESSORS is overriden in tests.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-09 13:24:57 +00:00
Julien Phalip a0b55f30a8 Fixed #18086 -- Restored '-pk' as the default order in the admin changelist. This rectifies a slight change in behavior introduced in Django 1.4 and r17635.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17881 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-09 04:28:32 +00:00
Claude Paroz 5c53e30607 Fixed #18035 -- Removed deprecated AdminMediaHandler, as per official deprecation timeline. Thanks Jannis Leidel and Ramiro Morales for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-08 21:13:32 +00:00
Ramiro Morales 7d5979f953 Removed broken function-based custom test runner in GeoDjango
We forgot to delete it during the 1.4 development cycle.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17864 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-01 21:03:50 +00:00
Julien Phalip c39e1cff99 Fixed #17972 -- Ensured that admin filters on a foreign key respect the `to_field` attribute. This fixes a regression introduced in [14674] and Django 1.3. Thanks to graveyboat and Karen Tracey for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 18:22:12 +00:00
Aymeric Augustin ad355e48ce Moved a template that was added in the wrong directory.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17853 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 17:16:14 +00:00
Aymeric Augustin 98e9d1c6ab Used the override_settings decorator in the tests of auth, flatpages, and formtools.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 16:03:09 +00:00
Claude Paroz 6d9227bb0f Removed some more imports/warnings useless after recent removals.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 15:20:57 +00:00
Claude Paroz d2e273e295 Fixed #18029 -- Removed leftover mod_python files forgotten in r17835.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17849 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 14:50:54 +00:00
Aymeric Augustin dec21a1d4b Removed deprecated and undocumented function django.contrib.formtools.utils.security_hash().
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17841 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 12:26:46 +00:00
Claude Paroz 23d3459761 Fixed #17965 -- Definitely dropped support for Python 2.5. Thanks jonash for the initial patch and Aymeric Augustin for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 08:24:29 +00:00
Aymeric Augustin 4fe87c370d Removed some Python < 2.6 compatibility code. Refs #17965.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17830 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-30 09:20:04 +00:00
Aymeric Augustin eb163f37cb Use the class decorator syntax available in Python >= 2.6. Refs #17965.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-30 09:08:29 +00:00
Claude Paroz 9383a2761c Removed with_statement imports, useless in Python >= 2.6. Refs #17965. Thanks jonash for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17828 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-30 08:02:08 +00:00
Claude Paroz 6cbb96ef5c Fixed #17989 -- Made an error message translatable in CH localflavor. Thanks piquadrat for the report and the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17824 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-29 16:44:00 +00:00
Claude Paroz 0fe9f3ce27 Make auth test pass even when LANGUAGE_CODE is not 'en'. Refs #17980. Thanks wassup for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17811 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-26 20:22:02 +00:00
Aymeric Augustin f356a2e52f Fixed #17810 (again). Catch session key errors.
The previous commit didn't work with PyLibMC.
This solution appears to be the best compromise
at this point in the 1.4 release cycle.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17797 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 16:14:46 +00:00
Jannis Leidel 46871eb1bb Fixed an incompatibility with Python 2.5 in the changes done in r17795. Refs #17810.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 09:32:11 +00:00
Paul McMillan 2ca9801956 Fixed #17810. Catch session key errors.
Catches memcached session key errors related to overly long session keys.
This is a long-standing bug, but severity was exacerbated by the addition
of cookie-backed session storage, which generates long session values. If
an installation switched from cookie-backed session store to memcached,
users would not be able to log in because of the server error from overly
long memcached keys.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 05:31:11 +00:00
Jannis Leidel 38061221c3 Pulled sites translations updates from Transifex. Refs #17822.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 03:29:30 +00:00
Jannis Leidel 5b3721b067 Pulled sessions translations updates from Transifex. Refs #17822.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17793 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 03:24:45 +00:00
Jannis Leidel c6ba0b54b7 Pulled redirects translations updates from Transifex. Refs #17822.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 03:20:36 +00:00
Jannis Leidel 07f6054cd5 Pulled messages translations updates from Transifex. Refs #17822.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17791 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 03:17:00 +00:00