Ticket #6527: 6527.patch

File 6527.patch, 31.5 KB (added by John DeRosa, 16 years ago)

Patch with the fix, and regression tests.

  • AUTHORS

     
    1 Django was originally created in late 2003 at World Online, the Web division
    2 of the Lawrence Journal-World newspaper in Lawrence, Kansas.
    3 
    4 The PRIMARY AUTHORS are (and/or have been):
    5 
    6 Adrian Holovaty <http://www.holovaty.com/>, who originally created Django with
    7 Simon and currently oversees things with Jacob.
    8 
    9 Simon Willison <http://simon.incutio.com/>, who originally created Django with
    10 Adrian during his year-long internship/placement at World Online and currently
    11 helps from the sidelines.
    12 
    13 Jacob Kaplan-Moss <http://www.jacobian.org/>, who joined the team shortly
    14 before Simon departed and currently oversees things with Adrian.
    15 
    16 Wilson Miner <http://www.wilsonminer.com/>, who designed Django's admin
    17 interface, pretty error pages, official Web site (djangoproject.com) and has
    18 made many other contributions. He makes us look good.
    19 
    20 Malcolm Tredinnick <http://www.pointy-stick.com/blog/>, who has made
    21 significant contributions to all levels of the framework, from its database
    22 layer to template system and documentation.
    23 
    24 Georg "Hugo" Bauer <http://hugo.muensterland.org/>, who added
    25 internationalization support, manages i18n contributions and has made a ton
    26 of excellent tweaks, feature additions and bug fixes.
    27 
    28 Luke Plant <http://lukeplant.me.uk/>, who has contributed many excellent
    29 improvements, including database-level improvements, the CSRF middleware and
    30 unit tests.
    31 
    32 Russell Keith-Magee <freakboy@iinet.net.au>, who has contributed many excellent
    33 improvements, including refactoring of the Django ORM code and unit tests.
    34 
    35 Robert Wittams <http://robert.wittams.com/>, who majorly refactored the Django
    36 admin application to allow for easier reuse and has made a ton of excellent
    37 tweaks, feature additions and bug fixes.
    38 
    39 
    40 And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS --
    41 people who have submitted patches, reported bugs, added translations, helped
    42 answer newbie questions, and generally made Django that much better:
    43 
    44     alang@bright-green.com
    45     Marty Alchin <gulopine@gamemusic.org>
    46     Daniel Alves Barbosa de Oliveira Vaz <danielvaz@gmail.com>
    47     AgarFu <heaven@croasanaso.sytes.net>
    48     Dagur Páll Ammendrup <dagurp@gmail.com>
    49     Collin Anderson <cmawebsite@gmail.com>
    50     Andreas
    51     andy@jadedplanet.net
    52     Fabrice Aneche <akh@nobugware.com>
    53     ant9000@netwise.it
    54     Florian Apolloner
    55     arien <regexbot@gmail.com>
    56     David Ascher <http://ascher.ca/>
    57     Jökull Sólberg Auðunsson <jokullsolberg@gmail.com>
    58     Arthur <avandorp@gmail.com>
    59     David Avsajanishvili <avsd05@gmail.com>
    60     axiak@mit.edu
    61     Jiri Barton
    62     Ned Batchelder <http://www.nedbatchelder.com/>
    63     Shannon -jj Behrens <http://jjinux.blogspot.com/>
    64     Esdras Beleza <linux@esdrasbeleza.com>
    65     Chris Bennett <chrisrbennett@yahoo.com>
    66     James Bennett
    67     Ben <afternoon@uk2.net>
    68     Paul Bissex <http://e-scribe.com/>
    69     Simon Blanchard
    70     Matt Boersma <ogghead@gmail.com>
    71     boobsd@gmail.com
    72     Andrew Brehaut <http://brehaut.net/blog>
    73     brut.alll@gmail.com
    74     btoll@bestweb.net
    75     Jonathan Buchanan <jonathan.buchanan@gmail.com>
    76     Can Burak Çilingir <canburak@cs.bilgi.edu.tr>
    77     Trevor Caira <trevor@caira.com>
    78     Ricardo Javier Cárdenes Medina <ricardo.cardenes@gmail.com>
    79     Graham Carlyle <graham.carlyle@maplecroft.net>
    80     Antonio Cavedoni <http://cavedoni.com/>
    81     C8E
    82     cedric@terramater.net
    83     Chris Chamberlin <dja@cdc.msbx.net>
    84     Amit Chakradeo <http://amit.chakradeo.net/>
    85     ChaosKCW
    86     Sengtha Chay <sengtha@e-khmer.com>
    87     ivan.chelubeev@gmail.com
    88     Bryan Chow <bryan at verdjn dot com>
    89     Michal Chruszcz <troll@pld-linux.org>
    90     Ian Clelland <clelland@gmail.com>
    91     Russell Cloran <russell@rucus.net>
    92     colin@owlfish.com
    93     crankycoder@gmail.com
    94     Paul Collier <paul@paul-collier.com>
    95     Pete Crosier <pete.crosier@gmail.com>
    96     Matt Croydon <http://www.postneo.com/>
    97     Leah Culver <leah@pownce.com>
    98     flavio.curella@gmail.com
    99     Jure Cuhalev <gandalf@owca.info>
    100     John D'Agostino <john.dagostino@gmail.com>
    101     dackze+django@gmail.com
    102     David Danier <goliath.mailinglist@gmx.de>
    103     Dirk Datzert <dummy@habmalnefrage.de>
    104     Jonathan Daugherty (cygnus) <http://www.cprogrammer.org/>
    105     dave@thebarproject.com
    106     david@kazserve.org
    107     Jason Davies (Esaj) <http://www.jasondavies.com/>
    108     Alex Dedul
    109     deric@monowerks.com
    110     Max Derkachev <mderk@yandex.ru>
    111     Rajesh Dhawan <rajesh.dhawan@gmail.com>
    112     Sander Dijkhuis <sander.dijkhuis@gmail.com>
    113     Jordan Dimov <s3x3y1@gmail.com>
    114     dne@mayonnaise.net
    115     dready <wil@mojipage.com>
    116     Maximillian Dornseif <md@hudora.de>
    117     Jeremy Dunck <http://dunck.us/>
    118     Andrew Durdin <adurdin@gmail.com>
    119     dusk@woofle.net
    120     Andy Dustman <farcepest@gmail.com>
    121     Clint Ecker
    122     Nick Efford <nick@efford.org>
    123     eibaan@gmail.com
    124     enlight
    125     Enrico <rico.bl@gmail.com>
    126     A. Murat Eren <meren@pardus.org.tr>
    127     Ludvig Ericson <ludvig.ericson@gmail.com>
    128     eriks@win.tue.nl
    129     Dirk Eschler <dirk.eschler@gmx.net>
    130     Marc Fargas <telenieko@telenieko.com>
    131     Szilveszter Farkas <szilveszter.farkas@gmail.com>
    132     favo@exoweb.net
    133     Dmitri Fedortchenko <zeraien@gmail.com>
    134     Bill Fenner <fenner@gmail.com>
    135     Stefane Fermgier <sf@fermigier.com>
    136     Afonso Fernández Nogueira <fonzzo.django@gmail.com>
    137     Matthew Flanagan <http://wadofstuff.blogspot.com>
    138     Eric Floehr <eric@intellovations.com>
    139     Vincent Foley <vfoleybourgon@yahoo.ca>
    140     Rudolph Froger <rfroger@estrate.nl>
    141     Jorge Gajon <gajon@gajon.org>
    142     gandalf@owca.info
    143     Marc Garcia <marc.garcia@accopensys.com>
    144     Andy Gayton <andy-django@thecablelounge.com>
    145     Baishampayan Ghose
    146     Dimitris Glezos <dimitris@glezos.com>
    147     glin@seznam.cz
    148     martin.glueck@gmail.com
    149     Artyom Gnilov <boobsd@gmail.com>
    150     GomoX <gomo@datafull.com>
    151     Mario Gonzalez <gonzalemario@gmail.com>
    152     pradeep.gowda@gmail.com
    153     Simon Greenhill <dev@simon.net.nz>
    154     Owen Griffiths
    155     Espen Grindhaug <http://grindhaug.org/>
    156     Thomas Güttler <hv@tbz-pariv.de>
    157     dAniel hAhler
    158     Brian Harring <ferringb@gmail.com>
    159     Brant Harris
    160     Hawkeye
    161     Joe Heck <http://www.rhonabwy.com/wp/>
    162     Joel Heenan <joelh-django@planetjoel.com>
    163     hipertracker@gmail.com
    164     Deryck Hodge <http://www.devurandom.org/>
    165     Brett Hoerner <bretthoerner@bretthoerner.com>
    166     Ian Holsman <http://feh.holsman.net/>
    167     Kieran Holland <http://www.kieranholland.com>
    168     Sung-Jin Hong <serialx.net@gmail.com>
    169     Richard House <Richard.House@i-logue.com>
    170     Robert Rock Howard <http://djangomojo.com/>
    171     Rob Hudson <http://rob.cogit8.org/>
    172     Jason Huggins <http://www.jrandolph.com/blog/>
    173     Hyun Mi Ae
    174     Ibon <ibonso@gmail.com>
    175     Tom Insam
    176     Baurzhan Ismagulov <ibr@radix50.net>
    177     james_027@yahoo.com
    178     jcrasta@gmail.com
    179     Zak Johnson <zakj@nox.cx>
    180     Michael Josephson <http://www.sdjournal.com/>
    181     jpellerin@gmail.com
    182     junzhang.jn@gmail.com
    183     Antti Kaihola <http://akaihola.blogspot.com/>
    184     Bahadır Kandemir <bahadir@pardus.org.tr>
    185     Nagy Károly <charlie@rendszergazda.com>
    186     Erik Karulf <erik@karulf.com>
    187     Ben Dean Kawamura <ben.dean.kawamura@gmail.com>
    188     Ian G. Kelly <ian.g.kelly@gmail.com>
    189     Thomas Kerpe <thomas@kerpe.net>
    190     Ben Khoo <khoobks@westnet.com.au>
    191     Garth Kidd <http://www.deadlybloodyserious.com/>
    192     kilian <kilian.cavalotti@lip6.fr>
    193     Sune Kirkeby <http://ibofobi.dk/>
    194     Bastian Kleineidam <calvin@debian.org>
    195     Cameron Knight (ckknight)
    196     Nena Kojadin <nena@kiberpipa.org>
    197     Igor Kolar <ike@email.si>
    198     Gasper Koren
    199     Martin Kosír <martin@martinkosir.net>
    200     Meir Kriheli <http://mksoft.co.il/>
    201     Bruce Kroeze <http://coderseye.com/>
    202     krzysiek.pawlik@silvermedia.pl
    203     Joseph Kocherhans
    204     konrad@gwu.edu
    205     knox <christobzr@gmail.com>
    206     David Krauth
    207     kurtiss@meetro.com
    208     lakin.wecker@gmail.com
    209     Nick Lane <nick.lane.au@gmail.com>
    210     Stuart Langridge <http://www.kryogenix.org/>
    211     Paul Lanier <planier@google.com>
    212     Nicola Larosa <nico@teknico.net>
    213     Eugene Lazutkin <http://lazutkin.com/blog/>
    214     Jeong-Min Lee <falsetru@gmail.com>
    215     Jannis Leidel <jl@websushi.org>
    216     Christopher Lenz <http://www.cmlenz.net/>
    217     lerouxb@gmail.com
    218     Waylan Limberg <waylan@gmail.com>
    219     limodou
    220     Philip Lindborg <philip.lindborg@gmail.com>
    221     Trey Long <trey@ktrl.com>
    222     msaelices <msaelices@gmail.com>
    223     Matt McClanahan <http://mmcc.cx/>
    224     Martin Maney <http://www.chipy.org/Martin_Maney>
    225     masonsimon+django@gmail.com
    226     Manuzhai
    227     Petr Marhoun <petr.marhoun@gmail.com>
    228     Petar Marić <http://www.petarmaric.com/>
    229     Nuno Mariz <nmariz@gmail.com>
    230     Marijn Vriens <marijn@metronomo.cl>
    231     mark@junklight.com
    232     Yasushi Masuda <whosaysni@gmail.com>
    233     mattycakes@gmail.com
    234     Jason McBrayer <http://www.carcosa.net/jason/>
    235     mccutchen@gmail.com
    236     michael.mcewan@gmail.com
    237     michal@plovarna.cz
    238     Mikko Hellsing <mikko@sorl.net>
    239     Slawek Mikula <slawek dot mikula at gmail dot com>
    240     mitakummaa@gmail.com
    241     mmarshall
    242     Andreas Mock <andreas.mock@web.de>
    243     Reza Mohammadi <reza@zeerak.ir>
    244     Aljosa Mohorovic <aljosa.mohorovic@gmail.com>
    245     Ramiro Morales <rm0@gmx.net>
    246     Eric Moritz <http://eric.themoritzfamily.com/>
    247     mrmachine <real.human@mrmachine.net>
    248     Robin Munn <http://www.geekforgod.com/>
    249     Robert Myers <myer0052@gmail.com>
    250     Nebojša Dorđević
    251     Gopal Narayanan <gopastro@gmail.com>
    252     Fraser Nevett <mail@nevett.org>
    253     Sam Newman <http://www.magpiebrain.com/>
    254     Neal Norwitz <nnorwitz@google.com>
    255     Todd O'Bryan <toddobryan@mac.com>
    256     oggie rob <oz.robharvey@gmail.com>
    257     Jay Parlar <parlar@gmail.com>
    258     pavithran s <pavithran.s@gmail.com>
    259     Barry Pederson <bp@barryp.org>
    260     permonik@mesias.brnonet.cz
    261     petr.marhoun@gmail.com
    262     pgross@thoughtworks.com
    263     phaedo <http://phaedo.cx/>
    264     phil@produxion.net
    265     phil.h.smith@gmail.com
    266     Gustavo Picon
    267     Luke Plant <http://lukeplant.me.uk/>
    268     plisk
    269     Mihai Preda <mihai_preda@yahoo.com>
    270     Daniel Poelzleithner <http://poelzi.org/>
    271     polpak@yahoo.com
    272     Jyrki Pulliainen <jyrki.pulliainen@gmail.com>
    273     Johann Queuniet <johann.queuniet@adh.naellia.eu>
    274     Jan Rademaker
    275     Michael Radziej <mir@noris.de>
    276     Amit Ramon <amit.ramon@gmail.com>
    277     Philippe Raoult <philippe.raoult@n2nsoft.com>
    278     Massimiliano Ravelli <massimiliano.ravelli@gmail.com>
    279     Brian Ray <http://brianray.chipy.org/>
    280     remco@diji.biz
    281     David Reynolds <david@reynoldsfamily.org.uk>
    282     rhettg@gmail.com
    283     ricardojbarrios@gmail.com
    284     Matt Riggott
    285     Henrique Romano <onaiort@gmail.com>
    286     Armin Ronacher
    287     Brian Rosner <brosner@gmail.com>
    288     Oliver Rutherfurd <http://rutherfurd.net/>
    289     ryankanno
    290     Manuel Saelices <msaelices@yaco.es>
    291     Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/>
    292     Vinay Sajip <vinay_sajip@yahoo.co.uk>
    293     David Schein
    294     scott@staplefish.com
    295     Ilya Semenov <semenov@inetss.com>
    296     serbaut@gmail.com
    297     John Shaffer <jshaffer2112@gmail.com>
    298     Pete Shinners <pete@shinners.org>
    299     jason.sidabras@gmail.com
    300     Jozko Skrablin <jozko.skrablin@gmail.com>
    301     Ben Slavin <benjamin.slavin@gmail.com>
    302     SmileyChris <smileychris@gmail.com>
    303     smurf@smurf.noris.de
    304     Vsevolod Solovyov
    305     sopel
    306     Leo Soto <leo.soto@gmail.com>
    307     Wiliam Alves de Souza <wiliamsouza83@gmail.com>
    308     Don Spaulding <donspauldingii@gmail.com>
    309     Bjørn Stabell <bjorn@exoweb.net>
    310     Georgi Stanojevski <glisha@gmail.com>
    311     starrynight <cmorgh@gmail.com>
    312     Vasiliy Stavenko <stavenko@gmail.com>
    313     Thomas Steinacher <http://www.eggdrop.ch/>
    314     Johan C. Stöver <johan@nilling.nl>
    315     nowell strite
    316     Thomas Stromberg <tstromberg@google.com>
    317     Sundance
    318     SuperJared
    319     Radek Švarz <http://www.svarz.cz/translate/>
    320     Swaroop C H <http://www.swaroopch.info>
    321     Aaron Swartz <http://www.aaronsw.com/>
    322     Ville Säävuori <http://www.unessa.net/>
    323     Tyler Tarabula <tyler.tarabula@gmail.com>
    324     Tyson Tate <tyson@fallingbullets.com>
    325     Frank Tegtmeyer <fte@fte.to>
    326     terryh.tp@gmail.com
    327     thebjorn <bp@datakortet.no>
    328     Zach Thompson <zthompson47@gmail.com>
    329     Michael Thornhill
    330     Deepak Thukral <deep.thukral@gmail.com>
    331     tibimicu@gmax.net
    332     tobias@neuyork.de
    333     Tom Tobin
    334     Joe Topjian <http://joe.terrarum.net/geek/code/python/django/>
    335     torne-django@wolfpuppy.org.uk
    336     Karen Tracey <graybark@bellsouth.net>
    337     tstromberg@google.com
    338     Makoto Tsuyuki <mtsuyuki@gmail.com>
    339     tt@gurgle.no
    340     Amit Upadhyay
    341     Geert Vanderkelen
    342     I.S. van Oostveen <v.oostveen@idca.nl>
    343     viestards.lists@gmail.com
    344     George Vilches <gav@thataddress.com>
    345     Vlado <vlado@labath.org>
    346     Milton Waddams
    347     wam-djangobug@wamber.net
    348     Wang Chun <wangchun@exoweb.net>
    349     Filip Wasilewski <filip.wasilewski@gmail.com>
    350     Dan Watson <http://theidioteque.net/>
    351     Chris Wesseling <Chris.Wesseling@cwi.nl>
    352     James Wheare <django@sparemint.com>
    353     charly.wilhelm@gmail.com
    354     Rachel Willmer <http://www.willmer.com/kb/>
    355     Gary Wilson <gary.wilson@gmail.com>
    356     Jakub Wiśniowski <restless.being@gmail.com>
    357     Maciej Wiśniowski <pigletto@gmail.com>
    358     wojtek
    359     Jason Yan <tailofthesun@gmail.com>
    360     ye7cakf02@sneakemail.com
    361     ymasuda@ethercube.com
    362     Jarek Zgoda <jarek.zgoda@gmail.com>
    363     Cheng Zhang
    364 
    365 A big THANK YOU goes to:
    366 
    367     Rob Curley and Ralph Gage for letting us open-source Django.
    368 
    369     Frank Wiles for making excellent arguments for open-sourcing, and for
    370     his sage sysadmin advice.
    371 
    372     Ian Bicking for convincing Adrian to ditch code generation.
    373 
    374     Mark Pilgrim for diveintopython.org.
    375 
    376     Guido van Rossum for creating Python.
     1Django was originally created in late 2003 at World Online, the Web division
     2of the Lawrence Journal-World newspaper in Lawrence, Kansas.
     3
     4The PRIMARY AUTHORS are (and/or have been):
     5
     6Adrian Holovaty <http://www.holovaty.com/>, who originally created Django with
     7Simon and currently oversees things with Jacob.
     8
     9Simon Willison <http://simon.incutio.com/>, who originally created Django with
     10Adrian during his year-long internship/placement at World Online and currently
     11helps from the sidelines.
     12
     13Jacob Kaplan-Moss <http://www.jacobian.org/>, who joined the team shortly
     14before Simon departed and currently oversees things with Adrian.
     15
     16Wilson Miner <http://www.wilsonminer.com/>, who designed Django's admin
     17interface, pretty error pages, official Web site (djangoproject.com) and has
     18made many other contributions. He makes us look good.
     19
     20Malcolm Tredinnick <http://www.pointy-stick.com/blog/>, who has made
     21significant contributions to all levels of the framework, from its database
     22layer to template system and documentation.
     23
     24Georg "Hugo" Bauer <http://hugo.muensterland.org/>, who added
     25internationalization support, manages i18n contributions and has made a ton
     26of excellent tweaks, feature additions and bug fixes.
     27
     28Luke Plant <http://lukeplant.me.uk/>, who has contributed many excellent
     29improvements, including database-level improvements, the CSRF middleware and
     30unit tests.
     31
     32Russell Keith-Magee <freakboy@iinet.net.au>, who has contributed many excellent
     33improvements, including refactoring of the Django ORM code and unit tests.
     34
     35Robert Wittams <http://robert.wittams.com/>, who majorly refactored the Django
     36admin application to allow for easier reuse and has made a ton of excellent
     37tweaks, feature additions and bug fixes.
     38
     39
     40And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS --
     41people who have submitted patches, reported bugs, added translations, helped
     42answer newbie questions, and generally made Django that much better:
     43
     44    alang@bright-green.com
     45    Marty Alchin <gulopine@gamemusic.org>
     46    Daniel Alves Barbosa de Oliveira Vaz <danielvaz@gmail.com>
     47    AgarFu <heaven@croasanaso.sytes.net>
     48    Dagur Páll Ammendrup <dagurp@gmail.com>
     49    Collin Anderson <cmawebsite@gmail.com>
     50    Andreas
     51    andy@jadedplanet.net
     52    Fabrice Aneche <akh@nobugware.com>
     53    ant9000@netwise.it
     54    Florian Apolloner
     55    arien <regexbot@gmail.com>
     56    David Ascher <http://ascher.ca/>
     57    Jökull Sólberg Auðunsson <jokullsolberg@gmail.com>
     58    Arthur <avandorp@gmail.com>
     59    David Avsajanishvili <avsd05@gmail.com>
     60    axiak@mit.edu
     61    Jiri Barton
     62    Ned Batchelder <http://www.nedbatchelder.com/>
     63    Shannon -jj Behrens <http://jjinux.blogspot.com/>
     64    Esdras Beleza <linux@esdrasbeleza.com>
     65    Chris Bennett <chrisrbennett@yahoo.com>
     66    James Bennett
     67    Ben <afternoon@uk2.net>
     68    Paul Bissex <http://e-scribe.com/>
     69    Simon Blanchard
     70    Matt Boersma <ogghead@gmail.com>
     71    boobsd@gmail.com
     72    Andrew Brehaut <http://brehaut.net/blog>
     73    brut.alll@gmail.com
     74    btoll@bestweb.net
     75    Jonathan Buchanan <jonathan.buchanan@gmail.com>
     76    Can Burak Çilingir <canburak@cs.bilgi.edu.tr>
     77    Trevor Caira <trevor@caira.com>
     78    Ricardo Javier Cárdenes Medina <ricardo.cardenes@gmail.com>
     79    Graham Carlyle <graham.carlyle@maplecroft.net>
     80    Antonio Cavedoni <http://cavedoni.com/>
     81    C8E
     82    cedric@terramater.net
     83    Chris Chamberlin <dja@cdc.msbx.net>
     84    Amit Chakradeo <http://amit.chakradeo.net/>
     85    ChaosKCW
     86    Sengtha Chay <sengtha@e-khmer.com>
     87    ivan.chelubeev@gmail.com
     88    Bryan Chow <bryan at verdjn dot com>
     89    Michal Chruszcz <troll@pld-linux.org>
     90    Ian Clelland <clelland@gmail.com>
     91    Russell Cloran <russell@rucus.net>
     92    colin@owlfish.com
     93    crankycoder@gmail.com
     94    Paul Collier <paul@paul-collier.com>
     95    Pete Crosier <pete.crosier@gmail.com>
     96    Matt Croydon <http://www.postneo.com/>
     97    Leah Culver <leah@pownce.com>
     98    flavio.curella@gmail.com
     99    Jure Cuhalev <gandalf@owca.info>
     100    John D'Agostino <john.dagostino@gmail.com>
     101    dackze+django@gmail.com
     102    David Danier <goliath.mailinglist@gmx.de>
     103    Dirk Datzert <dummy@habmalnefrage.de>
     104    Jonathan Daugherty (cygnus) <http://www.cprogrammer.org/>
     105    dave@thebarproject.com
     106    david@kazserve.org
     107    Jason Davies (Esaj) <http://www.jasondavies.com/>
     108    Alex Dedul
     109    deric@monowerks.com
     110    Max Derkachev <mderk@yandex.ru>
     111    Rajesh Dhawan <rajesh.dhawan@gmail.com>
     112    Sander Dijkhuis <sander.dijkhuis@gmail.com>
     113    Jordan Dimov <s3x3y1@gmail.com>
     114    dne@mayonnaise.net
     115    dready <wil@mojipage.com>
     116    Maximillian Dornseif <md@hudora.de>
     117    Jeremy Dunck <http://dunck.us/>
     118    Andrew Durdin <adurdin@gmail.com>
     119    dusk@woofle.net
     120    Andy Dustman <farcepest@gmail.com>
     121    Clint Ecker
     122    Nick Efford <nick@efford.org>
     123    eibaan@gmail.com
     124    enlight
     125    Enrico <rico.bl@gmail.com>
     126    A. Murat Eren <meren@pardus.org.tr>
     127    Ludvig Ericson <ludvig.ericson@gmail.com>
     128    eriks@win.tue.nl
     129    Dirk Eschler <dirk.eschler@gmx.net>
     130    Marc Fargas <telenieko@telenieko.com>
     131    Szilveszter Farkas <szilveszter.farkas@gmail.com>
     132    favo@exoweb.net
     133    Dmitri Fedortchenko <zeraien@gmail.com>
     134    Bill Fenner <fenner@gmail.com>
     135    Stefane Fermgier <sf@fermigier.com>
     136    Afonso Fernández Nogueira <fonzzo.django@gmail.com>
     137    Matthew Flanagan <http://wadofstuff.blogspot.com>
     138    Eric Floehr <eric@intellovations.com>
     139    Vincent Foley <vfoleybourgon@yahoo.ca>
     140    Rudolph Froger <rfroger@estrate.nl>
     141    Jorge Gajon <gajon@gajon.org>
     142    gandalf@owca.info
     143    Marc Garcia <marc.garcia@accopensys.com>
     144    Andy Gayton <andy-django@thecablelounge.com>
     145    Baishampayan Ghose
     146    Dimitris Glezos <dimitris@glezos.com>
     147    glin@seznam.cz
     148    martin.glueck@gmail.com
     149    Artyom Gnilov <boobsd@gmail.com>
     150    GomoX <gomo@datafull.com>
     151    Mario Gonzalez <gonzalemario@gmail.com>
     152    pradeep.gowda@gmail.com
     153    Simon Greenhill <dev@simon.net.nz>
     154    Owen Griffiths
     155    Espen Grindhaug <http://grindhaug.org/>
     156    Thomas Güttler <hv@tbz-pariv.de>
     157    dAniel hAhler
     158    Brian Harring <ferringb@gmail.com>
     159    Brant Harris
     160    Hawkeye
     161    Joe Heck <http://www.rhonabwy.com/wp/>
     162    Joel Heenan <joelh-django@planetjoel.com>
     163    hipertracker@gmail.com
     164    Deryck Hodge <http://www.devurandom.org/>
     165    Brett Hoerner <bretthoerner@bretthoerner.com>
     166    Ian Holsman <http://feh.holsman.net/>
     167    Kieran Holland <http://www.kieranholland.com>
     168    Sung-Jin Hong <serialx.net@gmail.com>
     169    Richard House <Richard.House@i-logue.com>
     170    Robert Rock Howard <http://djangomojo.com/>
     171    Rob Hudson <http://rob.cogit8.org/>
     172    Jason Huggins <http://www.jrandolph.com/blog/>
     173    Hyun Mi Ae
     174    Ibon <ibonso@gmail.com>
     175    Tom Insam
     176    Baurzhan Ismagulov <ibr@radix50.net>
     177    james_027@yahoo.com
     178    jcrasta@gmail.com
     179    Zak Johnson <zakj@nox.cx>
     180    Michael Josephson <http://www.sdjournal.com/>
     181    jpellerin@gmail.com
     182    junzhang.jn@gmail.com
     183    Antti Kaihola <http://akaihola.blogspot.com/>
     184    Bahadır Kandemir <bahadir@pardus.org.tr>
     185    Nagy Károly <charlie@rendszergazda.com>
     186    Erik Karulf <erik@karulf.com>
     187    Ben Dean Kawamura <ben.dean.kawamura@gmail.com>
     188    Ian G. Kelly <ian.g.kelly@gmail.com>
     189    Thomas Kerpe <thomas@kerpe.net>
     190    Ben Khoo <khoobks@westnet.com.au>
     191    Garth Kidd <http://www.deadlybloodyserious.com/>
     192    kilian <kilian.cavalotti@lip6.fr>
     193    Sune Kirkeby <http://ibofobi.dk/>
     194    Bastian Kleineidam <calvin@debian.org>
     195    Cameron Knight (ckknight)
     196    Nena Kojadin <nena@kiberpipa.org>
     197    Igor Kolar <ike@email.si>
     198    Gasper Koren
     199    Martin Kosír <martin@martinkosir.net>
     200    Meir Kriheli <http://mksoft.co.il/>
     201    Bruce Kroeze <http://coderseye.com/>
     202    krzysiek.pawlik@silvermedia.pl
     203    Joseph Kocherhans
     204    konrad@gwu.edu
     205    knox <christobzr@gmail.com>
     206    David Krauth
     207    kurtiss@meetro.com
     208    lakin.wecker@gmail.com
     209    Nick Lane <nick.lane.au@gmail.com>
     210    Stuart Langridge <http://www.kryogenix.org/>
     211    Paul Lanier <planier@google.com>
     212    Nicola Larosa <nico@teknico.net>
     213    Eugene Lazutkin <http://lazutkin.com/blog/>
     214    Jeong-Min Lee <falsetru@gmail.com>
     215    Jannis Leidel <jl@websushi.org>
     216    Christopher Lenz <http://www.cmlenz.net/>
     217    lerouxb@gmail.com
     218    Waylan Limberg <waylan@gmail.com>
     219    limodou
     220    Philip Lindborg <philip.lindborg@gmail.com>
     221    Trey Long <trey@ktrl.com>
     222    msaelices <msaelices@gmail.com>
     223    Matt McClanahan <http://mmcc.cx/>
     224    Martin Maney <http://www.chipy.org/Martin_Maney>
     225    masonsimon+django@gmail.com
     226    Manuzhai
     227    Petr Marhoun <petr.marhoun@gmail.com>
     228    Petar Marić <http://www.petarmaric.com/>
     229    Nuno Mariz <nmariz@gmail.com>
     230    Marijn Vriens <marijn@metronomo.cl>
     231    mark@junklight.com
     232    Yasushi Masuda <whosaysni@gmail.com>
     233    mattycakes@gmail.com
     234    Jason McBrayer <http://www.carcosa.net/jason/>
     235    mccutchen@gmail.com
     236    michael.mcewan@gmail.com
     237    michal@plovarna.cz
     238    Mikko Hellsing <mikko@sorl.net>
     239    Slawek Mikula <slawek dot mikula at gmail dot com>
     240    mitakummaa@gmail.com
     241    mmarshall
     242    Andreas Mock <andreas.mock@web.de>
     243    Reza Mohammadi <reza@zeerak.ir>
     244    Aljosa Mohorovic <aljosa.mohorovic@gmail.com>
     245    Ramiro Morales <rm0@gmx.net>
     246    Eric Moritz <http://eric.themoritzfamily.com/>
     247    mrmachine <real.human@mrmachine.net>
     248    Robin Munn <http://www.geekforgod.com/>
     249    Robert Myers <myer0052@gmail.com>
     250    Nebojša Dorđević
     251    Gopal Narayanan <gopastro@gmail.com>
     252    Fraser Nevett <mail@nevett.org>
     253    Sam Newman <http://www.magpiebrain.com/>
     254    Neal Norwitz <nnorwitz@google.com>
     255    Todd O'Bryan <toddobryan@mac.com>
     256    oggie rob <oz.robharvey@gmail.com>
     257    Jay Parlar <parlar@gmail.com>
     258    pavithran s <pavithran.s@gmail.com>
     259    Barry Pederson <bp@barryp.org>
     260    permonik@mesias.brnonet.cz
     261    petr.marhoun@gmail.com
     262    pgross@thoughtworks.com
     263    phaedo <http://phaedo.cx/>
     264    phil@produxion.net
     265    phil.h.smith@gmail.com
     266    Gustavo Picon
     267    Luke Plant <http://lukeplant.me.uk/>
     268    plisk
     269    Mihai Preda <mihai_preda@yahoo.com>
     270    Daniel Poelzleithner <http://poelzi.org/>
     271    polpak@yahoo.com
     272    Jyrki Pulliainen <jyrki.pulliainen@gmail.com>
     273    Johann Queuniet <johann.queuniet@adh.naellia.eu>
     274    Jan Rademaker
     275    Michael Radziej <mir@noris.de>
     276    Amit Ramon <amit.ramon@gmail.com>
     277    Philippe Raoult <philippe.raoult@n2nsoft.com>
     278    Massimiliano Ravelli <massimiliano.ravelli@gmail.com>
     279    Brian Ray <http://brianray.chipy.org/>
     280    remco@diji.biz
     281    David Reynolds <david@reynoldsfamily.org.uk>
     282    rhettg@gmail.com
     283    ricardojbarrios@gmail.com
     284    Matt Riggott
     285    Henrique Romano <onaiort@gmail.com>
     286    Armin Ronacher
     287    Brian Rosner <brosner@gmail.com>
     288    Oliver Rutherfurd <http://rutherfurd.net/>
     289    ryankanno
     290    Manuel Saelices <msaelices@yaco.es>
     291    Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/>
     292    Vinay Sajip <vinay_sajip@yahoo.co.uk>
     293    David Schein
     294    scott@staplefish.com
     295    Ilya Semenov <semenov@inetss.com>
     296    serbaut@gmail.com
     297    John Shaffer <jshaffer2112@gmail.com>
     298    Pete Shinners <pete@shinners.org>
     299    jason.sidabras@gmail.com
     300    Jozko Skrablin <jozko.skrablin@gmail.com>
     301    Ben Slavin <benjamin.slavin@gmail.com>
     302    SmileyChris <smileychris@gmail.com>
     303    smurf@smurf.noris.de
     304    Vsevolod Solovyov
     305    sopel
     306    Leo Soto <leo.soto@gmail.com>
     307    Wiliam Alves de Souza <wiliamsouza83@gmail.com>
     308    Don Spaulding <donspauldingii@gmail.com>
     309    Bjørn Stabell <bjorn@exoweb.net>
     310    Georgi Stanojevski <glisha@gmail.com>
     311    starrynight <cmorgh@gmail.com>
     312    Vasiliy Stavenko <stavenko@gmail.com>
     313    Thomas Steinacher <http://www.eggdrop.ch/>
     314    Johan C. Stöver <johan@nilling.nl>
     315    nowell strite
     316    Thomas Stromberg <tstromberg@google.com>
     317    Sundance
     318    SuperJared
     319    Radek Švarz <http://www.svarz.cz/translate/>
     320    Swaroop C H <http://www.swaroopch.info>
     321    Aaron Swartz <http://www.aaronsw.com/>
     322    Ville Säävuori <http://www.unessa.net/>
     323    Tyler Tarabula <tyler.tarabula@gmail.com>
     324    Tyson Tate <tyson@fallingbullets.com>
     325    Frank Tegtmeyer <fte@fte.to>
     326    terryh.tp@gmail.com
     327    thebjorn <bp@datakortet.no>
     328    Zach Thompson <zthompson47@gmail.com>
     329    Michael Thornhill
     330    Deepak Thukral <deep.thukral@gmail.com>
     331    tibimicu@gmax.net
     332    tobias@neuyork.de
     333    Tom Tobin
     334    Joe Topjian <http://joe.terrarum.net/geek/code/python/django/>
     335    torne-django@wolfpuppy.org.uk
     336    Karen Tracey <graybark@bellsouth.net>
     337    tstromberg@google.com
     338    Makoto Tsuyuki <mtsuyuki@gmail.com>
     339    tt@gurgle.no
     340    Amit Upadhyay
     341    Geert Vanderkelen
     342    I.S. van Oostveen <v.oostveen@idca.nl>
     343    viestards.lists@gmail.com
     344    George Vilches <gav@thataddress.com>
     345    Vlado <vlado@labath.org>
     346    Milton Waddams
     347    wam-djangobug@wamber.net
     348    Wang Chun <wangchun@exoweb.net>
     349    Filip Wasilewski <filip.wasilewski@gmail.com>
     350    Dan Watson <http://theidioteque.net/>
     351    Chris Wesseling <Chris.Wesseling@cwi.nl>
     352    James Wheare <django@sparemint.com>
     353    charly.wilhelm@gmail.com
     354    Rachel Willmer <http://www.willmer.com/kb/>
     355    Gary Wilson <gary.wilson@gmail.com>
     356    Jakub Wiśniowski <restless.being@gmail.com>
     357    Maciej Wiśniowski <pigletto@gmail.com>
     358    wojtek
     359    Jason Yan <tailofthesun@gmail.com>
     360    ye7cakf02@sneakemail.com
     361    ymasuda@ethercube.com
     362    Jarek Zgoda <jarek.zgoda@gmail.com>
     363    Cheng Zhang
     364    John DeRosa <stugots@qwest.net>
     365
     366
     367A big THANK YOU goes to:
     368
     369    Rob Curley and Ralph Gage for letting us open-source Django.
     370
     371    Frank Wiles for making excellent arguments for open-sourcing, and for
     372    his sage sysadmin advice.
     373
     374    Ian Bicking for convincing Adrian to ditch code generation.
     375
     376    Mark Pilgrim for diveintopython.org.
     377
     378    Guido van Rossum for creating Python.

  • django/http/__init__.py

     
    252252    status_code = 200
    253253
    254254    def __init__(self, content='', mimetype=None, status=None,
    255             content_type=None):
     255                 content_type=None):
    256256        from django.conf import settings
     257
    257258        self._charset = settings.DEFAULT_CHARSET
    258259        if mimetype:
    259260            content_type = mimetype     # For backwards compatibility
    260261        if not content_type:
    261262            content_type = "%s; charset=%s" % (settings.DEFAULT_CONTENT_TYPE,
    262263                    settings.DEFAULT_CHARSET)
     264
    263265        if not isinstance(content, basestring) and hasattr(content, '__iter__'):
     266            # The content is an iterable container
    264267            self._container = content
    265268            self._is_string = False
    266269        else:
     270            # The content is a string
    267271            self._container = [content]
    268272            self._is_string = True
     273
     274        # Needed to properly handle content that's a container.  It's
     275        # unnecessary, but does the right thing, for a string.
     276        # See http://code.djangoproject.com/ticket/6527
     277        self._container_contents = ''.join(self._container)
     278       
    269279        self.cookies = SimpleCookie()
     280
    270281        if status:
    271282            self.status_code = status
    272283
    … …  
    338349
    339350    def _get_content(self):
    340351        if self.has_header('Content-Encoding'):
    341             return ''.join(self._container)
    342         return smart_str(''.join(self._container), self._charset)
     352            return self._container_contents
     353        return smart_str(self._container_contents, self._charset)
    343354
    344355    def _set_content(self, value):
    345356        self._container = [value]
     357        self._container_contents = value
    346358        self._is_string = True
    347359
    348360    content = property(_get_content, _set_content)

  • tests/regressiontests/httpwrappers/helloworld.txt

     
     1Hello world.
     2Hello, world!
     3 No newline at end of file

  • tests/regressiontests/httpwrappers/tests.py 

    Property changes on: tests\regressiontests\httpwrappers\helloworld.txt
___________________________________________________________________
Name: svn:eol-style
   + native
     
    427427...
    428428UnicodeEncodeError: ..., HTTP response headers must be in US-ASCII format
    429429 
     430######################################
     431# HttpResponse with iterable content #
     432######################################
     433
     434>>> from django.http import HttpResponse
     435>>> response = HttpResponse(file('regressiontests/httpwrappers/helloworld.txt','r'))
     436>>> print response
     437Content-Type: text/html; charset=utf-8
     438<BLANKLINE>
     439Hello world.
     440Hello, world!
     441
     442>>> print response
     443Content-Type: text/html; charset=utf-8
     444<BLANKLINE>
     445Hello world.
     446Hello, world!
     447
     448>>> print response
     449Content-Type: text/html; charset=utf-8
     450<BLANKLINE>
     451Hello world.
     452Hello, world!
     453>>> response = HttpResponse("abc")
     454>>> print response
     455Content-Type: text/html; charset=utf-8
     456<BLANKLINE>
     457abc
     458>>> print response
     459Content-Type: text/html; charset=utf-8
     460<BLANKLINE>
     461abc
     462>>> print response
     463Content-Type: text/html; charset=utf-8
     464<BLANKLINE>
     465abc
     466
    430467"""
    431468
    432469from django.http import QueryDict, HttpResponse
Back to Top