3f9ec12d9c
Fixed #23712 -- Fixed KeyError with BaseForm._html_output()
2015-01-15 20:19:53 -05:00
560b4207b1
Removed redundant numbered parameters from str.format().
...
Since Python 2.7 and 3.1, "{0} {1}" is equivalent to "{} {}".
2014-12-03 14:27:38 -05:00
1101467ce0
Limited lines to 119 characters in django/
...
refs #23395 .
2014-09-05 09:22:16 -04:00
a6691e5dcf
Fixed #23167 -- Added BaseForm.__repr__()
...
Thanks Keryn Knight for the idea.
2014-08-22 15:55:56 -04:00
deed00c0d8
Fixed #23162 -- Renamed forms.Field._has_changed() to has_changed().
2014-08-15 08:14:45 -04:00
5e06fa1469
Fixed #22745 -- Prevented reevaluation of ModelChoiceField's queryset when accesssing BoundField's attrs.
...
Thanks Christian Schmitt for review.
2014-08-04 07:47:37 -04:00
399cf303cb
Corrected a comment in forms/forms.py; refs #16612 .
2014-08-04 06:57:09 -04:00
de0a22be35
Fixed two typos in docstrings.
2014-08-02 15:14:13 +02:00
9209049211
Ensured bound field renders as unicode safe data
...
Refs #22950 .
2014-07-05 11:42:27 +02:00
11f0899bbe
Fixed #11776 -- Added CSS class for non-field/top of form errors.
...
Thanks Daniel Pope for the suggestion.
2014-06-02 15:22:15 -04:00
9fb0f5dddc
Fixed #22510 -- Harden field removal to only None.
...
Refs #8620 .
If we allow any value to remove form fields then we get name clashes
with method names, media classes etc. There was a backwards
incompatibility introduced meaning ModelForm subclasses with declared
fields called media or clean would lose those fields.
Field removal is now only permitted by using the sentinel value None.
The docs have been slightly reworded to refer to removal of fields
rather than shadowing.
Thanks to gcbirzan for the report and initial patch, and several of the
core team for opinions.
2014-05-24 13:10:50 +01:00
5eb81ce445
Fixed #22533 -- Added label_suffix parameter to form fields.
...
Fields can now receive the `label_suffix` attribute, which will override
a form's `label_suffix`.
This enhances the possibility to customize form's `label_suffix`, allowing
to use such customizations while using shortcuts such as
`{{ form.as_p }}`.
Note that the field's own customization can be overridden at runtime by
using the `label_prefix` parameter to `BoundField.label_tag()`.
Refs #18134 .
2014-05-13 09:09:33 -04:00
a5de0df58b
Fixed #22502 -- Fixed microseconds/default/form interaction
...
Made explicit lack of microsecond handling by built-in datetime form
fields. Used that explicitness to appropriately nix microsecond
values in bound fields. Thanks Claude Paroz for the review.
2014-05-10 10:56:39 +02:00
df60db0e78
Fixed #22570 -- Made Form.__getitem__ KeyError more descriptive.
2014-05-05 20:01:15 -04:00
78623d253b
Removed casting to bool just before negation.
2014-04-07 08:30:05 -04:00
416a858023
Fixed #17922 -- Added required_css_class to form label.
...
Thanks hanson2010 for the suggestion.
2014-03-24 08:11:54 -04:00
7ac8380799
Fixed #22318 -- Added Form.has_error() to easily check if a given error has happened.
2014-03-24 07:21:32 -04:00
d74e33eb0e
Removed backwards compatibility code to call field.widget._has_changed()
...
This logic should be moved to field._has_changed() as described
in ebb504db69#16612 .
2014-03-21 19:34:21 -04:00
210d0489c5
Fixed #21188 -- Introduced subclasses for to-be-removed-in-django-XX warnings
...
Thanks Anssi Kääriäinen for the idea and Simon Charette for the
review.
2014-03-08 09:57:40 +01:00
0d91225892
Fixed many typos in comments and docstrings.
...
Thanks Piotr Kasprzyk for help with the patch.
2014-03-03 07:38:09 -05:00
8847a0c601
Fixed #16192 -- Made unique error messages in ModelForm customizable.
...
Overriding the error messages now works for both unique fields, unique_together
and unique_for_date.
This patch changed the overriding logic to allow customizing NON_FIELD_ERRORS
since previously only fields' errors were customizable.
Refs #20199 .
Thanks leahculver for the suggestion.
2014-02-08 04:59:09 -05:00
81bb8d1220
Fixed docstring typo in django/forms/forms.py.
2014-01-10 08:33:30 -05:00
3ce9829b61
Fixed #17413 -- Serialization of form errors along with all metadata.
2013-12-16 16:33:28 -05:00
f563c339ca
Fixed #20867 -- Added the Form.add_error() method.
...
Refs #20199 #16986 .
Thanks @akaariai, @bmispelon, @mjtamlyn, @timgraham for the reviews.
2013-11-30 01:00:53 +07:00
cbc7cbbc5b
Fixed flake8 E251 violations
2013-11-03 03:22:11 -06:00
7548aa8ffd
More attacking E302 violators
2013-11-02 13:12:09 -07:00
dcfc8fa972
Correct flake8 violation E261
2013-11-02 15:27:47 -04:00
f2d8027c9a
Fixed up some more flake8 violations (this particular violation still has many occurrences in the tests/ dir so it can't be removed from setup.cfg yet)
2013-10-26 10:50:40 -07:00
b16dd1fe01
Fixed #8620 -- Updated the Form metaclass to support excluding fields by shadowing them.
2013-10-14 22:42:33 +07:00
ac5ec7b8bc
Fixed #19617 -- Refactored Form metaclasses to support more inheritance scenarios.
...
Thanks apollo13, funkybob and mjtamlyn for the reviews.
2013-10-14 21:59:30 +07:00
56743cf9e3
Ensured that BoundField.as_widget always returns properly localized fields.
...
This is a follow-up to #18777 which improperly converted to strings in
prepare_value and as such caused regressions like #21074 .
Refs #18777 , #21074
2013-09-21 22:54:00 +02:00
18ffdb1772
Fixed #17627 -- Renamed util.py files to utils.py
...
Thanks PaulM for the suggestion and Luke Granger-Brown and
Wiktor Kołodziej for the initial patch.
2013-09-16 12:52:05 -04:00
053de6131a
Fixed #5749 -- Added field_name as a key in the _html_output dict
...
Thanks SmileyChris for the suggestion.
2013-09-10 13:00:10 -04:00
8cd8742981
Moved translator comment just above the target string
2013-08-22 09:52:54 +02:00
907ef9d0d1
Fixed #20555 -- Make subwidget id attribute available
...
In `BoundField.__iter__`, the widget's id attribute is now passed to
each subwidget. A new id_for_label property was added to ChoiceInput.
2013-08-13 13:23:05 -04:00
1c4a9bd9ad
Revert change to the default Form.clean()
...
This means it doesn't break for people who are doing
`cleaned_data = super(FooForm, self).clean()`.
2013-08-08 14:27:48 +01:00
fb1dd6b13a
Form.clean() does not need to return cleaned_data.
...
If it does, that will be used as the cleaned_data. The default
implementation has been changed to match this change.
2013-08-08 14:05:55 +01:00
07876cf02b
Deprecated SortedDict (replaced with collections.OrderedDict)
...
Thanks Loic Bistuer for the review.
2013-08-04 07:09:39 -04:00
5c1143910e
Removed most of absolute_import imports
...
Should be unneeded with Python 2.7 and up.
Added some unicode_literals along the way.
2013-07-29 20:28:13 +02:00
8676318d2d
Fixed #20805 -- Removed an extra colon beside checkboxes in the admin.
...
Thanks CollinAnderson for the report.
2013-07-26 14:45:38 -04:00
7557207983
Fixed #20582 -- Allowed default Form.label_suffix to be translated
...
Thanks Tim Graham for the review.
2013-07-13 16:19:16 +02:00
acd7b34aaf
Advanced deprecation warnings for Django 1.7.
2013-06-29 18:49:37 +02:00
3128f3d38d
Fixed #20618 -- Fixed regression in `BoundField.label_tag`.
2013-06-18 17:49:53 +02:00
584bd14dcf
Fixed #18134 -- BoundField.label_tag now includes the form's label_suffix
...
There was an inconsistency between how the label_tag for forms were
generated depending on which method was used: as_p, as_ul and as_table
contained code to append the label_suffix where as label_tag called on a
form field directly did NOT append the label_suffix. The code for
appending the label_suffix has been moved in to the label_tag code of
the field and the HTML generation code for as_p, as_ul and as_table now
calls this code as well.
This is a backwards incompatible change because users who have added the
label_suffix manually in their templates may now get double label_suffix
characters in their forms.
2013-06-10 14:23:15 -04:00
0fa8d43e74
Replaced `and...or...` constructs with PEP 308 conditional expressions.
2013-05-26 23:47:50 -03:00
be0bab1bb8
Fixed #11725 -- Made possible to create widget label tag without "for"
...
Thanks Denis Martinez for the report and initial patch, and
Sergey Kolosov for bringing the patch up to date.
2013-05-25 15:31:07 +02:00
d0788c2770
Fixed #18709 -- Check if initial_value is a callable
...
In _get_changed_data, check if initial_value is a callable and call it
if it is.
2013-05-22 01:05:22 +02:00
9c487b5974
Replaced an antiquated pattern.
...
Thanks Lennart Regebro for pointing it out.
2013-05-17 18:08:58 +02:00
ab686022f8
Fixed #20211 : Document backwards-incompatible change in BoundField.label_tag
...
Also cleaned up label escaping and consolidated the test suite regarding
label_tag.
2013-04-12 10:17:17 +02:00
cbfb8ed53b
Fixed a regression in forms changed_data
...
Thanks Loic Bistuer for spotting the regression and the initial
patch. Refs #16612 .
2013-03-08 18:19:24 +01:00
892bc91cb0
Fixed #16612 -- Improved has_changed detection for localized field values
...
Thanks Simon Charette for the review.
2013-03-01 09:35:04 +01:00
5eebb49c69
Fixed #19908 -- Added missing import in forms.py
...
Thanks loic84 for the report.
2013-02-24 22:59:15 +01:00
52533a64d5
fixed minor typo #19703
2013-01-30 19:48:05 +01:00
962f133f72
Fixed #18483 -- Marked hidden field error string for translation
...
Thanks Evil Clay for the report and Emil Stenstrom for the initial
patch.
2013-01-26 19:59:44 +01:00
58062a6302
Used property decorators in django/forms.py
2013-01-25 22:41:45 +01:00
ebb504db69
Moved has_changed logic from widget to form field
...
Refs #16612 . Thanks Aymeric Augustin for the suggestion.
2013-01-25 20:50:46 +01:00
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
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
ee191715ea
[py3] Fixed access to dict keys/values/items.
2012-08-07 12:00:22 +02:00
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
bdca5ea345
[py3] Replaced unicode/str by six.text_type/bytes.
2012-07-22 09:29:54 +02:00
d11d45aad9
[py3] Used six.with_metaclass wherever necessary.
2012-07-22 09:29:52 +02:00
8fdc56d2a6
Fixed #18572 - Python26 string format incompatibility
...
Thanks to anonymous/AeroNotix for the report
2012-07-06 00:23:02 +01:00
a92e7f37c4
Changed a lot of internal code to use 'format_html' where appropriate/possible
2012-07-03 22:20:12 +01:00
4a103086d5
Fixed #18269 -- Applied unicode_literals for Python 3 compatibility.
...
Thanks Vinay Sajip for the support of his django3 branch and
Jannis Leidel for the review.
2012-06-07 18:08:47 +02:00
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
3732c82f59
Made a minor tweak to a doctoring in `django/forms.forms.py` that was missed in r17452. Thanks to Claude Paroz for the tip.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17453 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-05 08:12:07 +00:00
477f4d8061
Clean up the form's code a little bit, to make it more consistantly go through one code path. Patch from Travis Swicegood.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17381 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-19 22:05:47 +00:00
08bec4fbc1
Changed BoundField.subwidgets() to return SubWidget objects instead of rendered strings. This means we can access individual radio buttons' properties in the template (see new docs)
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17175 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-07 23:08:27 +00:00
fc90c09efd
Made BoundFields iterable, so that you can iterate over individual radio buttons of a RadioSelect in a template
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17173 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-07 22:31:39 +00:00
67565a5379
Remove comments referencing encryption. Django doesn't do encryption.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17012 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-18 20:28:52 +00:00
1856e398c5
Remove more relative imports (I will kill them all).
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17006 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-17 16:39:53 +00:00
13864703bc
Removed a bunch more Python 2.4 workarounds now that we don't support that version. Refs #15702 -- thanks to jonash for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 02:11:19 +00:00
74ffca17e2
Fixed #10573 -- Corrected autofocus problem in admin when the first widget displayed is a multiwidget. Thanks to rduffield for the report, and to Ramiro and Julien Phalip for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15452 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-08 12:00:21 +00:00
d3f5f219f5
Fixes #10427 -- Abstract the value generation of a BoundField
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14734 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-28 02:50:31 +00:00
392d992f82
Fixed #7048 -- Added ClearableFileInput widget to clear file fields. Thanks for report and patch, jarrow and Carl Meyer.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13968 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-01 02:02:58 +00:00
1df1378f9e
Fixed #13827 -- Cleaned up a few unnecessary function calls.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-26 21:36:22 +00:00
b3dc3a0106
Fixed #13679 , #13231 , #7287 -- Ensured that models that have ForeignKeys/ManyToManyField can use a a callable default that returns a model instance/queryset. #13679 was a regression in behavior; the other two tickets are pleasant side effects. Thanks to 3point2 for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13577 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-14 12:05:41 +00:00
10906fa75d
Fixed #8426 - 'helptext' CSS class - hopefully for real this time.
...
This file was missing from [13519]
Thanks to mattmcc for the catch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13522 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 01:29:23 +00:00
c4b6edf3b8
Fixed #12746 -- Updated sorting calls to use 'key' instead of 'cmp'. This will be slightly faster in certain circumstances, but more importantly, is a required step for migration to Python 3. Thanks to Martin van Loewis for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13509 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-06 16:31:44 +00:00
b057a8b247
Fixed #13560 -- Fixed localization of widgets.
...
Particularly this fixes the SplitDateTimeField and the AdminDateWidget by localizating the widget's value in its render method instead of the form field. Thanks to David Danier for the report and Russell for help with the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13296 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-21 14:07:54 +00:00
ca4c6f65ea
Fixed #13032 - Added localize parameter to form fields to be able to selectively enable localization.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12867 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-27 16:43:27 +00:00
cc6e9b2286
Fixed #12434 : Made pretty_name handle empty string and None as input. Thanks ales_zoulek and gabrielhurley.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-16 16:10:27 +00:00
b88f969789
Fixed #12960 . The return value of ModelForm.clean() is now applied to the model. Thanks for the report, krejcik.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-06 18:42:56 +00:00
408d431029
Fixed #12596 . Calling super from a ModelForm's clean method is once again optional. Failing to call super only skips unique validation as documented. Thanks for the initial patch and tests, carljm.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12269 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-21 02:28:03 +00:00
5e83b79d26
Fixed #12466 - Set HTML class attributes for each field separately. Thanks for the patch, Bernd Schlapsi.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-09 22:51:03 +00:00
471596fc1a
Merged soc2009/model-validation to trunk. Thanks, Honza!
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12098 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-05 03:56:19 +00:00
574eafe4c0
Fixed #11753 - Q objects with callables no longer explode on Python 2.4. Thanks, Jeremy Dunck.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11901 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-17 22:06:41 +00:00
92803205cb
Fixed #3512 : it's now possible to add CSS hooks to required/erroneous form rows. Thanks, SmileyChris.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11830 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 18:52:12 +00:00
9c4bd2aa33
Fixed #11632 : Fixed the id for hidden initial widget so that it is different from the id for its visible counterpart. Thanks geber@datacollect.com and Mark Lavin.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11826 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 18:18:31 +00:00
7c53c2618d
Fixed #10968 - Form.errors should use Form.error_class.
...
Thanks for report and initial patch, matehat.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11498 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-11 10:47:40 +00:00
1e4ad6f118
Fixed #10002 : inline file uploads now correctly display prior data. Thanks, dgouldin.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10588 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-18 20:29:55 +00:00
15becf23a9
Forms in model formsets and inline formsets can now be deleted even if they don't validate. Related to #9587 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-31 19:55:20 +00:00
352efd1893
Edited docs/topics/forms/index.txt changes from [9569] and fixed a typo in the visible_fields() docstring
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-08 04:07:42 +00:00
bfab9d62ee
Added a way to iterate over hidden/visible fields in a form. Useful for manual
...
form layout.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9569 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-05 04:22:00 +00:00
bcd63cbfb0
Fixed #6160 , #9111 -- Consistently apply conditional_escape to form errors and labels when outputing them as HTML.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9365 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-06 19:49:24 +00:00
9931c9e132
Fixed #9125 -- When displaying errors for a form with only hidden fields, make sure the resulting XHTML is correct.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9067 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-18 07:16:08 +00:00
2487e3ae37
Removed a conditional that slipped by that makes inline model formsets fail validation when re-submitted.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8817 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-01 21:33:15 +00:00
7c7ad041b3
Fixed #7975 -- Callable defaults in inline model formsets now work correctly. Based on patch from msaelices. Thanks for your hard work msaelices.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8816 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-01 21:28:32 +00:00
24bacb19de
Fixed #5216 -- Fixed a case of a string not being a unicode string.
...
Thanks to Vadim Fint for the test case.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8761 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-31 11:39:06 +00:00
Yang Liu
Berker Peksag
Tim Graham
areski
Gabriel Muñumel
Vincent-Vega
Baptiste Mispelon
Claude Paroz
Nick Presta
Marc Tamlyn
Julen Ruiz Aizpuru
Stephen Burrows
Ben Davis
Tomasz Wysocki
Anubhav Joshi
Loic Bistuer
Rodolfo Carvalho
Loic Bistuer
Marc Sibson
Milton Mazzarri
Alex Gaynor
Ray Ashman Jr
Florian Apolloner
e0ne
Matt Johnson
Curtis Maloney
Aymeric Augustin
Gabe Jackson
Ramiro Morales
Jeroen Dekkers
Simon Kerr
Luke Plant
Julien Phalip
Adrian Holovaty
Paul McMillan
Russell Keith-Magee
Chris Beaven
Jannis Leidel
Karen Tracey
Joseph Kocherhans
Jacob Kaplan-Moss
Malcolm Tredinnick
Brian Rosner