Aymeric Augustin
|
115318051c
|
[1.6.x] Replaced "not PY3" by "PY2", new in six 1.4.0.
Conflicts:
django/db/backends/oracle/base.py
django/db/backends/sqlite3/base.py
django/db/models/base.py
Backport of 365c3e8b from master.
|
2013-09-03 07:34:45 -05:00 |
|
Claude Paroz
|
4769db6b5f
|
Fixed #20321 -- Added missing key name in MergeDict KeyError message
Thanks mark.harviston et gmail.com for the report.
|
2013-04-26 08:59:34 +02:00 |
|
Anton Baklanov
|
59d127e45f
|
Fixed #20276 -- Implemented __bool__ for MergeDict
MergeDict evaluates now to False if all contained dicts are empty.
Thanks til for the report and the initial patch.
|
2013-04-19 10:08:16 +02:00 |
|
Preston Timmons
|
612ef3e5c9
|
Modified utils_tests for unittest2 discovery.
|
2013-04-12 15:31:58 -06:00 |
|