Index: AUTHORS =================================================================== --- AUTHORS (revision 7255) +++ AUTHORS (working copy) @@ -1,376 +1,378 @@ -Django was originally created in late 2003 at World Online, the Web division -of the Lawrence Journal-World newspaper in Lawrence, Kansas. - -The PRIMARY AUTHORS are (and/or have been): - -Adrian Holovaty , who originally created Django with -Simon and currently oversees things with Jacob. - -Simon Willison , who originally created Django with -Adrian during his year-long internship/placement at World Online and currently -helps from the sidelines. - -Jacob Kaplan-Moss , who joined the team shortly -before Simon departed and currently oversees things with Adrian. - -Wilson Miner , who designed Django's admin -interface, pretty error pages, official Web site (djangoproject.com) and has -made many other contributions. He makes us look good. - -Malcolm Tredinnick , who has made -significant contributions to all levels of the framework, from its database -layer to template system and documentation. - -Georg "Hugo" Bauer , who added -internationalization support, manages i18n contributions and has made a ton -of excellent tweaks, feature additions and bug fixes. - -Luke Plant , who has contributed many excellent -improvements, including database-level improvements, the CSRF middleware and -unit tests. - -Russell Keith-Magee , who has contributed many excellent -improvements, including refactoring of the Django ORM code and unit tests. - -Robert Wittams , who majorly refactored the Django -admin application to allow for easier reuse and has made a ton of excellent -tweaks, feature additions and bug fixes. - - -And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS -- -people who have submitted patches, reported bugs, added translations, helped -answer newbie questions, and generally made Django that much better: - - alang@bright-green.com - Marty Alchin - Daniel Alves Barbosa de Oliveira Vaz - AgarFu - Dagur Páll Ammendrup - Collin Anderson - Andreas - andy@jadedplanet.net - Fabrice Aneche - ant9000@netwise.it - Florian Apolloner - arien - David Ascher - Jökull Sólberg Auðunsson - Arthur - David Avsajanishvili - axiak@mit.edu - Jiri Barton - Ned Batchelder - Shannon -jj Behrens - Esdras Beleza - Chris Bennett - James Bennett - Ben - Paul Bissex - Simon Blanchard - Matt Boersma - boobsd@gmail.com - Andrew Brehaut - brut.alll@gmail.com - btoll@bestweb.net - Jonathan Buchanan - Can Burak Çilingir - Trevor Caira - Ricardo Javier Cárdenes Medina - Graham Carlyle - Antonio Cavedoni - C8E - cedric@terramater.net - Chris Chamberlin - Amit Chakradeo - ChaosKCW - Sengtha Chay - ivan.chelubeev@gmail.com - Bryan Chow - Michal Chruszcz - Ian Clelland - Russell Cloran - colin@owlfish.com - crankycoder@gmail.com - Paul Collier - Pete Crosier - Matt Croydon - Leah Culver - flavio.curella@gmail.com - Jure Cuhalev - John D'Agostino - dackze+django@gmail.com - David Danier - Dirk Datzert - Jonathan Daugherty (cygnus) - dave@thebarproject.com - david@kazserve.org - Jason Davies (Esaj) - Alex Dedul - deric@monowerks.com - Max Derkachev - Rajesh Dhawan - Sander Dijkhuis - Jordan Dimov - dne@mayonnaise.net - dready - Maximillian Dornseif - Jeremy Dunck - Andrew Durdin - dusk@woofle.net - Andy Dustman - Clint Ecker - Nick Efford - eibaan@gmail.com - enlight - Enrico - A. Murat Eren - Ludvig Ericson - eriks@win.tue.nl - Dirk Eschler - Marc Fargas - Szilveszter Farkas - favo@exoweb.net - Dmitri Fedortchenko - Bill Fenner - Stefane Fermgier - Afonso Fernández Nogueira - Matthew Flanagan - Eric Floehr - Vincent Foley - Rudolph Froger - Jorge Gajon - gandalf@owca.info - Marc Garcia - Andy Gayton - Baishampayan Ghose - Dimitris Glezos - glin@seznam.cz - martin.glueck@gmail.com - Artyom Gnilov - GomoX - Mario Gonzalez - pradeep.gowda@gmail.com - Simon Greenhill - Owen Griffiths - Espen Grindhaug - Thomas Güttler - dAniel hAhler - Brian Harring - Brant Harris - Hawkeye - Joe Heck - Joel Heenan - hipertracker@gmail.com - Deryck Hodge - Brett Hoerner - Ian Holsman - Kieran Holland - Sung-Jin Hong - Richard House - Robert Rock Howard - Rob Hudson - Jason Huggins - Hyun Mi Ae - Ibon - Tom Insam - Baurzhan Ismagulov - james_027@yahoo.com - jcrasta@gmail.com - Zak Johnson - Michael Josephson - jpellerin@gmail.com - junzhang.jn@gmail.com - Antti Kaihola - Bahadır Kandemir - Nagy Károly - Erik Karulf - Ben Dean Kawamura - Ian G. Kelly - Thomas Kerpe - Ben Khoo - Garth Kidd - kilian - Sune Kirkeby - Bastian Kleineidam - Cameron Knight (ckknight) - Nena Kojadin - Igor Kolar - Gasper Koren - Martin Kosír - Meir Kriheli - Bruce Kroeze - krzysiek.pawlik@silvermedia.pl - Joseph Kocherhans - konrad@gwu.edu - knox - David Krauth - kurtiss@meetro.com - lakin.wecker@gmail.com - Nick Lane - Stuart Langridge - Paul Lanier - Nicola Larosa - Eugene Lazutkin - Jeong-Min Lee - Jannis Leidel - Christopher Lenz - lerouxb@gmail.com - Waylan Limberg - limodou - Philip Lindborg - Trey Long - msaelices - Matt McClanahan - Martin Maney - masonsimon+django@gmail.com - Manuzhai - Petr Marhoun - Petar Marić - Nuno Mariz - Marijn Vriens - mark@junklight.com - Yasushi Masuda - mattycakes@gmail.com - Jason McBrayer - mccutchen@gmail.com - michael.mcewan@gmail.com - michal@plovarna.cz - Mikko Hellsing - Slawek Mikula - mitakummaa@gmail.com - mmarshall - Andreas Mock - Reza Mohammadi - Aljosa Mohorovic - Ramiro Morales - Eric Moritz - mrmachine - Robin Munn - Robert Myers - Nebojša Dorđević - Gopal Narayanan - Fraser Nevett - Sam Newman - Neal Norwitz - Todd O'Bryan - oggie rob - Jay Parlar - pavithran s - Barry Pederson - permonik@mesias.brnonet.cz - petr.marhoun@gmail.com - pgross@thoughtworks.com - phaedo - phil@produxion.net - phil.h.smith@gmail.com - Gustavo Picon - Luke Plant - plisk - Mihai Preda - Daniel Poelzleithner - polpak@yahoo.com - Jyrki Pulliainen - Johann Queuniet - Jan Rademaker - Michael Radziej - Amit Ramon - Philippe Raoult - Massimiliano Ravelli - Brian Ray - remco@diji.biz - David Reynolds - rhettg@gmail.com - ricardojbarrios@gmail.com - Matt Riggott - Henrique Romano - Armin Ronacher - Brian Rosner - Oliver Rutherfurd - ryankanno - Manuel Saelices - Ivan Sagalaev (Maniac) - Vinay Sajip - David Schein - scott@staplefish.com - Ilya Semenov - serbaut@gmail.com - John Shaffer - Pete Shinners - jason.sidabras@gmail.com - Jozko Skrablin - Ben Slavin - SmileyChris - smurf@smurf.noris.de - Vsevolod Solovyov - sopel - Leo Soto - Wiliam Alves de Souza - Don Spaulding - Bjørn Stabell - Georgi Stanojevski - starrynight - Vasiliy Stavenko - Thomas Steinacher - Johan C. Stöver - nowell strite - Thomas Stromberg - Sundance - SuperJared - Radek Švarz - Swaroop C H - Aaron Swartz - Ville Säävuori - Tyler Tarabula - Tyson Tate - Frank Tegtmeyer - terryh.tp@gmail.com - thebjorn - Zach Thompson - Michael Thornhill - Deepak Thukral - tibimicu@gmax.net - tobias@neuyork.de - Tom Tobin - Joe Topjian - torne-django@wolfpuppy.org.uk - Karen Tracey - tstromberg@google.com - Makoto Tsuyuki - tt@gurgle.no - Amit Upadhyay - Geert Vanderkelen - I.S. van Oostveen - viestards.lists@gmail.com - George Vilches - Vlado - Milton Waddams - wam-djangobug@wamber.net - Wang Chun - Filip Wasilewski - Dan Watson - Chris Wesseling - James Wheare - charly.wilhelm@gmail.com - Rachel Willmer - Gary Wilson - Jakub Wiśniowski - Maciej Wiśniowski - wojtek - Jason Yan - ye7cakf02@sneakemail.com - ymasuda@ethercube.com - Jarek Zgoda - Cheng Zhang - -A big THANK YOU goes to: - - Rob Curley and Ralph Gage for letting us open-source Django. - - Frank Wiles for making excellent arguments for open-sourcing, and for - his sage sysadmin advice. - - Ian Bicking for convincing Adrian to ditch code generation. - - Mark Pilgrim for diveintopython.org. - - Guido van Rossum for creating Python. +Django was originally created in late 2003 at World Online, the Web division +of the Lawrence Journal-World newspaper in Lawrence, Kansas. + +The PRIMARY AUTHORS are (and/or have been): + +Adrian Holovaty , who originally created Django with +Simon and currently oversees things with Jacob. + +Simon Willison , who originally created Django with +Adrian during his year-long internship/placement at World Online and currently +helps from the sidelines. + +Jacob Kaplan-Moss , who joined the team shortly +before Simon departed and currently oversees things with Adrian. + +Wilson Miner , who designed Django's admin +interface, pretty error pages, official Web site (djangoproject.com) and has +made many other contributions. He makes us look good. + +Malcolm Tredinnick , who has made +significant contributions to all levels of the framework, from its database +layer to template system and documentation. + +Georg "Hugo" Bauer , who added +internationalization support, manages i18n contributions and has made a ton +of excellent tweaks, feature additions and bug fixes. + +Luke Plant , who has contributed many excellent +improvements, including database-level improvements, the CSRF middleware and +unit tests. + +Russell Keith-Magee , who has contributed many excellent +improvements, including refactoring of the Django ORM code and unit tests. + +Robert Wittams , who majorly refactored the Django +admin application to allow for easier reuse and has made a ton of excellent +tweaks, feature additions and bug fixes. + + +And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS -- +people who have submitted patches, reported bugs, added translations, helped +answer newbie questions, and generally made Django that much better: + + alang@bright-green.com + Marty Alchin + Daniel Alves Barbosa de Oliveira Vaz + AgarFu + Dagur Páll Ammendrup + Collin Anderson + Andreas + andy@jadedplanet.net + Fabrice Aneche + ant9000@netwise.it + Florian Apolloner + arien + David Ascher + Jökull Sólberg Auðunsson + Arthur + David Avsajanishvili + axiak@mit.edu + Jiri Barton + Ned Batchelder + Shannon -jj Behrens + Esdras Beleza + Chris Bennett + James Bennett + Ben + Paul Bissex + Simon Blanchard + Matt Boersma + boobsd@gmail.com + Andrew Brehaut + brut.alll@gmail.com + btoll@bestweb.net + Jonathan Buchanan + Can Burak Çilingir + Trevor Caira + Ricardo Javier Cárdenes Medina + Graham Carlyle + Antonio Cavedoni + C8E + cedric@terramater.net + Chris Chamberlin + Amit Chakradeo + ChaosKCW + Sengtha Chay + ivan.chelubeev@gmail.com + Bryan Chow + Michal Chruszcz + Ian Clelland + Russell Cloran + colin@owlfish.com + crankycoder@gmail.com + Paul Collier + Pete Crosier + Matt Croydon + Leah Culver + flavio.curella@gmail.com + Jure Cuhalev + John D'Agostino + dackze+django@gmail.com + David Danier + Dirk Datzert + Jonathan Daugherty (cygnus) + dave@thebarproject.com + david@kazserve.org + Jason Davies (Esaj) + Alex Dedul + deric@monowerks.com + Max Derkachev + Rajesh Dhawan + Sander Dijkhuis + Jordan Dimov + dne@mayonnaise.net + dready + Maximillian Dornseif + Jeremy Dunck + Andrew Durdin + dusk@woofle.net + Andy Dustman + Clint Ecker + Nick Efford + eibaan@gmail.com + enlight + Enrico + A. Murat Eren + Ludvig Ericson + eriks@win.tue.nl + Dirk Eschler + Marc Fargas + Szilveszter Farkas + favo@exoweb.net + Dmitri Fedortchenko + Bill Fenner + Stefane Fermgier + Afonso Fernández Nogueira + Matthew Flanagan + Eric Floehr + Vincent Foley + Rudolph Froger + Jorge Gajon + gandalf@owca.info + Marc Garcia + Andy Gayton + Baishampayan Ghose + Dimitris Glezos + glin@seznam.cz + martin.glueck@gmail.com + Artyom Gnilov + GomoX + Mario Gonzalez + pradeep.gowda@gmail.com + Simon Greenhill + Owen Griffiths + Espen Grindhaug + Thomas Güttler + dAniel hAhler + Brian Harring + Brant Harris + Hawkeye + Joe Heck + Joel Heenan + hipertracker@gmail.com + Deryck Hodge + Brett Hoerner + Ian Holsman + Kieran Holland + Sung-Jin Hong + Richard House + Robert Rock Howard + Rob Hudson + Jason Huggins + Hyun Mi Ae + Ibon + Tom Insam + Baurzhan Ismagulov + james_027@yahoo.com + jcrasta@gmail.com + Zak Johnson + Michael Josephson + jpellerin@gmail.com + junzhang.jn@gmail.com + Antti Kaihola + Bahadır Kandemir + Nagy Károly + Erik Karulf + Ben Dean Kawamura + Ian G. Kelly + Thomas Kerpe + Ben Khoo + Garth Kidd + kilian + Sune Kirkeby + Bastian Kleineidam + Cameron Knight (ckknight) + Nena Kojadin + Igor Kolar + Gasper Koren + Martin Kosír + Meir Kriheli + Bruce Kroeze + krzysiek.pawlik@silvermedia.pl + Joseph Kocherhans + konrad@gwu.edu + knox + David Krauth + kurtiss@meetro.com + lakin.wecker@gmail.com + Nick Lane + Stuart Langridge + Paul Lanier + Nicola Larosa + Eugene Lazutkin + Jeong-Min Lee + Jannis Leidel + Christopher Lenz + lerouxb@gmail.com + Waylan Limberg + limodou + Philip Lindborg + Trey Long + msaelices + Matt McClanahan + Martin Maney + masonsimon+django@gmail.com + Manuzhai + Petr Marhoun + Petar Marić + Nuno Mariz + Marijn Vriens + mark@junklight.com + Yasushi Masuda + mattycakes@gmail.com + Jason McBrayer + mccutchen@gmail.com + michael.mcewan@gmail.com + michal@plovarna.cz + Mikko Hellsing + Slawek Mikula + mitakummaa@gmail.com + mmarshall + Andreas Mock + Reza Mohammadi + Aljosa Mohorovic + Ramiro Morales + Eric Moritz + mrmachine + Robin Munn + Robert Myers + Nebojša Dorđević + Gopal Narayanan + Fraser Nevett + Sam Newman + Neal Norwitz + Todd O'Bryan + oggie rob + Jay Parlar + pavithran s + Barry Pederson + permonik@mesias.brnonet.cz + petr.marhoun@gmail.com + pgross@thoughtworks.com + phaedo + phil@produxion.net + phil.h.smith@gmail.com + Gustavo Picon + Luke Plant + plisk + Mihai Preda + Daniel Poelzleithner + polpak@yahoo.com + Jyrki Pulliainen + Johann Queuniet + Jan Rademaker + Michael Radziej + Amit Ramon + Philippe Raoult + Massimiliano Ravelli + Brian Ray + remco@diji.biz + David Reynolds + rhettg@gmail.com + ricardojbarrios@gmail.com + Matt Riggott + Henrique Romano + Armin Ronacher + Brian Rosner + Oliver Rutherfurd + ryankanno + Manuel Saelices + Ivan Sagalaev (Maniac) + Vinay Sajip + David Schein + scott@staplefish.com + Ilya Semenov + serbaut@gmail.com + John Shaffer + Pete Shinners + jason.sidabras@gmail.com + Jozko Skrablin + Ben Slavin + SmileyChris + smurf@smurf.noris.de + Vsevolod Solovyov + sopel + Leo Soto + Wiliam Alves de Souza + Don Spaulding + Bjørn Stabell + Georgi Stanojevski + starrynight + Vasiliy Stavenko + Thomas Steinacher + Johan C. Stöver + nowell strite + Thomas Stromberg + Sundance + SuperJared + Radek Švarz + Swaroop C H + Aaron Swartz + Ville Säävuori + Tyler Tarabula + Tyson Tate + Frank Tegtmeyer + terryh.tp@gmail.com + thebjorn + Zach Thompson + Michael Thornhill + Deepak Thukral + tibimicu@gmax.net + tobias@neuyork.de + Tom Tobin + Joe Topjian + torne-django@wolfpuppy.org.uk + Karen Tracey + tstromberg@google.com + Makoto Tsuyuki + tt@gurgle.no + Amit Upadhyay + Geert Vanderkelen + I.S. van Oostveen + viestards.lists@gmail.com + George Vilches + Vlado + Milton Waddams + wam-djangobug@wamber.net + Wang Chun + Filip Wasilewski + Dan Watson + Chris Wesseling + James Wheare + charly.wilhelm@gmail.com + Rachel Willmer + Gary Wilson + Jakub Wiśniowski + Maciej Wiśniowski + wojtek + Jason Yan + ye7cakf02@sneakemail.com + ymasuda@ethercube.com + Jarek Zgoda + Cheng Zhang + John DeRosa + + +A big THANK YOU goes to: + + Rob Curley and Ralph Gage for letting us open-source Django. + + Frank Wiles for making excellent arguments for open-sourcing, and for + his sage sysadmin advice. + + Ian Bicking for convincing Adrian to ditch code generation. + + Mark Pilgrim for diveintopython.org. + + Guido van Rossum for creating Python. Index: django/http/__init__.py =================================================================== --- django/http/__init__.py (revision 7255) +++ django/http/__init__.py (working copy) @@ -252,21 +252,32 @@ status_code = 200 def __init__(self, content='', mimetype=None, status=None, - content_type=None): + content_type=None): from django.conf import settings + self._charset = settings.DEFAULT_CHARSET if mimetype: content_type = mimetype # For backwards compatibility if not content_type: content_type = "%s; charset=%s" % (settings.DEFAULT_CONTENT_TYPE, settings.DEFAULT_CHARSET) + if not isinstance(content, basestring) and hasattr(content, '__iter__'): + # The content is an iterable container self._container = content self._is_string = False else: + # The content is a string self._container = [content] self._is_string = True + + # Needed to properly handle content that's a container. It's + # unnecessary, but does the right thing, for a string. + # See http://code.djangoproject.com/ticket/6527 + self._container_contents = ''.join(self._container) + self.cookies = SimpleCookie() + if status: self.status_code = status @@ -338,11 +349,12 @@ def _get_content(self): if self.has_header('Content-Encoding'): - return ''.join(self._container) - return smart_str(''.join(self._container), self._charset) + return self._container_contents + return smart_str(self._container_contents, self._charset) def _set_content(self, value): self._container = [value] + self._container_contents = value self._is_string = True content = property(_get_content, _set_content) Index: tests/regressiontests/httpwrappers/helloworld.txt =================================================================== --- tests/regressiontests/httpwrappers/helloworld.txt (revision 0) +++ tests/regressiontests/httpwrappers/helloworld.txt (revision 0) @@ -0,0 +1,2 @@ +Hello world. +Hello, world! \ No newline at end of file Property changes on: tests\regressiontests\httpwrappers\helloworld.txt ___________________________________________________________________ Name: svn:eol-style + native Index: tests/regressiontests/httpwrappers/tests.py =================================================================== --- tests/regressiontests/httpwrappers/tests.py (revision 7255) +++ tests/regressiontests/httpwrappers/tests.py (working copy) @@ -427,6 +427,43 @@ ... UnicodeEncodeError: ..., HTTP response headers must be in US-ASCII format +###################################### +# HttpResponse with iterable content # +###################################### + +>>> from django.http import HttpResponse +>>> response = HttpResponse(file('regressiontests/httpwrappers/helloworld.txt','r')) +>>> print response +Content-Type: text/html; charset=utf-8 + +Hello world. +Hello, world! + +>>> print response +Content-Type: text/html; charset=utf-8 + +Hello world. +Hello, world! + +>>> print response +Content-Type: text/html; charset=utf-8 + +Hello world. +Hello, world! +>>> response = HttpResponse("abc") +>>> print response +Content-Type: text/html; charset=utf-8 + +abc +>>> print response +Content-Type: text/html; charset=utf-8 + +abc +>>> print response +Content-Type: text/html; charset=utf-8 + +abc + """ from django.http import QueryDict, HttpResponse