4a2e80fff4
Merge branch 'master' of github.com:django/django into schema-alteration
...
Conflicts:
django/db/backends/postgresql_psycopg2/base.py
2012-07-26 18:58:10 +01:00
ab6cd1c839
[py3] Updated dict-like data structures for Python 3.
...
The keys/items/values methods return iterators in Python 3, and the
iterkeys/items/values methods don't exist in Python 3. The behavior
under Python 2 is unchanged.
2012-07-25 22:58:48 +02:00
4b5cb116e3
Fixed error message in detail generic view.
...
Thanks go to mitar for the report and the patch.
2012-07-25 22:46:57 +02:00
7d06f975fe
Fixed #18614 -- Added missing imports in code samples.
2012-07-25 22:32:53 +02:00
a875f612e0
Fixed #18634 -- Don't escape variables in the context for startproject/startapp.
...
The & symbols which can come up in the secret key were
being escaped to &.
2012-07-25 22:24:41 +02:00
59d99772f0
Merge pull request #216 from ljosa/ticket_18644
...
Fixed #18644 -- Made urlize trim trailing period followed by parenthesis
2012-07-25 13:22:49 -07:00
51a010135c
Merge pull request #220 from dirn/staticfiles-docs-typo
...
Fix typo in staticfiles app documentation
2012-07-25 13:20:44 -07:00
4865274bc1
Merge pull request #224 from reclosedev/patch-1
...
Documentation: Fix link to uWSGI deployment
2012-07-25 13:18:11 -07:00
5ee8c3ef0c
Merge pull request #230 from pjdelport/cleanup
...
Cleanup
2012-07-25 13:07:10 -07:00
98c7ad444c
Merge pull request #228 from nklas/master
...
Documentation: Fixed a typo in docs/releases/1.4.txt
2012-07-25 13:06:58 -07:00
c4be14bd32
Merge pull request #232 from yohanboniface/ticket18667
...
Ticket 18667: fix typo in CBV doc
2012-07-25 12:56:08 -07:00
9d246e0f9f
Merge pull request #231 from kevin1024/master
...
Documentation fix - Change the word "brackets" to "parentheses"
2012-07-25 12:54:09 -07:00
f3c9a16a42
Fixed QueryDict.setlistdefault.
...
It was broken by a seemingly innocuous change in MultiValueDict.
Document the pitfall for now. This is fragile and should be
considered for refactoring.
2012-07-25 19:10:40 +02:00
69f4856f23
Fixed a typo in the admin reference docs.
...
Thanks Yohan Boniface for the report.
2012-07-25 10:57:30 +02:00
206c248f1e
Ticket 18667: fix typo in CBV doc
2012-07-25 10:44:43 +02:00
942818e1b3
Rolled back a unnecessary change in 8f002867b2.
...
This keeps the implementation of setdefault and setlistdefault
consistent. Also it's marginally faster than looking up the value
again.
2012-07-25 10:16:35 +02:00
82292141a0
Made staticfiles tests independent of test execution order.
2012-07-25 10:00:23 +02:00
c7ac44e64b
Update docs/topics/signals.txt
...
Fixed a typo.
2012-07-25 13:20:26 +07:00
c3a05d8794
Changed the word "brackets" to "parentheses"
...
I want to change the word "brackets" to "parentheses" because when I think
of brackets, I think of [], and when I think of parentheses, I think of (),
and when I originally read this, I found the word confusing.
2012-07-24 16:55:08 -10:00
ace9ccfe9f
Fixed #18666 -- when upgrading a user's password to a new algorithm only save the password field to the databaes.
2012-07-24 19:03:26 -07:00
50837434db
Clarified default name of M2M relationship DB table.
2012-07-24 22:44:28 -03:00
f1128e5474
Fix typo.
2012-07-25 01:21:16 +02:00
487b92a13c
it's -> its
2012-07-25 01:21:15 +02:00
f758bdab5e
Fixed #18271 -- Changed stage at which TransactionTestCase flushes DB tables.
...
Previously, the flush was done before the test case execution and now
it is performed after it.
Other changes to the testing infrastructure include:
* TransactionTestCase now doesn't reset autoincrement sequences either
(previous behavior can achieved by using `reset_sequences`.)
With this, no implicit such reset is performed by any of the provided
TestCase classes.
* New ordering of test cases: All unittest tes cases are run first and
doctests are run at the end.
THse changes could be backward-incompatible with test cases that relied
on some kind of state being preserved between tests. Please read the
relevant sections of the release notes and testing documentation for
further details.
Thanks Andreas Pelme for the initial patch. Karen Tracey and Anssi
Kääriäinen for the feedback and Anssi for reviewing.
This also fixes #12408 .
2012-07-24 17:24:16 -03:00
6006c1f076
Fixed a small typo.
2012-07-25 01:45:56 +07:00
38ce709fe4
Added tests for deprecation warnings and fixed the argument order for the warnings.
2012-07-24 07:01:57 -07:00
ae4125ffce
Removed a Python 3-compatibility hack.
...
Thanks Preston Holmes for the patch.
2012-07-23 13:48:04 +02:00
ebc89a800a
Fixed a broken link in the Python 3 docs.
...
Thanks ptone for the report.
2012-07-22 19:48:10 +02:00
690cabe203
Used a Python 3-compatible syntax for building a translation table
2012-07-22 18:05:53 +02:00
cc65f4ec8d
Documentation: Fix link to uWSGI deployment
2012-07-22 18:54:47 +04:00
00ace01411
[py3] Documented coding guidelines for Python 3.
2012-07-22 10:29:07 +02:00
a84d79f572
[py3] Added Python 3 compatibility for xrange.
2012-07-22 09:29:56 +02:00
ca07fda2ef
[py3] Switched to Python 3-compatible imports.
...
xrange/range will be dealt with in a separate commit due to the huge
number of changes.
2012-07-22 09:29:56 +02:00
0d914d08a0
[py3] Updated urllib/urllib2/urlparse imports.
...
Lots of functions were moved. Use explicit imports in all cases
to keey it easy to identify where the functions come from.
2012-07-22 09:29:55 +02:00
bdca5ea345
[py3] Replaced unicode/str by six.text_type/bytes.
2012-07-22 09:29:54 +02:00
3cb2457f46
[py3] Replaced basestring by six.string_types.
2012-07-22 09:29:54 +02:00
cacd845996
[py3] Fixed remaining Python 3 syntax errors.
...
django.utils.unittest.* weren't touched -- they're only imported on Python 2.6.
2012-07-22 09:29:53 +02:00
56dbe924a6
[py3] Removed longs.
2012-07-22 09:29:53 +02:00
f1d5dc81ac
[py3] Switched to Python 3-compatible introspection.
2012-07-22 09:29:53 +02:00
d11d45aad9
[py3] Used six.with_metaclass wherever necessary.
2012-07-22 09:29:52 +02:00
7fa51a24a8
[py3] Exception aren't iterable in Python 3.
2012-07-22 09:29:52 +02:00
d796c94b03
[py3] Used six.reraise wherever necessary.
2012-07-22 09:29:52 +02:00
473d5f4ba1
[py3] Fixed django.utils.six.moves.
...
It didn't work because six was inside django.utils.
2012-07-22 09:29:51 +02:00
8b01909841
[py3] Bundled six for Python 3 compatibility.
...
Refs #18363 .
2012-07-22 09:29:44 +02:00
01c392623d
Fixed #10057 -- Ensured that the 'show_delete' context variable in the admin's change view actually controls the display of the delete button. Thanks to rajeesh for the report, to patcoll for the patch, and to David Gouldin for the test.
2012-07-21 18:10:24 -07:00
ea667ee3ae
Made LiveServerTestCase to restore state on exit.
...
The piece of state is DB connections' allow_thread_sharing attribute
which gets munged test are run when in-memory SQLite databases.
Thanks Anssi for suggesting the possible root cause and Julien for
implementing the fix.
2012-07-21 20:16:47 -03:00
2b6644388f
Fixed an `except` statement to be Python3-compatible. Thanks to charettes for the tip.
2012-07-21 15:13:55 -07:00
4ceb9db9d8
Removed u prefix on a unicode string.
2012-07-21 22:38:25 +02:00
1af0271d7c
Fixed #6170 -- Ensured that a useful exception is raised when a regex is invalid in the URLConf.
...
Thanks to abrahamson.j for the report, to guettli for initial work on the patch, and to David Gouldin for the new patch and test.
2012-07-21 13:30:34 -07:00
9ecd978e26
Re-added Windows line ending stripped in previous commit
...
Thanks Aymeric Augustin for noticing the issue.
2012-07-21 15:38:28 +02:00
Andrew Godwin
Aymeric Augustin
Florian Apolloner
Marc Tamlyn
Florian Apolloner
Alex Gaynor
James Bennett
Yohan Boniface
nklas
Kevin McCarthy
Ramiro Morales
Piet Delport
Claude Paroz
Roman Haritonov
Julien Phalip