angler-fishThe Vulnerability History Project

MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions.

      git-svn-id: http://code.djangoproject.com/svn/django/trunk@2809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
by Chad the Hammerhead Shark 2006-05-02 01:31:56 UTC
commit f69cf70ed813a8cd7e1f963a14ae39103e8d5265
Django VCC CVE-2007-0405 VCC CVE-2007-5712 VCC Path to Escape CVE-2008-2302 VCC CVE-2010-4534 VCC CVE-2013-4315
AUTHORS
-4
django/__init__.py
+1 -1
django/bin/daily_cleanup.py
+5 -5
django/conf/__init__.py
-73
django/conf/app_template/models.py
-3
django/conf/app_template/models/__init__.py
+1
django/conf/app_template/models/app_name.py
+3
django/conf/global_settings.py
+9 -11
django/conf/project_template/settings.py
+5 -10
django/conf/project_template/urls.py
+1 -1
django/conf/settings.py
+77
django/conf/urls/registration.py
+7 -7
django/contrib/admin/filterspecs.py
+10 -10
django/contrib/admin/media/css/base.css
+2 -13
django/contrib/admin/media/css/changelists.css
+6 -12
django/contrib/admin/media/css/dashboard.css
-10
django/contrib/admin/media/css/forms.css
-60
django/contrib/admin/media/css/global.css
+244 -60
django/contrib/admin/media/css/layout.css
-29
django/contrib/admin/media/css/login.css
-13
django/contrib/admin/media/css/patch-iewin.css
+3 -2
django/contrib/admin/media/css/widgets.css
-101
django/contrib/admin/media/img/admin/deleted-overlay.gif
django/contrib/admin/media/img/admin/inline-delete-8bit.png
django/contrib/admin/media/img/admin/inline-delete.png
django/contrib/admin/media/img/admin/inline-restore-8bit.png
django/contrib/admin/media/img/admin/inline-restore.png
django/contrib/admin/media/img/admin/inline-splitter-bg.gif
django/contrib/admin/media/js/admin/RelatedObjectLookups.js
+1 -1
django/contrib/admin/models.py
-51
django/contrib/admin/models/__init__.py
+1
django/contrib/admin/models/admin.py
+50
django/contrib/admin/templates/admin/404.html
+1 -1
django/contrib/admin/templates/admin/500.html
+1 -1
django/contrib/admin/templates/admin/base_site.html
+1 -1
django/contrib/admin/templates/admin/change_form.html
+27 -20
django/contrib/admin/templates/admin/change_list.html
+2 -3
django/contrib/admin/templates/admin/delete_confirmation.html
+1 -11
django/contrib/admin/templates/admin/edit_inline_stacked.html
+1 -1
django/contrib/admin/templates/admin/field_line.html
+8
django/contrib/admin/templates/admin/index.html
+6 -7
django/contrib/admin/templates/admin/login.html
+15 -16
django/contrib/admin/templates/admin/object_history.html
+6 -6
django/contrib/admin/templates/admin/search_form.html
+1 -1
django/contrib/admin/templates/admin/template_validator.html
+1 -1
django/contrib/admin/templates/admin_doc/bookmarklets.html
+1 -1
django/contrib/admin/templates/admin_doc/index.html
+1 -1
django/contrib/admin/templates/admin_doc/missing_docutils.html
+1 -1
django/contrib/admin/templates/admin_doc/model_detail.html
+2 -2
django/contrib/admin/templates/admin_doc/model_index.html
+8 -9
django/contrib/admin/templates/admin_doc/template_detail.html
+1 -1
django/contrib/admin/templates/admin_doc/template_filter_index.html
+1 -1
django/contrib/admin/templates/admin_doc/template_tag_index.html
+1 -1
django/contrib/admin/templates/admin_doc/view_detail.html
+1 -1
django/contrib/admin/templates/admin_doc/view_index.html
+1 -1
django/contrib/admin/templates/registration/logged_out.html
+1 -1
django/contrib/admin/templates/registration/password_change_done.html
+1 -1
django/contrib/admin/templates/registration/password_change_form.html
+1 -1
django/contrib/admin/templates/registration/password_reset_done.html
+1 -1
django/contrib/admin/templates/registration/password_reset_form.html
+1 -1
django/contrib/admin/templates/widget/foreign.html
+6 -14
django/contrib/admin/templates/widget/many_to_many.html
+1 -1
django/contrib/admin/templates/widget/one_to_one.html
+1 -2
django/contrib/admin/templatetags/admin_list.py
+60 -52
django/contrib/admin/templatetags/admin_modify.py
+68 -55
django/contrib/admin/templatetags/adminapplist.py
+7 -12
django/contrib/admin/templatetags/adminmedia.py
+3 -4
django/contrib/admin/templatetags/log.py
+3 -3
django/contrib/admin/urls.py
-31
django/contrib/{contenttypes => admin/urls}/__init__.py
django/contrib/admin/urls/admin.py
+58
django/contrib/admin/utils.py
+3 -3
django/contrib/admin/views/decorators.py
+15 -15
django/contrib/admin/views/doc.py
+54 -91
django/contrib/admin/views/main.py
+391 -462
django/contrib/admin/views/template.py
+12 -12
django/contrib/auth/__init__.py
-2
django/contrib/auth/create_superuser.py
-84
django/contrib/auth/forms.py
-108
django/contrib/auth/handlers/modpython.py
+6 -6
django/contrib/auth/management.py
-53
django/contrib/auth/middleware.py
-19
django/contrib/auth/models.py
-264
django/contrib/auth/views.py
-84
django/contrib/comments/feeds.py
+18 -18
django/contrib/comments/models.py
-285
django/contrib/comments/models/__init__.py
+1
django/contrib/comments/models/comments.py
+287
django/contrib/comments/templatetags/comments.py
+41 -39
django/contrib/comments/views/comments.py
+54 -57
django/contrib/comments/views/karma.py
+9 -10
django/contrib/comments/views/userflags.py
+29 -18
django/contrib/contenttypes/models.py
-49
django/contrib/flatpages/middleware.py
+3 -3
django/contrib/flatpages/models.py
-33
django/contrib/flatpages/models/__init__.py
+1
django/contrib/flatpages/models/flatpages.py
+33
django/contrib/flatpages/views.py
+12 -12
django/contrib/markup/templatetags/markup.py
+1 -8
django/contrib/redirects/middleware.py
+11 -11
django/contrib/redirects/models/__init__.py
+1
django/contrib/redirects/{models.py => models/redirects.py}
+12 -11
django/contrib/sessions/models.py
-55
django/contrib/sites/management.py
-16
django/contrib/sites/models.py
-23
django/contrib/syndication/feeds.py
+7 -7
django/contrib/syndication/views.py
+2 -1
django/core/cache/backends/db.py
+8 -8
django/core/context_processors.py
+7 -7
django/core/db/__init__.py
+43
django/{contrib/sessions => core/db/backends}/__init__.py
django/{db/backends/ado_mssql/base.py => core/db/backends/ado_mssql.py}
+57 -23
django/core/db/backends/mysql.py
+235
django/core/db/backends/postgresql.py
+238
django/core/db/backends/sqlite3.py
+230
django/core/db/base.py
+32
django/core/db/dicthelpers.py
+24
django/core/db/typecasts.py
+55
django/core/exceptions.py
+7 -2
django/core/extensions.py
+82
django/{forms/__init__.py => core/formfields.py}
+51 -93
django/core/handlers/base.py
+23 -15
django/core/handlers/modpython.py
+32 -19
django/core/handlers/wsgi.py
+32 -19
django/core/mail.py
+3 -12
django/core/management.py
+567 -742
django/core/meta/__init__.py
+1983
django/{db/models/fields/__init__.py => core/meta/fields.py}
+421 -253
django/core/paginator.py
+23 -15
django/core/servers/basehttp.py
+4 -4
django/core/signals.py
-3
django/{ => core}/template/__init__.py
+86 -42
django/{ => core}/template/defaultfilters.py
+7 -10
django/{ => core}/template/defaulttags.py
+8 -14
django/{ => core}/template/loader.py
+5 -5
django/{ => core}/template/loader_tags.py
+15 -16
django/{contrib/sites => core/template/loaders}/__init__.py
django/{ => core}/template/loaders/app_directories.py
+4 -4
django/{ => core}/template/loaders/eggs.py
+4 -4
django/{ => core}/template/loaders/filesystem.py
+4 -4
django/core/template_loader.py
+3 -3
django/core/urlresolvers.py
+1 -2
django/core/validators.py
+39 -38
django/core/xheaders.py
+7 -6
django/db/__init__.py
-45
django/db/backends/ado_mssql/client.py
-2
django/db/backends/ado_mssql/creation.py
-26
django/db/backends/ado_mssql/introspection.py
-13
django/db/backends/dummy/base.py
-37
django/db/backends/dummy/client.py
-3
django/db/backends/dummy/creation.py
-1
django/db/backends/dummy/introspection.py
-8
django/db/backends/mysql/base.py
-167
django/db/backends/mysql/client.py
-14
django/db/backends/mysql/creation.py
-30
django/db/backends/mysql/introspection.py
-94
django/db/backends/postgresql/base.py
-128
django/db/backends/postgresql/client.py
-14
django/db/backends/postgresql/creation.py
-30
django/db/backends/postgresql/introspection.py
-85
django/db/backends/sqlite3/base.py
-150
django/db/backends/sqlite3/client.py
-6
django/db/backends/sqlite3/creation.py
-29
django/db/backends/sqlite3/introspection.py
-50
django/db/backends/util.py
-114
django/db/models/__init__.py
-40
django/db/models/base.py
-401
django/db/models/fields/related.py
-718
django/db/models/loading.py
-71
django/db/models/manager.py
-101
django/db/models/manipulators.py
-330
django/db/models/options.py
-269
django/db/models/query.py
-888
django/db/models/related.py
-132
django/db/models/signals.py
-12
django/db/transaction.py
-219
django/dispatch/__init__.py
-6
django/dispatch/dispatcher.py
-497
django/dispatch/errors.py
-10
django/dispatch/license.txt
-34
django/dispatch/robust.py
-57
django/dispatch/robustapply.py
-49
django/dispatch/saferef.py
-165
django/middleware/cache.py
+1 -1
django/middleware/common.py
+6 -7
django/middleware/doc.py
+2 -2
django/{contrib/sessions/middleware.py => middleware/sessions.py}
+12 -12
django/middleware/transaction.py
-28
django/models/__init__.py
+95
django/models/auth.py
+219
django/models/core.py
+121
django/{db/backends => parts}/__init__.py
django/{db/backends/ado_mssql => parts/auth}/__init__.py
django/parts/auth/anonymoususers.py
+44
django/parts/auth/formfields.py
+46
django/{db/backends/dummy => parts/media}/__init__.py
django/parts/media/photos.py
+6
django/shortcuts/__init__.py
-23
django/template/context.py
-97
django/template/loaders/__init__.py
django/templatetags/__init__.py
+2 -2
django/templatetags/i18n.py
+5 -5
django/utils/cache.py
-9
django/utils/datastructures.py
+1 -38
django/utils/feedgenerator.py
+4 -4
django/utils/functional.py
+8 -8
django/utils/html.py
+1 -1
django/{http/__init__.py => utils/httpwrappers.py}
-10
django/utils/termcolors.py
-70
django/utils/text.py
+2 -2
django/utils/timesince.py
-1
django/utils/translation.py
+10 -20
django/{db/backends/mysql => views/auth}/__init__.py
django/views/auth/login.py
+49
django/views/debug.py
+5 -5
django/{contrib/auth/decorators.py => views/decorators/auth.py}
+3 -5
django/views/decorators/cache.py
+1 -11
django/views/decorators/http.py
+1 -1
django/views/defaults.py
+31 -51
django/views/generic/create_update.py
+44 -37
django/views/generic/date_based.py
+62 -106
django/views/generic/list_detail.py
+33 -28
django/views/generic/simple.py
+3 -4
django/views/i18n.py
+3 -3
django/{db/backends/postgresql => views/registration}/__init__.py
django/views/registration/passwords.py
+100
django/views/static.py
+8 -7
docs/add_ons.txt
+2 -2
docs/admin_css.txt
+40 -17
docs/authentication.txt
+98 -133
docs/cache.txt
+81 -254
docs/db-api.txt
+430 -1238
docs/design_philosophies.txt
+3 -19
docs/django-admin.txt
+77 -104
docs/email.txt
+23 -23
docs/faq.txt
+58 -92
docs/flatpages.txt
+18 -19
docs/forms.txt
+56 -199
docs/generic_views.txt
+328 -842
docs/i18n.txt
+5 -5
docs/install.txt
+3 -3
docs/legacy_databases.txt
+35 -9
docs/middleware.txt
+4 -30
docs/model-api.txt
+585 -800
docs/modpython.txt
+9 -9
docs/outputting_csv.txt
+7 -7
docs/outputting_pdf.txt
+1 -1
docs/overview.txt
+99 -104
docs/redirects.txt
+7 -6
docs/request_response.txt
+20 -38
docs/sessions.txt
+22 -20
docs/settings.txt
+32 -39
docs/static_files.txt
+8 -8
docs/syndication_feeds.txt
+13 -13
docs/templates.txt
+65 -65
docs/templates_python.txt
+68 -76
docs/transactions.txt
-146
docs/tutorial01.txt
+142 -187
docs/tutorial02.txt
+57 -42
docs/tutorial03.txt
+62 -63
docs/tutorial04.txt
+44 -48
docs/url_dispatch.txt
+27 -30
examples/__init__.py
examples/hello/__init__.py
examples/hello/urls.py
-10
examples/hello/views.py
-55
examples/manage.py
-11
examples/settings.py
-5
examples/urls.py
-6
examples/views.py
-12
extras/README.TXT
-1
extras/django_bash_completion
-105
setup.py
-5
tests/modeltests/__init__.py
tests/modeltests/basic/__init__.py
tests/modeltests/basic/models.py
-339
tests/modeltests/choices/__init__.py
tests/modeltests/choices/models.py
-39
tests/modeltests/custom_columns/__init__.py
tests/modeltests/custom_managers/__init__.py
tests/modeltests/custom_managers/models.py
-100
tests/modeltests/custom_methods/__init__.py
tests/modeltests/custom_methods/models.py
-58
tests/modeltests/custom_pk/__init__.py
tests/modeltests/custom_pk/models.py
-90
tests/modeltests/field_defaults/__init__.py
tests/modeltests/field_defaults/models.py
-48
tests/modeltests/get_latest/__init__.py
tests/modeltests/get_latest/models.py
-79
tests/modeltests/invalid_models/__init__.py
-1
tests/modeltests/invalid_models/models.py
-117
tests/modeltests/lookup/__init__.py
tests/modeltests/lookup/models.py
-179
tests/modeltests/m2m_and_m2o/__init__.py
tests/modeltests/m2m_and_m2o/models.py
-66
tests/modeltests/m2m_intermediary/__init__.py
tests/modeltests/m2m_intermediary/models.py
-68
tests/modeltests/m2m_multiple/__init__.py
tests/modeltests/m2m_multiple/models.py
-79
tests/modeltests/m2m_recursive/__init__.py
tests/modeltests/m2m_recursive/models.py
-192
tests/modeltests/m2o_recursive/__init__.py
tests/modeltests/m2o_recursive/models.py
-40
tests/modeltests/m2o_recursive2/__init__.py
tests/modeltests/m2o_recursive2/models.py
-43
tests/modeltests/manipulators/__init__.py
tests/modeltests/manipulators/models.py
-89
tests/modeltests/many_to_many/__init__.py
tests/modeltests/many_to_many/models.py
-206
tests/modeltests/many_to_one/__init__.py
tests/modeltests/many_to_one/models.py
-232
tests/modeltests/many_to_one_null/__init__.py
tests/modeltests/many_to_one_null/models.py
-124
tests/modeltests/model_inheritance/__init__.py
tests/modeltests/model_inheritance/models.py
-52
tests/modeltests/mutually_referential/__init__.py
tests/modeltests/mutually_referential/models.py
-32
tests/modeltests/one_to_one/__init__.py
tests/modeltests/one_to_one/models.py
-130
tests/modeltests/or_lookups/__init__.py
tests/modeltests/or_lookups/models.py
-89
tests/modeltests/ordering/__init__.py
tests/modeltests/pagination/__init__.py
tests/modeltests/pagination/models.py
-59
tests/modeltests/properties/__init__.py
tests/modeltests/properties/models.py
-26
tests/modeltests/repr/__init__.py
tests/modeltests/reserved_names/__init__.py
tests/modeltests/reserved_names/models.py
-56
tests/modeltests/reverse_lookup/__init__.py
tests/modeltests/reverse_lookup/models.py
-56
tests/modeltests/save_delete_hooks/__init__.py
tests/modeltests/save_delete_hooks/models.py
-42
tests/modeltests/transactions/__init__.py
tests/modeltests/transactions/models.py
-92
tests/modeltests/validation/__init__.py
tests/modeltests/validation/models.py
-147
tests/othertests/dateformat.py
+10 -15
tests/othertests/db_typecasts.py
+2 -2
tests/othertests/defaultfilters.py
+31 -29
tests/othertests/httpwrappers.py
+1 -1
tests/othertests/markup.py
+1 -1
tests/othertests/templates.py
+54 -167
tests/runtests.py
+34 -70
{django/db/backends/sqlite3 => tests/testapp}/__init__.py
tests/testapp/models/__init__.py
+5
tests/testapp/models/basic.py
+204
tests/{modeltests/custom_columns/models.py => testapp/models/custom_columns.py}
+11 -11
tests/testapp/models/custom_methods.py
+72
tests/testapp/models/custom_pk.py
+69
tests/testapp/models/get_latest.py
+43
tests/testapp/models/lookup.py
+153
tests/testapp/models/m2m_intermediary.py
+68
tests/testapp/models/m2m_multiple.py
+99
tests/testapp/models/m2o_recursive.py
+44
tests/testapp/models/m2o_recursive2.py
+43
tests/testapp/models/many_to_many.py
+82
tests/testapp/models/many_to_one.py
+98
tests/testapp/models/many_to_one_null.py
+78
tests/testapp/models/one_to_one.py
+80
tests/testapp/models/or_lookups.py
+57
tests/{modeltests/ordering/models.py => testapp/models/ordering.py}
+18 -18
tests/{modeltests/repr/models.py => testapp/models/repr.py}
+5 -5
tests/testapp/models/reserved_names.py
+47
tests/testapp/models/save_delete_hooks.py
+49
tests/testapp/models/subclassing.py
+180
expand_less