innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
20,534 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

6634 Commits

Author SHA1 Message Date
Yosuke Yasuda 269315d81a [1.8.x] Fixed #25108 -- Fixed a test which failed on Pillow 2.9+ 
Backport of a2b999dfca from master
 2015-07-13 14:59:02 -04:00
Lukas Hetzenecker ebcfedb0e5 [1.8.x] Fixed #25019 -- Added UUID support in DjangoJSONEncoder 
Backport of 6355a6d4f5 and 2e05ef4e18 from master.
 2015-07-10 09:02:14 +02:00
Shai Berger 8f9a4d3a2b [1.8.x] Fixed catastrophic backtracking in URLValidator. 
Thanks João Silva for reporting the problem and Tim Graham for finding the
problematic RE and for review.

This is a security fix; disclosure to follow shortly.
 2015-07-08 15:23:19 -04:00
Tim Graham 574dd5e0b0 [1.8.x] Prevented newlines from being accepted in some validators. 
This is a security fix; disclosure to follow shortly.

Thanks to Sjoerd Job Postmus for the report and draft patch.
 2015-07-08 15:23:18 -04:00
Carl Meyer 66d12d1aba [1.8.x] Fixed #19324 -- Avoided creating a session record when loading the session. 
The session record is now only created if/when the session is modified. This
prevents a potential DoS via creation of many empty session records.

This is a security fix; disclosure to follow shortly.
 2015-07-08 15:23:18 -04:00
Andriy Sokolovskiy 6840aaf3c1 [1.8.x] Replaced try..except blocks by context manager in custom lookups tests 
Backport of 13dca01af0 from master
 2015-07-07 12:04:21 -04:00
Alexey Sveshnikov 8c417564c7 [1.8.x] Fixed #25059 -- Allowed Punycode TLDs in URLValidator 
Backport of bc98bc56a5 from master
 2015-07-06 15:11:43 -04:00
Michael Manfre 342074f4a4 [1.8.x] Fixed #25055 -- Made m2m long name testing friendlier for 3rd party databases. 
Backport of f9c3587b51 from master
 2015-07-03 09:00:36 -04:00
Tim Graham cb3e9bc0d7 [1.8.x] Fixed #25056 -- Documented minimum version of jinja2 for testing. 
Backport of ca58181bac from master
 2015-07-03 08:22:34 -04:00
Marten Kenbeek 42aa919de9 [1.8.x] Refs #23621 -- Fixed warning message when reloading models. 
Backport of aabb58428b from master
 2015-06-30 15:01:22 -04:00
Noam fd61ce3817 [1.8.x] Fixed #25031 -- Fixed a regression in the unordered_list template filter. 
Backport of e291fc4757 from master
 2015-06-27 09:39:29 -04:00
Jason Hoos 4296801463 [1.8.x] Fixed #24958 -- Fixed inline forms using UUID-PK parents with auto-PK children. 
Backport of a50b66da30 from master
 2015-06-26 09:15:59 -04:00
薛丞宏 a97e50c5e6 [1.8.x] Fixed #25016 -- Reallowed non-ASCII values for ForeignKey.related_name on Python 3. 
Backport of d3e12c9017 from master
 2015-06-26 08:35:13 -04:00
Tim Graham ae1d663b79 [1.8.x] Renamed RemovedInDjango20Warning to RemovedInDjango110Warning. 2015-06-23 07:22:16 -04:00
Markus Holtermann f64a3de2d4 [1.8.x] Fixed #24940 -- Made model managers hashable 
Thanks Federico Jaramillo Martínez for the report and Tim Graham for the
test and review.

Backport of d3d66d4722 from master
 2015-06-19 19:15:01 +02:00
Andriy Sokolovskiy 8abe2d0643 [1.8.x] Fixed #24948 -- Fixed crash when uploading bitmap images in forms.ImageField 
Backport of cf6ce279c7 from master
 2015-06-16 14:38:25 -04:00
Adam Brenecki 0e3a80fa68 [1.8.x] Fixed #24972 -- Fixed removing unique_together indexes on MySQL. 
Backport of 65296b3be3 from master
 2015-06-15 17:32:07 -04:00
Brian King c58755d875 [1.8.x] Fixed #24912 -- Fixed prefetch_related failure for UUIDField primary keys 
This resolves a problem on databases besides PostgreSQL when using
prefetch_related with a source model that uses a UUID primary key.

Backport of bfb5b7150f from master
 2015-06-15 17:31:50 -04:00
Tim Graham 062ce508b0 [1.8.x] Fixed flake8 warnings on Python 3. 
Backport of 47fcbe506c from master
 2015-06-15 13:01:41 -04:00
Rivo Laks 76c526f80e [1.8.x] Fixed #24769 -- Cast optparse verbosity argument to an integer for better backwards compatibility. 
Using `BaseCommand.options_list` makes Django use the legacy optparse
parser, which does not set the verbosity attribute correctly. Now the
verbosity argument is always cast to int. Regression in 8568638 (#19973).

Initial report and patch from blueyed.

Backport of a0047c6242 from master
 2015-06-09 19:05:16 -04:00
Tim Graham 8bc18ebf0f [1.8.x] Fixed #24903 -- Fixed assertRaisesMessage on Python 2.7.10. 
A regression in Python 2.7.10 rc1 wasn't reverted in the final
release: https://bugs.python.org/issue24134

Backport of two commits from master:
* c2bc1cefdc
* e89c3a4603
 2015-06-09 17:54:33 -04:00
Tomasz Kontusz b62dc60c98 [1.8.x] Fixed ImportError message in utils.module_loading.import_string() 
Backport of c2b4967e76 from master
 2015-06-06 11:55:56 -04:00
Andriy Sokolovskiy 66496c8403 [1.8.x] Added missing tests for transforms usage with subquery for PostgreSQL fields 
Backport of 2a7c59cd88 from master
 2015-06-06 09:12:07 -04:00
Andriy Sokolovskiy b4b13759f8 [1.8.x] Fixed #24744 - Fixed relabeled_clone for the Transform 
Backport of 08232ef84d from master
 2015-06-06 09:11:46 -04:00
Mark Lavin 0cfb7ed5c5 [1.8.x] Fixed #24924 -- Join promotion for multiple Case expressions 
Backport of 541f4ea546 from master
 2015-06-05 12:23:08 -04:00
Andriy Sokolovskiy 469f1e362b [1.8.x] Fixed #24833 -- Fixed Case expressions with exclude(). 2015-06-05 11:03:41 -04:00
Carl Meyer 2358c1e5d7 [1.8.x] Cleaned up docstring style, per Tim Graham review. 
Backport of 57dbc87ade from master.
 2015-06-03 19:21:23 -06:00
Carl Meyer feed5ad2a0 [1.8.x] Refs #24628 -- Added a second test and a docstring comment to avoid regression. 
Backport of 5c085ea7b3 from master.
 2015-06-03 15:48:53 -06:00
Tim Graham f082813d67 [1.8.x] Fixed typo in runtests.py vendor check. 2015-06-03 12:22:39 -04:00
Tim Graham 2009525c8b [1.8.x] Applied db_table conversion to fix schema tests on Oracle. 
Backport of 7c637a3aae from master
 2015-06-02 19:45:24 -04:00
Carl Meyer efdcd13c34 [1.8.x] Fixed #24628 -- Fixed applied status for squashed migrations. 
Backport of 492537ac18 from master.
 2015-06-02 16:21:58 -06:00
Carl Meyer c37c6dc410 [1.8.x] Improved isolation of applied-migrations table in migration tests. 
Backport of 335fc44f68 from master.
 2015-06-02 16:21:03 -06:00
Carl Meyer 98b40ffe61 [1.8.x] Fixed #24895 -- Fixed loading a pair of squashed migrations with a dependency. 
Backport of 84522c0d16 from master.
 2015-06-02 12:10:04 -06:00
zauddelig 7f92b6e576 [1.8.x] Fixed #24897 -- Allowed using choices longer than 1 day with DurationField 
Backport of 262d4db8c4 from master
 2015-06-02 12:42:31 -04:00
Andriy Sokolovskiy 9d83de8ff3 [1.8.x] Fixed #24831 -- Fixed pickling queryset with prefetch_related() after deleting objects. 
Backport of 2913d6b77d from master
 2015-06-02 10:07:45 -04:00
Tim Graham 1c57d7e7fa [1.8.x] Fixed #24893 -- Fixed lack of unique constraint when changing a field from primary_key=True to unique=True 
Backport of e1e6399c2c from master
 2015-06-02 09:32:22 -04:00
Tim Graham 8911d2e20f [1.8.x] Fixed #24892 -- Fixed quoting of SQL when renaming a field to AutoField in PostgreSQL 
Backport of 5ab8680983 from master
 2015-06-02 09:15:08 -04:00
Tim Graham 2456276b02 [1.8.x] Fixed #24851 -- Fixed crash with reverse one-to-one relation in ModelAdmin.list_display 2015-05-28 10:37:31 -04:00
Andriy Sokolovskiy f65d4db8a8 [1.8.x] Fixed #24817 -- Prevented loss of null info in MySQL field renaming. 
Backport of 80ad5472ce from master
 2015-05-28 10:08:14 -04:00
Paweł Marczewski 7ee6043dba Fixed #24847 -- Prevented items set on a RequestContext from being lost. 
Backport of 300e8baf94 from master
 2015-05-27 10:08:31 -04:00
Tim Graham b16f84f15b [1.8.x] Refs #24836 -- Reverted "Simplified the lazy CSRF token implementation in csrf context processor." 
This reverts commit 8099d33b65 as it caused
a regression that cannot be solved without changing force_text() which has
a small risk of introducing regressions. This change will remain in master
along with an update to force_text().
 2015-05-27 09:29:45 -04:00
Andrea Grandi 62c19a21b6 Fixed #24844 -- Corrected has_changed implementation for HStoreField. 
Backport of 43b2d88a5b from master
 2015-05-25 21:10:07 -04:00
Paweł Marczewski 2aa2b9f291 [1.8.x] Fixed #24835 -- Fixed QuerySet.exists() after an annotation with Count() 
QuerySet.exists() incorrectly handled query.group_by = True
case (grouping by all select fields), causing GROUP BY
expressions to be wiped along with select fields.

Backport of 801a84ae32 from master
 2015-05-25 20:47:28 -04:00
Marten Kenbeek 1ac4c7d415 [1.8.x] Fixed #24848 -- Fixed ValueError for faulty migrations module. 
Added apps to unmigrated apps if the migrations module is a file
or a folder missing __init__.py.

Thanks to Ernest0x for the bug report.

Backport of d73176a842 from master
 2015-05-25 13:56:37 -04:00
Villiers Strauss 4311fd2c0a [1.8.x] Fixed #24841 -- Made BaseRangeField.prepare_value() call base_field's prepare_value() 
Backport of 614bec41b5 from master
 2015-05-25 12:07:25 -04:00
Claude Paroz 0bfe322bac [1.8.x] Fixed #24826 -- Accounted for filesystem-dependent filename max length 
Thanks Raphaël Hertzog for the report and help on the patch, and Tim Graham
for the review.

Backport of 170f7115bb from master
 2015-05-23 14:58:03 -04:00
Tim Graham 31cb25adec [1.8.x] Fixed incorrect session.flush() in cached_db session backend. 
This is a security fix; disclosure to follow shortly.

Thanks Sam Cooke for the report and draft patch.
 2015-05-20 13:49:07 -04:00
Simon Charette 2b2a2157d0 [1.8.x] Refs #24652 -- Made sure template backend tests call their super setUpClass. 
Backport of ead36e8a47 from master
 2015-05-20 13:32:36 -04:00
Simon Charette 3ab3be4b5d [1.8.x] Refs #24652 -- Converted a template test to avoid executing queries. 
Backport of 8bf1449edb from master
 2015-05-20 13:32:35 -04:00
Simon Charette e846ea0649 [1.8.x] Refs #24652 -- Enforced test isolation in file_storage tests. 
Backport of 3db21c351b from master
 2015-05-20 13:32:35 -04:00
Tim Graham 525fd2f405 [1.8.x] Fixed typo in file_storage tests. 
Backport of e2b77acedd from master
 2015-05-20 13:06:10 -04:00
Anssi Kääriäinen db65660928 [1.8.x] Fixed #24705 -- Fixed negated Q objects in expressions. 
Avoided split_exclude() for Q when used as an expression.

Backport of bc87061a3c from master
 2015-05-20 09:41:42 -04:00
Tim Graham 3c0e03ef42 [1.8.x] Fixed #24812 -- Fixed app registry RuntimeWarnings in schema and migrations tests. 
Backport of f5da438072 from master
 2015-05-18 10:14:57 -04:00
Claude Paroz cdf7f90f95 [1.8.x] Fixed #24791 -- Added fallback when 'postgres' database isn't available 
Thanks Carl Meyer and Tim Graham for the reviews.
Backport of 322605035 from master.
 2015-05-15 18:46:05 +02:00
Bo Lopker 3c659856eb [1.8.x] Fixed #24799 -- Fixed session cookie deletion when using SESSION_COOKIE_DOMAIN 
Backport of 2dee853ed4 from master
 2015-05-15 11:24:18 -04:00
Claude Paroz 6a0d9f068f [1.8.x] Fixed #24757 -- Recreated MySQL index when needed during combined index removal 
Thanks Thomas Recouvreux for the report and Tim Graham for the tests and
review.
Backport of ae635cc36 from master.
 2015-05-15 17:08:49 +02:00
Tim Graham 30e5703844 [1.8.x] Fixed #24802 -- Delayed GDAL check for OSMGeoAdmin 
Backport of a37dcfd0a3 from master
 2015-05-15 09:20:04 -04:00
Tim Graham df0674eabb [1.8.x] Fixed #24751 -- Fixed HStoreField isnull lookup. 
Backport of 3c8fe5dddf from master
 2015-05-13 10:34:15 -04:00
Abhaya Agarwal 290c9d6654 [1.8.x] Fixed #24698, #24712 -- Added ForeignKey.get_db_prep_value() 
Fixed crashes with ForeignKey to UUIDField and inheritance with UUIDField
primary keys.
 2015-05-12 19:37:37 -04:00
Anssi Kääriäinen d5ce2dd7bc [1.8.x] Fixed #24748 -- Fixed incorrect GROUP BY on MySQL in some queries 
When the query's model had a self-referential foreign key, the
compiler.get_group_by() code incorrectly used the self-referential
foreign key's column (for example parent_id) as GROUP BY clause
when it should have used the model's primary key column (id).

Backport of adc57632bc from master
 2015-05-11 11:52:14 -04:00
Anssi Kääriäinen 056a91dbfa [1.8.x] Fixed #24766 -- Added join promotion for Case expressions 
Backport of be9d645346 from master
 2015-05-11 11:17:37 -04:00
Anssi Kääriäinen 5b5858575c [1.8.x] Fixed #24752 -- query crash when reusing Case expressions 
Case expressions weren't copied deep enough (self.cases list was
reused resulting in an error).

Backport of 7b05d2fdae from master
 2015-05-05 11:38:48 -04:00
Aymeric Augustin 1f0a6082ec [1.8.x] Fixed #24685 -- Fixed check for template name unicity. 
Thanks Preston Timmons for the report.

Backport of 1563b89 from master
 2015-05-04 07:39:28 +02:00
Tim Graham 556b1c8ad3 [1.8.x] Fixed model_regress test failure on non-ASCII path; refs #24717. 
Backport of 29e90f3ae0 from master
 2015-04-30 08:13:30 -04:00
Markus Holtermann bf4dc5733f [1.8.x] Fixed #24725 -- Allowed renaming of target models in ManyToMany relations 
This is a regression caused by introducing rendered migration states in
1aa3e09c20 and the _meta refactoring in fb48eb0581.

Thanks to Danilo Bargen for reporting the issue and Marten Kenbeek and
Tim Graham for triaging the bug and providing the initial test case.

Backport of 63f9b633f9 from master
 2015-04-30 13:46:24 +02:00
David D. Riddle 8c58caaf9d [1.8.x] Fixed #24717 -- Fixed model_regress test failure on RHEL6 SCL 
The test failed on RHEL6 systems running python 2.7 from a RedHat
Software Collection (SCL) because this test runs an external python
script with a stripped system environment. RedHat SCLs work by setting
a number of system environment variables when these are stripped out by
this test the python 2.7 interpreter is no longer able to function
properly because it can not find the system libraries needed.

Now we use use mock to modify the system environment directly.

Backport of 31e6c9c8e3 from master
 2015-04-29 12:28:39 -04:00
Aric Coady b67bd1b483 [1.8.x] Fixed #24719 -- Restored the ability to use interators as queryset related object filters. 
Backport of 9c2d8cde77 from master
 2015-04-28 11:00:58 -04:00
Alasdair Nicol c37eb3c870 [1.8.x] Fixed #24714 -- Used more specific assertions than assertEqual in tests. 
Backport of eaeea6f947 from master
 2015-04-28 09:31:35 -04:00
Alasdair Nicol 5105c1628d [1.8.x] Used assertIsInstance in tests. 
Backport of d91321e8be from master
 2015-04-27 08:42:52 -04:00
Markus Holtermann 419f296259 [1.8.x] Fixed #24701 -- Converted model manager names to unicode in migrations 
Thanks to Reto Aebersold for reporting the issue and Tim Graham and
Claude Paroz for the review.

Backport of faad6070ee from master
 2015-04-25 18:18:40 +02:00
Markus Holtermann 0cacb8f8ba [1.8.x] Fixed #24573 -- Considered new related models for reloading 
Thanks tttomekkk for the report.

Backport of b93690c465 from master
 2015-04-21 12:06:11 +02:00
Yoong Kang Lim b8f203b3f2 [1.8.x] Fixed #24667 --- Repaired model_fields cardinality test 
Backport of 36eab95e7f from master
 2015-04-20 09:41:38 -04:00
Claude Paroz ff6e8681a3 [1.8.x] Fixed #24658 -- Added missing Meta attribute in schema tests 
Without that, the Note model would be initially created and then
the tests using that model failed when run in isolation.
Backport of f54c0ec06e from master.
 2015-04-19 00:08:21 +02:00
Shai Berger 8363f217f2 [1.8.x] Fixed #24595 Oracle test failure 
The only problem for Oracle was the test, which tested nullity on
text/char fields -- but Oracle interprets_empty_strings_as_null.

Backport of d5a0acc from master
 2015-04-18 18:55:54 +03:00
Claude Paroz bbfcd9618b [1.8.x] Fixed #24595 -- Prevented loss of null info in MySQL field alteration 
Thanks Simon Percivall for the report, and Simon Charette and Tim
Graham for the reviews.
Backport of 02260ea3f6 from master.
 2015-04-17 11:01:36 +02:00
Tim Graham d0b18542f7 [1.8.x] Fixed gis_tests when run without GIS dependencies. 
Backport of ed336a1a5d from master
 2015-04-16 20:01:30 -04:00
Anssi Kääriäinen 581afddc77 [1.8.x] Fixed #24605 -- Fixed incorrect reference to alias in subquery. 
Thanks to charettes and priidukull for investigating the issue, and to
kurevin for the report.

Backport of 355c5edd93 from master
 2015-04-16 09:31:29 -04:00
Anssi Kääriäinen 70ff455a35 [1.8.x] Fixed #24615 -- ordering by expression not part of SELECT 
Fixed queries where an expression was used in order_by() but the
expression wasn't in the query's select clause (for example the
expression could be masked by .values() call)

Thanks to Trac alias MattBlack85 for the report.
Backport of fb5c7748da from master.
 2015-04-16 09:42:42 +02:00
Jon Dufresne c38d8f0f87 [1.8.x] Fixed model_fields tests to use django TestCase. 
Backport of 97bb48d9ba from master
 2015-04-15 08:19:55 -04:00
Markus Holtermann 584c6591a3 [1.8.x] Refs #24625 -- Filtered docutils warnings output in tests 
Instead of setting ``warning_stream`` in the docutils config overrides
to ``False`` I opted for filtering the stderr in the tests to keep the
error output showing up in server logs.

Thanks Tim Graham for the report and review

Backport of 3caf7efb44 from master
 2015-04-14 11:27:57 +02:00
Jay Wineinger 496800b3bf [1.8.x] Fixed #24611 -- Fixed update() crash with related UUID pk object. 
Backport of 923da0274a from master
 2015-04-13 12:20:41 -04:00
Markus Holtermann 3862826fed [1.8.x] Fixed #24625 -- Prevented arbitrary file inclusion in admindocs 
Thanks Tim Graham for the review.

Backport of 09595b4fc6 from master
 2015-04-11 21:12:09 +02:00
Claude Paroz 774d09a7dd [1.8.x] Fixed #24624 -- Replaced obsoleted rel.opts in admindocs view 
Thanks Scott Sanders for the report, and Markus Holtermann and
Tim Graham for the reviews. Refs #24381.
Backport of 4e7ed8d0d from master.
 2015-04-11 15:34:02 +02:00
Tim Graham b1dc128a03 [1.8.x] Fixed #24578 -- Fixed crash with QuerySet.update() on FK to O2O fields. 
Thanks Anssi Kääriäinen for review.

Backport of 10b4c010ab2cdaa6ba8bfaec3e3540299ea77be from master
 2015-04-09 08:24:07 -04:00
Patryk Zawadzki 9f632dc702 [1.8.x] Fixed #24513 -- Made sure a model is only rendered once during reloads 
This also prevents state modifications from corrupting previous states.
Previously, when a model defining a relation was unregistered first,
clearing the cache would cause its related models' _meta to be cleared
and would result in the old models losing track of their relations.

Backport of 0385dad073 from master
 2015-04-07 14:56:33 +02:00
Jon Dufresne 551d4bb46a [1.8.x] Fixed #24584 -- Fixed microsecond handling with older MySQLdb 
Backport of 2cf58e80d from master.
 2015-04-06 22:45:36 +02:00
Marten Kenbeek 773387ce42 [1.8.x] Fixed #24278 -- Fixed serialization of migration operations. 
Fixed MigrationWriter.serialize() to correctly handle migration
operations by utilizing OperationWriter.

Thanks Piotr Maliński for the report.

Backport of e8e4f978dd from master
 2015-04-05 20:29:27 +02:00
Marten Kenbeek 651cc369ad [1.8.x] Refs #24278 -- Allowed multi-line serializations in OperationWriter. 
Changed OperationWriter to support multi-line serialized values with
correct indentation.

Backport of d597174bd4 from master
 2015-04-05 20:29:21 +02:00
Tim Graham 3313156d8e [1.8.x] Fixed flake8 warning. 2015-04-04 07:50:53 -04:00
Claude Paroz 3a76276212 [1.8.x] Fixed #24569 -- Made some translation functions accept None value 
get_language() can return None when translations are deactivated.
Thanks Nicola Peduzzi for the reporti and Tim Graham for the review.
Backport of 7a0d9b5cda from master.
 2015-04-04 10:58:54 +02:00
Claude Paroz 7821f856a6 [1.8.x] Fixed #24571 -- Restored testserver positional arguments parsing 
Thanks Domas Lapinskas for the report and Tim Graham for the
review.
Backport of 426b63ba04 from master.
 2015-04-04 10:48:40 +02:00
Baptiste Mispelon 09188b5024 [1.8.x] Fixed #24566 -- Added support for serializing timedelta 
Thanks to knbk for the report.

Backport of 30a3c2f74c from master.
 2015-04-02 17:41:08 +02:00
Tim Graham e7366ab1f9 [1.8.x] Fixed mistakes in tests unveiled by version bump to 1.8.1. 2015-04-02 07:01:42 -04:00
Claude Paroz 70c5031d56 [1.8.x] Adapted form regression test to new translations 
Backport of 2112b7d78 from master.
 2015-04-01 19:53:11 +02:00
Tim Graham 5a4f95805f [1.8.x] Refs #24538 -- Simplified a test per Aymeric's feedback. 
Backport of a184a99123 from master
 2015-04-01 13:19:57 -04:00
Tim Graham 5c63c45512 [1.8.x] Fixed #23441, #24555 -- Improved the behavior of InclusionNode. 
This change:

* Makes the InclusionNode cache-safe by removing render-time side effects
  to its nodelist.
* Ensures the render_context stack is properly scoped and reset by updating
  the render call to use Template.render rather than Nodelist.render.

Backport of 0808ccce38 from master
 2015-04-01 13:12:18 -04:00
Tim Heap ff8eabc5cc [1.8.x] Fixed #24538 -- Allowed self in Jinja context 
Rendering a Jinja template with self in the context threw an error.
While self is a reserved variable in Jinja, including self in the
context is not an error, so Django should respect that.

Backport of 4ea1909d3c from master
 2015-04-01 12:27:52 -04:00
Tim Graham 7b9f7b6670 [1.8.x] Fixed sessions test on Python 3.5; refs #23763. 
SimpleCookie.__repr__() changed in
https://hg.python.org/cpython/rev/88e1151e8e02

Backport of 4e59156c10 from master
 2015-03-31 08:41:31 -04:00
Tim Graham c0102dc7ff [1.8.x] Fixed skipping of gis_tests when dependencies not installed. 
Backport of ba1665ed75 from master
 2015-03-28 09:39:49 -04:00
Moritz Sichert 44a05a8a91 [1.8.x] Fixed #24469 -- Refined escaping of Django's form elements in non-Django templates. 
Backport of 1f2abf784a from master
 2015-03-27 20:01:41 -04:00