Commit Graph

30 Commits

Author SHA1 Message Date
Claude Paroz 363dbd920e [py3] Fixed contrib.formtools tests 2012-08-13 21:26:12 +02:00
Alex Gaynor 4c97101b1f remove a bunch of unnescesarry iterkeys() calls 2012-08-08 07:33:15 -07: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
Aymeric Augustin bdca5ea345 [py3] Replaced unicode/str by six.text_type/bytes. 2012-07-22 09:29:54 +02:00
Florian Apolloner 7f225880e4 Corrected the `instance_dict` description for form wizards. 2012-06-22 15:46:49 +02:00
Aymeric Augustin e84f79f051 Fixed #18042 -- Advanced deprecation warnings.
Thanks Ramiro for the patch.
2012-05-03 15:27:01 +02:00
Claude Paroz 3904b74a3f Fixed #18013 -- Use the new 'as' syntax for exceptions.
Thanks Clueless for the initial patch.
Note that unittest has been purposely left out (external package only used by Python 2.6).
2012-04-29 20:57:15 +02:00
Aymeric Augustin cec6bd5a59 Fixed #18023 -- Removed bundled simplejson.
And started the deprecation path for django.utils.simplejson.

Thanks Alex Ogier, Clueless, and other contributors for their
work on the patch.
2012-04-29 19:58:00 +02:00
Jannis Leidel 59a436e963 Fixed #17677 -- Made sure the WizardView doesn't accidentally overwrite the `instance` or `queryset` form parameters when they are already set by the `get_form_kwargs` method. Thanks to goodtune and Stephan Jäkel.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-04 16:10:18 +00:00
Jannis Leidel c76200a0bf Fixed #17819 -- Convinced the NamedUrlWizardView to stop dropping files when stepping through the forms.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17634 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-03 01:06:37 +00:00
Julien Phalip 259ebcdeea Fixed #17408 -- Cleaned up some namings in `contrib.formtools`. Thanks, Stephan Jaekel.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17236 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-19 13:52:40 +00:00
Julien Phalip 355f7fc564 Fixed #17163 -- Added the `NamedUrlWizardView.get_step_url()` method. Thanks, Bradley Ayers.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17235 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-19 13:36:32 +00:00
Julien Phalip 1ef6841cad Fixed #17162 -- Removed the useless `WizardView.get_wizard_name()` method. Thanks, Bradley Ayers and Stephan Jaekel.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17234 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-19 13:13:41 +00:00
Julien Phalip ed56e2c4a8 Fixed #17151 -- Renamed `wizard_prev_step` to the clearer `wizard_goto_step` in `NamedUrlWizardView`. Thanks, Bradley Ayers and Stephan Jaekel.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17233 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-19 12:58:18 +00:00
Julien Phalip ad5df5119f Fixed #17150 -- Made `NamedUrlWizardView.url_name` available in the template context. Thanks to Bradley Ayers for the suggestion and to Stephan Jaekel for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17232 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-19 12:28:39 +00:00
Julien Phalip 3e790ae632 Fixed #17148 -- Fixed the signature of `WizardView.get_context_data()` to play nicer with mixin inheritance. Thanks, Bradley Ayers and Stephan Jaekel.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17231 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-19 12:11:12 +00:00
Alex Gaynor 358e5a8031 Fixed #16393 -- FormWizard's cookie storage backend now works with all versions of simplejson and the standard library json module.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17014 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-19 00:09:41 +00:00
Ramiro Morales 735fbcfe8b Fixed #16597 -- Added Sphinx cross-reference metadata to the form wizard docs. Thanks FunkyBob for the report and jkistler for the patch.
Also, additional fixes in that document and in the WizardView docstrings.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16904 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-26 01:37:57 +00:00
Jannis Leidel a13de6cd76 Fixed #6644 -- Fixed django.contrib.formtools tests to be better isolated when running outside of the Django test suite. Also moved around the new wizard's templates a bit to better fit the common app layout.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-13 13:51:34 +00:00
Jannis Leidel bce890ace4 Fixed #16584 -- Fixed a bunch of typos in code comments. Thanks, Bernhard Essl.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16598 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-12 14:14:15 +00:00
Jannis Leidel 24f4764a48 Fixed #16225 -- Removed unused imports. Many thanks to Aymeric Augustin for the work on the patch and Alex for reviewing.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-13 09:35:51 +00:00
Andrew Godwin 222a5ed69e Reverting [16376] in preparation for reverting [16356]. See #16182.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16425 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-17 09:47:01 +00:00
Jannis Leidel 3d970762af Fixed naming of test methods for the sake of consistency.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-14 10:35:13 +00:00
Jannis Leidel b5e7eab9fd Fixed #16236 -- Added get_form_kwargs method to WizardView as a way to easily provide kwargs to each step form.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16398 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-14 10:35:02 +00:00
Ramiro Morales 7116c31373 Fixed incompatibility (`with` statement usage) with Python 2.5 introduced in [16368]. Thanks ojii for the report via IRC.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16389 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-12 23:50:37 +00:00
Andrew Godwin e096d56406 Fixed #16222: Test failures due to more precise cookie timings. Refs [16356].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16376 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-11 19:27:32 +00:00
Jannis Leidel 703498b1c8 Fixed #16179 -- Extended argument handling of the new WizardView a little to behave the same as the rest of the generic class based views. Also cleaned up the template loading in its tests a bit. Thanks, Harro van der Klauw.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16368 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-11 15:11:56 +00:00
Jannis Leidel 9abe734b83 Fixed #16141 -- Fixed typos in new form wizard.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16309 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-01 20:14:25 +00:00
Jannis Leidel 632dfa2338 Fixed #9200 -- Added new form wizard to formtools based on class based views. Many thanks to Stephan Jäkel, ddurham and ElliottM for their work.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-01 13:47:00 +00:00