mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 19 Releases Wiki Activity
12,848 Commits 28 Branches 421 Tags 659 MiB
Commit Graph

3456 Commits

Author SHA1 Message Date
Aymeric Augustin afc1bd7ab8 [py3] Made 212b9826bd Python 3-friendly 2012-08-18 17:51:16 +02:00
Marc Tamlyn f04bb6d798 Fixed #17228 -- params context variable is inconsistent 
Remove the params variable from the context and just put the variables
in directly.

This had not been committed previously as the original pattern was used
in the functional generic views and we wanted consistency between them,
but django.views.generic.simple.direct_to_template is now gone so we can
do it 'right'.
 2012-08-18 15:07:21 +01:00
Marc Tamlyn 212b9826bd Fixed #14516 -- Extract methods from removetags and slugify template filters 
Patch by @jphalip updated to apply, documentation and release notes
added.

I've documented strip_tags as well as remove_tags as the difference
between the two wouldn't be immediately obvious.
 2012-08-18 15:07:21 +01:00
Marc Tamlyn 58683e9c82 Fixed #16744 -- Class based view should have the view object in the context 
Updated the most recent patch from @claudep to apply again and updated
the documentation location.
 2012-08-18 15:07:21 +01:00
Aymeric Augustin 547b181046 [py3] Ported django.utils.safestring. 
Backwards compatibility aliases were created under Python 2.
 2012-08-18 16:04:06 +02:00
Marc Tamlyn bfa9fc69bf Fixed #18779 -- URLValidator can't validate url with ipv6. 
Validation is reasonably 'soft', as for the ipv4. False positives don't
matter too much here.
 2012-08-18 12:08:44 +01:00
Aymeric Augustin 85e7a5e140 [py3] Stopped attempting to translate bytes. 
That goes actively against the goal of cleaning string handling.
 2012-08-18 11:36:09 +02:00
Aymeric Augustin c03cf0b096 Cleaned up a test slightly. 
We should catch all exceptions in the thread to ensure it doesn't die
with an unhandled exception. The type of the exception is already
checked further in the test.
 2012-08-18 11:02:28 +02:00
Aymeric Augustin 6cb76cb140 [py3] Fixed templates tests. 2012-08-18 10:18:24 +02:00
Aymeric Augustin ad11dbf670 [py3] Fixed __unicode__ methods missed in d4a0b278 
due to non-standard syntax (a stray comma). Thanks dmishe for the report.
 2012-08-17 14:11:23 +02:00
Alex Gaynor 37a894b48c [py3k] Fixed pagination_regress tests. 2012-08-16 10:54:45 -04:00
Aymeric Augustin fcc8de0598 [py3] Ported django.core.servers. 2012-08-16 13:01:16 +02:00
Aymeric Augustin 8c356acf2e [py3] Fixed test_utils tests of doctests. 2012-08-16 10:26:18 +02:00
Aymeric Augustin e98cb05edf [py3] Fixed the str tests. 
These tests don't look very meaningful. They were ported from
doctests...
 2012-08-16 09:44:42 +02:00
Alex Gaynor befa1dd7a5 Fixed the generic_inline_admin tests for python3. 2012-08-15 23:12:08 -04:00
Alex Gaynor 0c257f5a23 Fixed the admin_changelist tests for python3. 2012-08-15 23:09:01 -04:00
Claude Paroz 24de85c419 [py3] Fixed more encoding issues in cache tests 2012-08-15 22:48:09 +02:00
Claude Paroz 37e05357cd Used settings config for memcached tests. 
By using settings config, we take advantage of custom settings like
KEY_PREFIX which allows for example to run tests in parallel.
 2012-08-15 22:48:09 +02:00
Aymeric Augustin f7c2e82d76 [py3] Fixed middleware tests. 
Removed several inappropriate .encode('utf-8') calls in the process.
 2012-08-15 22:42:18 +02:00
Claude Paroz 60f5e10230 [py3] Fixed dispatch tests 2012-08-15 18:19:21 +02:00
Claude Paroz 27192564c3 Run memcache tests if any cache is configured 2012-08-15 18:07:03 +02:00
Claude Paroz a9facb455f [py3] Fix some more encoding issues in tests 2012-08-15 17:41:38 +02:00
Claude Paroz 607665a396 [py3] Fixed bad unicode test 2012-08-15 16:40:12 +02:00
Florian Apolloner 0ab570217a [py3] Fixed paginator tests. 2012-08-15 14:58:43 +02:00
Florian Apolloner c1584890b1 [py3] Properly encode hashlib.md5 and zip.compress args in the tests. 2012-08-15 14:29:40 +02:00
Anssi Kääriäinen 5d01f3caea [py3] Removed map() calls used for side-effects only 2012-08-15 13:23:41 +03:00
Alex Gaynor 814fde32d9 Made the validation tests python3 friendly. 2012-08-15 03:02:32 -07:00
Alex Gaynor ea1e8b38b3 Ensured that the archive module consistantly explicitly closed all files. 2012-08-15 02:53:40 -07:00
Alex Gaynor ca6015ca71 Close files in the module_loading tests always. 2012-08-15 02:47:02 -07:00
Alex Gaynor fc99f127d8 Explicitly close a file during the email tests. 2012-08-15 02:16:28 -07:00
Alex Gaynor dfbcbf2124 Always close files in the file_storage tests. 2012-08-15 02:05:03 -07:00
Claude Paroz e0d67f3440 [py3] Fixed test_client_regress tests 2012-08-15 10:58:26 +02:00
Alex Gaynor cca01c96d1 Converted the modeladmin tests to run on python 2 and 3. 2012-08-15 01:46:31 -07:00
Alex Gaynor 54afdbf378 Fixed usage of several deprecated aliases in unittest. 2012-08-15 01:38:04 -07:00
Alex Gaynor 2048bbee8c Explicitly close files in the staticfiles tests. 2012-08-15 01:25:01 -07:00
Alex Gaynor c7734491f8 Use a name that exists in both python2 and 3, 2012-08-15 01:13:09 -07:00
Aymeric Augustin e0ec7507ac [py3] Fixed jsi18n test. 
Also refactored said test to avoid leaking state (ie. active
translation) when an error occurs.
 2012-08-15 09:45:28 +02:00
Aymeric Augustin 478a69314e [py3] Fixed uses of __metaclass__ in tests. 2012-08-15 00:31:29 +02:00
Chris Lawlor 450c0df653 [py3] Fixed modeltests.model_forms tests. 2012-08-14 23:46:23 +02:00
Claude Paroz 928baee747 [py3] Fixed conditional_processing tests 2012-08-14 23:35:12 +02:00
Claude Paroz 0120985095 [py3] Fixed file_uploads tests 2012-08-14 23:35:12 +02:00
Florian Apolloner 367bfaa522 Don't swallow AttributeError in core.urlresolvers.get_callable. 2012-08-14 21:23:25 +02:00
Claude Paroz f2fe7a3e36 [py3] Fixed serializers tests 2012-08-14 19:54:53 +02:00
Claude Paroz 7d48e077b5 [py3] Fixed staticfiles tests 2012-08-14 17:24:31 +02:00
Claude Paroz c2d59e5564 [py3] Fixed admin_views tests 
Also changed several occurrences of 'request' to 'response'.
 2012-08-14 14:45:28 +02:00
Aymeric Augustin d6b8b125fb [py3] Fixed admin_custom_urls tests. 2012-08-14 14:38:23 +02:00
Anssi Kääriäinen 5b27e6f64b [py3] Fixed comparison of list and range() 
A test compared list directly against a range(). This is py3
incompatible. Fixed by using list(range()).
 2012-08-14 15:28:55 +03:00
Anssi Kääriäinen 8fe03865f7 [py3] Fixed invalid use of dict.items() 
An ordering test had two problems related to dict.items() usage:
  - It assumed the order of the dict was non-randomized
  - It indexed to the dict.items() which is py3 incompatible.

I fixed the test by using dict['rank'] directly, where rank is the
column tested on the values queryset.
 2012-08-14 15:24:43 +03:00
Aymeric Augustin dcf72835e3 [py3] Ensured the template tests run. 2012-08-14 12:29:53 +02:00
Aymeric Augustin faf570df18 [py3] Compared response.content with bytes. 2012-08-14 12:29:53 +02:00
Aymeric Augustin e04230e2e4 [py3] Ported django.http according to PEP 3333. 
Perfomed some style cleanup while I was in the area.
 2012-08-14 10:32:16 +02:00
Claude Paroz 45baaabafb [py3] Fixed encoding issues in cache key generation 2012-08-13 12:56:59 +02:00
Claude Paroz d774ad752d [py3] Made csrf context processor return Unicode 2012-08-13 11:54:21 +02:00
Claude Paroz 73f0f18c8f [py3] Fixed admin_scripts tests 2012-08-13 10:58:21 +02:00
Claude Paroz 6d68022a27 [py3] Removed filename encoding in file_uploads test 2012-08-13 09:56:14 +02:00
Andrei Antoukh 99321e30ce Fixed #18306 -- Made deferred models issue update_fields on save 
Deferred models now automatically update only the fields which are
loaded from the db (with .only() or .defer()). In addition, any field
set manually after the load is updated on save.
 2012-08-12 22:39:27 +03:00
Anssi Kääriäinen 59a655988e Fixed #13844 -- Avoid converting unknown db values to float 
This patch removes an unconditional float(value) conversion from db
backend default convert_values() method. This can cause problems when
aggregating over character fields for example. In addition, Oracle
and SQLite already return the bare value from their convert_values().

In the long term the converting should be done by fields, and the
fields should then call database backend specific converters when
needed. The current setup is inflexible for 3rd party fields.

Thanks to Merlijn van Deen for the original patch.
 2012-08-12 21:52:52 +03:00
Karen Tracey 49bb72c403 [py3] Made exception examination py3-compatible. 2012-08-12 12:08:58 -04:00
Aymeric Augustin d4a0b27838 [py3] Refactored __unicode__ to __str__. 
* Renamed the __unicode__ methods
* Applied the python_2_unicode_compatible decorator
* Removed the StrAndUnicode mix-in that is superseded by
  python_2_unicode_compatible
* Kept the __unicode__ methods in classes that specifically
  test it under Python 2
 2012-08-12 14:44:40 +02:00
Aymeric Augustin e7e08fd48b [py3] Replaced some __str__ methods by __unicode__ 
These methods actually return unicode.
 2012-08-12 14:44:40 +02:00
Aymeric Augustin 2bb2eecb63 [py3] Removed redundant __str__ methods. 
These classes already have an identical __unicode__ method, which
will be used after an upcoming refactoring.
 2012-08-12 14:44:40 +02:00
Karen Tracey 759ae3c2da Fixed #18739 -- witdthratio behavior on None args 
Made behavior given None consistent with how non-numerics were handled.
Thanks to ja.geb@me.com for the report.
 2012-08-11 19:24:18 -04:00
Karen Tracey be7f1099c6 Decorated some tests that require tz support. 
This allows the test suite to run without errors on Windows.
 2012-08-11 17:32:24 -04:00
Claude Paroz 6602103338 [py3] Various minor syntax fixes in the test suite 2012-08-11 23:23:31 +02:00
Claude Paroz 3eb28d0119 [py3] Used six.StringIO to simulate stdout buffer in tests 2012-08-11 18:56:14 +02:00
Claude Paroz 97fe70d30b [py3] Used BytesIO to test request streams 2012-08-11 11:11:20 +02:00
Claude Paroz 92b2dec918 [py3] Made signing infrastructure pass tests with Python 3 2012-08-10 18:07:46 +02:00
Claude Paroz 751774c29f [py3] Fixed mail tests with Python 3 2012-08-09 20:13:29 +02:00
Claude Paroz 96a6912ec5 [py3] Fixed compilemessages tests 2012-08-08 23:40:20 +02:00
Alex Gaynor 0955d16a16 Switched to using the standard method for comparing querysets in teh templates. 2012-08-08 07:50:59 -07:00
Aymeric Augustin 396357741b [py3] Used compatible imports of StringIO. 2012-08-08 14:50:01 +02:00
Alex Gaynor 46cc530fad Fix a test that relied on an exception outliving the `except` block, which doesn't happen on py3k. 2012-08-07 07:22:25 -07:00
Aymeric Augustin fe8484efda [py3] Ported django.utils.functional. 2012-08-07 12:00:23 +02:00
Aymeric Augustin 02e6b6409b [py3] Ported django.utils.decorators. 2012-08-07 12:00:23 +02:00
Aymeric Augustin 127b461b11 [py3] Ported django.utils.crypto. 2012-08-07 12:00:23 +02:00
Aymeric Augustin b55e07771f [py3] Ported django.utils.baseconv. 2012-08-07 12:00:23 +02:00
Aymeric Augustin c5ef65bcf3 [py3] Ported django.utils.encoding. 
* Renamed smart_unicode to smart_text (but kept the old name under
  Python 2 for backwards compatibility).
* Renamed smart_str to smart_bytes.
* Re-introduced smart_str as an alias for smart_text under Python 3
  and smart_bytes under Python 2 (which is backwards compatible).
  Thus smart_str always returns a str objects.
* Used the new smart_str in a few places where both Python 2 and 3
  want a str.
 2012-08-07 12:00:22 +02:00
Aymeric Augustin ee191715ea [py3] Fixed access to dict keys/values/items. 2012-08-07 12:00:22 +02:00
Brendan MacDonell ad237fb72f Fixed #18724 -- Fixed IntegerField validation with value 0 2012-08-06 10:42:21 +02:00
Claude Paroz 121fd109de Fixed #5524 -- Do not remove cleaned_data when a form fails validation 
cleaned_data is no longer deleted when form validation fails but only
contains the data that did validate.
Thanks to the various contributors to this patch (see ticket).
 2012-08-04 14:22:23 +02:00
Simon Meers 10f979fd92 Fixed #18700 -- Added URL reversal for i18n set_language view. 2012-08-04 20:57:12 +10:00
Aymeric Augustin d01eaf7104 [py3] Removed uses of sys.maxint under Python 3. 
Also fixed #18706: improved exceptions raised by int_to_base36.
 2012-08-03 18:51:28 +02:00
Florian Apolloner 4129201c3e Fixed a security issue in http redirects. Disclosure and new release forthcoming. 2012-07-30 22:01:50 +02:00
Aymeric Augustin 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
Marc Tamlyn 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
Florian Apolloner 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
Florian Apolloner 82292141a0 Made staticfiles tests independent of test execution order. 2012-07-25 10:00:23 +02:00
Ramiro Morales 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
Alex Gaynor 38ce709fe4 Added tests for deprecation warnings and fixed the argument order for the warnings. 2012-07-24 07:01:57 -07:00
Aymeric Augustin a84d79f572 [py3] Added Python 3 compatibility for xrange. 2012-07-22 09:29:56 +02:00
Aymeric Augustin 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
Aymeric Augustin bdca5ea345 [py3] Replaced unicode/str by six.text_type/bytes. 2012-07-22 09:29:54 +02:00
Aymeric Augustin 3cb2457f46 [py3] Replaced basestring by six.string_types. 2012-07-22 09:29:54 +02:00
Aymeric Augustin 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
Aymeric Augustin 56dbe924a6 [py3] Removed longs. 2012-07-22 09:29:53 +02:00
Julien Phalip 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
Julien Phalip 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
Claude Paroz 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
Claude Paroz 423244bc6b Fixed #4680 -- Improved initial_sql parsing 
In particular, allow the '--' sequence to be present in string
values without being interpreted as comment marker.
Thanks Tim Chase for the report and shaleh for the initial patch.
 2012-07-21 14:24:29 +02:00
Aymeric Augustin 324d48d0a7 Switched to Python 3-compatible octal notation. 2012-07-20 13:28:36 +02:00