mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-28 20:16:19 +00:00
Code Issues 30 Releases Wiki Activity
15,904 Commits 28 Branches 426 Tags 680 MiB
4fcc1e4ad8
Commit Graph

4654 Commits

Author SHA1 Message Date
Tim Graham
789d8f0748 Fixed syntax error on Python 3.2; refs #20889. 2013-09-09 09:54:08 -04:00
Curtis Maloney
7c6f2ddcd9 Simplify FilterExpression.args_check 2013-09-09 09:03:50 -04:00
Daniel Boeve
6dca603abb Fixed #20889 -- Prevented email.Header from inserting newlines 
Passed large maxlinelen to email.Header to prevent newlines from being
inserted into value returned by _convert_to_charset

Thanks mjl at laubach.at for the report.
 2013-09-09 08:47:41 -04:00
Tim Graham
aeed2cf3b2 Added a test to show that the user.is_staff check in admin base.html is necessary. 
refs #21067
 2013-09-09 07:59:35 -04:00
Baptiste Mispelon
28a571348b Fix #20745: Don't silence TypeError raised inside templates. 
Thanks to robin for the report and claudep for the review.
 2013-09-08 22:05:35 +02:00
Alex Gaynor
9d11522599 Removed some more unused local vars 2013-09-08 12:20:01 -07:00
Aymeric Augustin
c687bf0620 Further hardening. Refs #18766. 2013-09-08 20:43:04 +02:00
Aymeric Augustin
1a1e14786a Hardened the test introduced in ded11aa6. Refs #18766. 
Inputs acceptable to time.mktime are platform-dependent.
 2013-09-08 19:40:42 +02:00
Alex Gaynor
96fd5557f9 Removed a ton of unused local vars 2013-09-08 08:05:16 -07:00
Aymeric Augustin
ded11aa620 Fixed #18766 -- Pointed to pytz when LocalTimezone fails. 
Thanks void for the report.
 2013-09-08 02:04:43 -05:00
Pablo Mouzo
b11564fd36 Fixed #16869 -- BaseGenericInlineFormSet.save_new should use form's save() method 
Thanks mattaustin for the report and Pablo Recio (pyriku) for the patch.
 2013-09-07 20:00:38 -04:00
Alex Gaynor
c348550d35 Fixed some flake8 warnings 2013-09-07 15:36:00 -07:00
Juan Catalano
04415bf81b Fixed #21013 -- Ensure that ModelAdmin.get_queryset is considered for the admin history view. 2013-09-07 14:53:29 -05:00
Julien Phalip
8ef060e0e6 Fixed a test failure introduced in 55a11683f7. 2013-09-07 12:41:33 -05:00
Julien Phalip
55a11683f7 Fixed #20836 -- Ensure that the ForeignKey's to_field attribute is properly considered by the admin's interface when creating related objects. 
Many thanks to Collin Anderson for the report and patch and to Peter Sheats for the test.
 2013-09-07 12:14:07 -05:00
Aymeric Augustin
65b6eff322 Fixed #20530 -- Properly decoded non-ASCII query strings on Python 3. 
Thanks mitsuhiko for the report.

This commit just adds a test since the problem was fixed in 8aaca651.
 2013-09-07 11:47:38 -05:00
Andrew Godwin
bacbbb481d RunSQL migration operation and alpha SeparateDatabaseAndState op'n. 2013-09-07 11:03:38 -05:00
Aymeric Augustin
f5add4712f Fixed tests introduced in previous commit on Python 2. Refs #20557. 2013-09-07 10:43:44 -05:00
Aymeric Augustin
8aaca651cf Fixed #20557 -- Properly decoded non-ASCII cookies on Python 3. 
Thanks mitsuhiko for the report.

Non-ASCII values are supported. Non-ASCII keys still aren't, because the
current parser mangles them. That's another bug.
 2013-09-07 10:25:43 -05:00
Alex Gaynor
97a626d898 Fixed this syntax error on py32 2013-09-06 21:56:57 -07:00
Aymeric Augustin
a9589dd280 Fixed #21032 -- pip 1.4 can't install pytz. 2013-09-06 22:11:55 -05:00
Eric Boersma
ded40142a9 Fixed #20007 -- Configured psycopg2 to return UnicodeArrays 
Thanks hogbait for the report.
 2013-09-06 20:43:58 -04:00
Russell Keith-Magee
926bc421d9 Merge pull request #1566 from adamsc64/ticket_11857 
Fixed #11857 -- Added missing 'closed' property on TemporaryFile class.
 2013-09-06 17:38:37 -07:00
Tim Graham
b7451b72ed Fixed deprecation warning on Python 3 2013-09-06 20:36:17 -04:00
Loic Bistuer
adc0ab3386 Fixed #21037 -- Made MigrationWriter raise a ValueError when serializing lambda functions. 2013-09-06 20:13:01 -04:00
Tim Graham
67863b3bfe Fixed test failure introduced in efd1e6096e (sqlmigrate) 2013-09-06 19:59:25 -04:00
Russell Keith-Magee
4f5faa1916 Merge pull request #1582 from rca/12756-missing-yaml-module-serializer-error-message 
Fixed #12756: Improved error message when yaml module is missing.
 2013-09-06 16:05:02 -07:00
Roberto Aguilar
01a5359477 Cleanup commit after peer review. 2013-09-06 22:45:31 +00:00
Russell Keith-Magee
9b2dc12b83 Merge pull request #1580 from ianawilson/ticket_16502 
Fixed #16502 -- Fixed a TemplateDoesNotExist error that should be an ImproperlyConfigured.

Assistance on the patch from #jambronrose.
 2013-09-06 15:31:25 -07:00
Roberto Aguilar
9587d4eea0 Fixed existing tests to handle BadSerializer. 
When a BadSerializer instance is stubbed in for the yaml serializer,
make sure tests do not fail.
 2013-09-06 22:26:13 +00:00
Roberto Aguilar
ca3ac4a3e3 Updated NoYamlSerializerTestCase to run with yaml. 
In order to verify the behavior of using the yaml serializer when yaml
is on the system, fake the ImportError when the serializer is being
registered.
 2013-09-06 22:26:13 +00:00
Ian Wilson
d005130845 fixed test name from an old, overly specific iteration of the test 2013-09-06 17:20:43 -05:00
Aymeric Augustin
b4cd8169de Fixed #11811 -- Data-loss bug in queryset.update. 
It's now forbidden to call queryset.update(field=instance) when instance
hasn't been saved to the database ie. instance.pk is None.
 2013-09-06 17:15:23 -05:00
Russell Keith-Magee
122020fdb9 Merge pull request #1579 from ianawilson/ticket_21058 
Fixed #21058 -- Fixed debug view blowing up when no template is provided to the template rendering functions.

Assistance on this commit from @jambonrose.
 2013-09-06 15:06:57 -07:00
Ian Wilson
e12de0ac04 Removed unnecessary, leftover imports 2013-09-06 22:04:58 +00:00
Adrian Holovaty
e844e10b4f Moved a settings usage up the stack in utils/formats.py #unsettings 2013-09-06 17:01:36 -05:00
Ian Wilson
b79df0b358 adds fix for SingleObjectTemplateResponseMixin raising a TemplateDoesNotExist when it should have raised an ImproperlyConfigured. fixes 16502. by @ianawilson, @jambonrose 2013-09-06 16:27:34 -05:00
Julien Phalip
d5df914fe1 Merge pull request #1578 from rmutter/ticket_20821 
Fixed #20821 -- Added tooltips to Admin SelectBox widget
 2013-09-06 14:03:58 -07:00
Ian Wilson
9b7f4aab32 adds fix and test for when a template is not specified at all to render(). fixes #21058. by jambonrose and ianawilson 2013-09-06 15:50:18 -05:00
Rudy Mutter
c438cc2a36 Fixed #20821 -- Added tooltips to Admin SelectBox widget 
The Admin widget, which can be used to filter multiple selects
can sometimes be too narrow and hide information such as
user permissions. This commit adds tooltips to the select
options so that a user can hover over and see the hidden text.
 2013-09-06 15:46:38 -05:00
Andrew Godwin
efd1e6096e Adding 'sqlmigrate' command and quote_parameter to support it. 2013-09-06 15:28:12 -05:00
Roberto Aguilar
d8d61d8260 Added tests for missing pyyaml. 
This test makes sure an YAML import errors are communicated to the
caller rather than stating the serializer does not exist.
 2013-09-06 20:23:27 +00:00
Dan Johnson
df462cf760 Fixed #21043 -- Made resolve() handle reverse_lazy objects. 
Thanks Keryn Knight for the report.
 2013-09-06 15:46:43 -04:00
Florian Apolloner
85359ec9a4 Merge branch 't20812' 2013-09-06 21:03:46 +02:00
Daniel Langer
cc957cb16c Fixed #4287 -- Fixed NaN and +/- Infinity handling in FloatField 
NaN, +Inf, and -Inf are no longer valid values for FloatFields.
 2013-09-06 14:56:37 -04:00
Christopher Adams
b2f5ac1656 Fixed #11857 -- Added missing 'closed' property on TemporaryFile class. 
- TemporaryFile now minimally mocks the API of the Python standard
  library class tempfile.NamedTemporaryFile to avoid AttributeError
  exceptions.
- The symbol django.core.files.NamedTemporaryFile is actually assigned
  as a different class on different operating systems.
- The bug only occurred if Django is running on Windows, hence why it
  was hard to diagnose.
 2013-09-06 14:32:46 -04:00
Andrew Godwin
05e14e8eaf Migration autodetector now corerctly deals with proxy models 2013-09-06 12:39:46 -05:00
Florian Apolloner
2326dedde8 Fixed #20812 -- Error out if __unicode__/__str__ doesn't return a text type. 2013-09-06 19:24:18 +02:00
Andrew Godwin
be983ee403 Also test failure case of ProjectState dependency resolution 2013-09-06 12:18:24 -05:00
Andrew Godwin
cdeff3acc2 Project/ModelState now correctly serialize multi-model inheritance 2013-09-06 12:16:03 -05:00
Andrew Godwin
6f7977bb63 Fixed #21029: Test for previously-commited SchemaEditor.__exit__ bug. 2013-09-06 12:16:03 -05:00
Chris Wilson
eade315da1 Fixed #10164 -- Made AutoField increase monotonically on SQLite 
Thanks malte for the report.
 2013-09-06 12:31:17 -04:00
Aymeric Augustin
e492ab8e7e Fixed #18719 -- Made force_bytes more consistent with force_text. 2013-09-06 10:28:28 -05:00
Markus Holtermann
bd8e1a354c Fixed #20977 -- Fixed writing migrations to disk on Python 3 2013-09-06 09:51:58 -04:00
Preston Timmons
8625c7aab3 Fixed #16096 -- Added origin attribute to template instances. 
Thanks jdunck for the suggestion.
 2013-09-06 09:14:52 -04:00
Loic Bistuer
e1266e50b2 Fixed #21015 -- Fixed MigrationLoader when importlib.import_module returns a file module or an empty directory. 2013-09-06 08:30:19 -04:00
Loic Bistuer
82bbb9fe81 Fixed #21014 -- Fixed gobbled ImportError in MigrationLoader. 2013-09-06 08:30:18 -04:00
Eric Boersma
4d13cc56de Fixed #21035 -- Changed docs to treat the acronym SQL phonetically. 
The documentation and comments now all use 'an' to
refer to the word SQL and not 'a'.
 2013-09-05 20:14:58 -04:00
Aymeric Augustin
6a6428a36f Took advantage of django.utils.six.moves.urllib.*. 2013-09-05 14:39:23 -05:00
Tim Graham
bab039d74c Fixed #21041 -- Removed a duplicate form in tests. 
Thanks tuxcanfly.
 2013-09-05 05:49:10 -04:00
Loic Bistuer
34d52fd32e Fixed #21010 -- Changed ModelState to only copy _meta.local_fields. 2013-09-04 14:05:59 -04:00
Tim Graham
5649c0af9d Fixed "indentation is not a multiple of four" pep8 issues. 2013-09-03 14:22:21 -04:00
Tim Graham
cb98ffe8f4 Fixed a couple unclosed file warnings in tests 2013-09-03 13:37:27 -04:00
Tim Graham
3db66b1d65 Updated syncdb -> migrate in tests. 2013-09-03 11:51:34 -04:00
Tim Graham
86964a7b4f Silenced deprecation warning regarding old SQL location; refs #14300 2013-09-03 11:10:43 -04:00
Tim Graham
2fd03b39ab Removed references to django.utils.unittest which is PendingDeprecation 2013-09-03 09:55:21 -04:00
Tim Graham
ec784c486b Silenced deprecation warnings in SortedDict tests; refs [07876cf02b] 2013-09-03 09:48:46 -04:00
Aymeric Augustin
365c3e8b73 Replaced "not PY3" by "PY2", new in six 1.4.0. 2013-09-02 12:11:02 +02:00
Ramiro Morales
41feab3654 Converted tests for admin first form widget auto-focus to Selenium. 
Refs #1707 and 1c0c879be3.
 2013-09-01 15:07:08 -03:00
Ramiro Morales
c01cd4c423 Change test added in 3e34005b1b to be more stable. 
It could fail when actual serialization JSON field ordering was
different from the hard-coded one. Refs #13182.
 2013-09-01 10:47:35 -03:00
Loic Bistuer
ff9e116198 Fixed #21008 -- Made MigrationWriter handle Promise objects. 2013-08-31 20:26:44 -04:00
Ramiro Morales
e909ceae9b Made django.test.testcases not depend on staticfiles contrib app. 
Do this by introducing a django.contrib.staticfiles.testing.StaticLiveServerCase
unittest TestCase subclass.

Fixes #20739.
 2013-08-31 11:02:32 -03:00
Claude Paroz
e0643cb676 Properly skipped yaml tests when not installed 2013-08-31 15:23:56 +02:00
Claude Paroz
3e34005b1b Fixed #13182 -- Prevented trailing spaces in indented json output 
Thanks Stéphane Raimbault for the report and the initial patch.
 2013-08-31 15:18:01 +02:00
Carl Meyer
7211741fc5 Fixed #20999 - Allow overriding formfield class with choices, without subclass restrictions. 
Refs #18162. Thanks claudep and mjtamlyn for review.
 2013-08-30 17:43:10 -06:00
Claude Paroz
b04f8ddbaa Fixed #21005 -- Made schema tests language-independent 
Thanks Simon Charette for the review.
 2013-08-30 21:28:21 +02:00
Simon Charette
11cd7388f7 Fixed #20989 -- Removed useless explicit list comprehensions. 2013-08-30 10:57:51 -04:00
Curtis Maloney
e2f06226ea Improved {% include %} implementation 
Merged BaseIncludeNode, ConstantIncludeNode and Include node.

This avoids raising TemplateDoesNotExist at parsing time, allows recursion
when passing a literal template name, and should make TEMPLATE_DEBUG behavior
consistant.

Thanks loic84 for help with the tests.

Fixed #3544, fixed #12064, fixed #16147
 2013-08-30 10:36:36 +03:00
Anssi Kääriäinen
e973ee6a98 Fixed #20988 -- Added model meta option select_on_save 
The option can be used to force pre 1.6 style SELECT on save behaviour.
This is needed in case the database returns zero updated rows even if
there is a matching row in the DB. One such case is PostgreSQL update
trigger that returns NULL.

Reviewed by Tim Graham.

Refs #16649
 2013-08-30 09:41:07 +03:00
Simon Charette
36bbe3b7c5 Altered test introduced in f19a3669b8 for the sake of readability. refs #14786 2013-08-29 14:50:55 -04:00
Tim Graham
f19a3669b8 Fixed #14786 -- Fixed get_db_prep_lookup calling get_prep_value twice if prepared is False. 
Thanks homm for the report and Aramgutang and lrekucki for work on
the patch.
 2013-08-29 11:13:34 -04:00
Tim Graham
af953c45cc Fixed #16433 -- Fixed a help_text/read only field interaction that caused an admin crash. 
Thanks chris at cogdon.org for the report and admackin for the patch.
 2013-08-29 09:39:31 -04:00
Tim Graham
cf8d6e9108 Fixed #20881 -- Removed contrib.auth.models.AbstractUser.get_absolute_url() 
The definition is arbitrary and creates a broken "view on site"
link in the admin if a project doesn't define such a URL.
 2013-08-29 06:36:35 -04:00
Curtis Maloney
8d473b2c54 Fixed #7116 -- Optimize RequestContext construction 2013-08-29 10:25:56 +03:00
Curtis Maloney
5cdacbda03 Fixed #17356 -- Allowed {% include %} to render compiled templates 
Reviewed by Loic Bistuer and Tim Graham.
 2013-08-29 10:22:24 +03:00
Loic Bistuer
da800be6dd Fixed #20986 -- Enabled SelectDateWidget to use custom months 
Reviewed by Trac alias MarkusH.
 2013-08-28 16:39:26 +03:00
Warren Smith
dd3a883894 Fixed #20693 -- Add timezone support to built-in time filter. 
Modified django.utils.dateformat module, moving __init__() method and
timezone-related format methods from DateFormat class to TimeFormat
base class. Modified timezone-related format methods to return an
empty string when timezone is inappropriate for input value.
 2013-08-26 16:15:53 -05:00
Ramiro Morales
b785a80d19 Added further fixes, tests for #19949/f33db5a09a. 
Thanks Susan Tan. Refs #19949.
 2013-08-26 08:47:24 -03:00
Ramiro Morales
51a9a5980a Made coverage ignore files without associated source code. 
This only affests reporting not data collection and allows coverage.py
to succesfully finish the generation of e.g. the HTML report.

Cases of code whose execution data is collected during the run phase but
for which no associated source code files can be found at the reporting
phase include tests with egg files and Python module files created at
test execution-time.
 2013-08-25 22:29:43 -03:00
Ramiro Morales
72712755c4 Ignore coverage HTML report output dir in tests. 
Added it to the list of dirs ignored by tests/runtests.py.
 2013-08-25 19:09:03 -03:00
Christopher Medrela
32a962bdbf Fixed #20814 -- Improved model field accessor clash error messages 
Thanks shai for the suggestion.
 2013-08-24 18:00:23 -04:00
Claude Paroz
f4e9804567 Fixed #20961 -- Fixed HttpResponse default empty content 
Thanks epandurski at gmail.com for the report.
 2013-08-24 18:10:12 +02:00
SusanTan
f33db5a09a Fixed 19949 -- Cached template loader now caches TemplateDoesNotExist 
Thanks @timgraham and @jdunck for the code reviews and Kronuz for bug
report and initial patch.
 2013-08-24 09:19:55 -04:00
Alex Gaynor
8363406dad Removed usage of u"" string prefix, which doesn't work on python3.2 2013-08-23 04:56:37 -07:00
Andrew Godwin
5569b0b92f Merge remote-tracking branch 'core/master' into schema-alteration 
Conflicts:
	django/db/backends/oracle/base.py
	django/db/backends/postgresql_psycopg2/base.py
	django/db/models/signals.py
	tests/queries/tests.py
 2013-08-23 12:36:53 +01:00
Andrew Godwin
ac45f9c9c5 Fix some small errors in the tests 2013-08-23 12:07:43 +01:00
Tim Graham
b0ce6fe656 Fixed #20922 -- Allowed customizing the serializer used by contrib.sessions 
Added settings.SESSION_SERIALIZER which is the import path of a serializer
to use for sessions.

Thanks apollo13, carljm, shaib, akaariai, charettes, and dstufft for reviews.
 2013-08-22 13:58:26 -04:00
Lukasz Balcerzak
9d1987d767 Fixed #19303 -- Fixed ModelAdmin.formfield_overrides on fields with choices 2013-08-22 11:50:52 -04:00
Rainer Koirikivi
65cf82bd08 Fixed #20934 -- Avoided NoReverseMatch in ModelAdmin.changelist_view 
The view tried to display links to a ModelAdmin's change_view, which
resulted in NoReverseMatches if get_urls was overridden to remove the
corresponding url.
 2013-08-22 10:08:54 -04:00
Anssi Kääriäinen
6af05e7a0f Fixed model.__eq__ and __hash__ for no pk value cases 
The __eq__ method now considers two instances without primary key value
equal only when they have same id(). The __hash__ method raises
TypeError for no primary key case.

Fixed #18864, fixed #18250

Thanks to Tim Graham for docs review.
 2013-08-22 17:24:07 +03:00