Commit Graph

1629 Commits

Author SHA1 Message Date
Adrian Holovaty 8863e5dd11 Changed get_random_function_sql for ado_mssql backend to use RAND(), which is correct. Thanks, Jakub Labath
git-svn-id: http://code.djangoproject.com/svn/django/trunk@936 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-18 14:02:46 +00:00
Adrian Holovaty b890e37ada Added get_table_list() to ado_mssql backend
git-svn-id: http://code.djangoproject.com/svn/django/trunk@935 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-18 13:59:58 +00:00
Adrian Holovaty 57b4f231fd Fixed #583 -- Added app_directories template loader, which searches for templates in 'templates' directory in each INSTALLED_APPS package. It's turned off by default.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-17 02:37:50 +00:00
Adrian Holovaty e8fda9091a Fixed typo in filesystem template-loader error message
git-svn-id: http://code.djangoproject.com/svn/django/trunk@890 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-17 02:18:28 +00:00
Adrian Holovaty dc3f6e4113 Changed internal variable names in django.core.template.loaders.eggs to be consistent with filesystem
git-svn-id: http://code.djangoproject.com/svn/django/trunk@889 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-17 01:53:22 +00:00
Adrian Holovaty a2e26150b7 Fixed #616 -- Added a process_exception() hook to middleware framework. Thanks, Hugo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@880 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-15 02:20:35 +00:00
Adrian Holovaty 24154b2166 Fixed #225 -- Added first stab at MS SQL Server support (via ADO). Thanks to gmilas@gmail.com for the patch
git-svn-id: http://code.djangoproject.com/svn/django/trunk@879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-15 01:37:16 +00:00
Adrian Holovaty 8254a7a7db Fixed #628 -- Django no longer overwrites model class docstrings if they're provided
git-svn-id: http://code.djangoproject.com/svn/django/trunk@878 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-15 00:54:42 +00:00
Adrian Holovaty f575a4edaa Fixed small namespace bug in [867]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@872 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-14 22:29:13 +00:00
Adrian Holovaty 7aefff7833 Fixed #582 -- Added support for loading templates from Python eggs, and a TEMPLATE_LOADERS setting, which defines which loaders to use. Thanks, Sune
git-svn-id: http://code.djangoproject.com/svn/django/trunk@870 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-14 22:22:12 +00:00
Adrian Holovaty 083b4f9001 Redid [865], which got lost in [867]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@868 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-14 20:12:16 +00:00
Adrian Holovaty f71f854628 Fixed #626 -- Moved template modules to django.core.template package. django.core.template_loader is deprecated, in favor of django.core.template.loader.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@867 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-14 20:10:13 +00:00
Jacob Kaplan-Moss b773bf45c3 Registered default_if_none filter from [859]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@865 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-14 18:37:16 +00:00
Adrian Holovaty ed1c9b2046 Fixed #622 -- Added default_if_none filter. Thanks, Eric
git-svn-id: http://code.djangoproject.com/svn/django/trunk@859 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-14 03:48:27 +00:00
Adrian Holovaty f2088d456c Fixed #618 -- Added DATABASE_PORT setting. Thanks, Esaj
git-svn-id: http://code.djangoproject.com/svn/django/trunk@858 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-14 03:43:01 +00:00
Adrian Holovaty 5f9fe6d403 Fixed #589 -- Added FilePathField. It's available as an ORM field and as a standalone field in django.core.formfields. Thanks, jay@skabber.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@846 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-12 04:14:21 +00:00
Adrian Holovaty 29ff2bb4cb Improved django.core.management.get_sql_delete to close database connection explicitly when it's done, to avoid locking issues
git-svn-id: http://code.djangoproject.com/svn/django/trunk@823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-10 20:14:56 +00:00
Adrian Holovaty b4e2d12b1f Fixed #599 -- locmem cache now uses deepcopy() to prevent aliasing. Thanks, Hugo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@821 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-10 13:56:39 +00:00
Adrian Holovaty a933432a70 Fixed #473 -- Added a MysqlDebugWrapper to use for MySQL with DEBUG=True. It displays more informative error messages for MySQL warnings. Thanks for the patch, mlambert@gmail.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-08 21:00:25 +00:00
Adrian Holovaty d93c68ab5f Fixed #586 -- Fixed bug in raw_id_admin caused by [785]. Thanks for the heads-up, slashzero
git-svn-id: http://code.djangoproject.com/svn/django/trunk@800 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-07 23:39:06 +00:00
Adrian Holovaty 485042b74d Fixed #595 -- Fixed error when sorting API results descending with custom 'select' parameters. Thanks for the patch, Robert Wittams
git-svn-id: http://code.djangoproject.com/svn/django/trunk@792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-06 15:52:30 +00:00
Adrian Holovaty 9fe02e6b65 Made raw_id_admin work with non-integer primary keys
git-svn-id: http://code.djangoproject.com/svn/django/trunk@790 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-06 14:43:07 +00:00
Adrian Holovaty cb628c0cb7 Changed django.core.management to remove a couple of hard-coded slashes from os.path.join calls. Thanks, Stuart Langridge
git-svn-id: http://code.djangoproject.com/svn/django/trunk@789 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-06 14:30:35 +00:00
Adrian Holovaty ab9aacd4db Fixed #333 and #440 -- Split DEFAULT_MIME_TYPE setting into DEFAULT_CONTENT_TYPE and DEFAULT_CHARSET. Thanks, Maniac.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@786 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-06 02:27:08 +00:00
Adrian Holovaty 8dda2aeaa3 Improved model validator to check admin.list_filter and type-check admin.list_display
git-svn-id: http://code.djangoproject.com/svn/django/trunk@784 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-06 01:41:54 +00:00
Jacob Kaplan-Moss 6b2226bab8 Fixed #447 - the RSS framework can now output pub dates
git-svn-id: http://code.djangoproject.com/svn/django/trunk@743 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-30 13:58:30 +00:00
Adrian Holovaty 998fc72c0d Changed [735] so that database-agnostic SQL always gets executed, even if database-specific SQL doesn't exist.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@737 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-29 23:43:03 +00:00
Jacob Kaplan-Moss 27b1f69d79 Fixed #295 - added {{{forloop.revcounter}}} and {{{forloop.revcounter0}}} variables to for loops. Also updated the docs and added unit tests to verify correct behavior. Thanks, Clint.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@736 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-29 23:34:29 +00:00
Jacob Kaplan-Moss 151b44c89a Fixed #363 - django-admin sqlall now uses database-specific initial data files if they exist.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-29 23:23:11 +00:00
Adrian Holovaty 277cc05462 Changed django.core.template_file to use absolute import for 'template' module
git-svn-id: http://code.djangoproject.com/svn/django/trunk@721 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-29 15:06:53 +00:00
Adrian Holovaty 38649f4c3f Fixed #537 -- Fixed typo in [718]. Thanks, Esaj
git-svn-id: http://code.djangoproject.com/svn/django/trunk@719 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-29 14:59:49 +00:00
Jacob Kaplan-Moss 22f27949bd Fixed #537; thanks, fonso
git-svn-id: http://code.djangoproject.com/svn/django/trunk@718 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-29 13:29:12 +00:00
Jacob Kaplan-Moss 152d437305 Fixed #546 - render_to_string and render_to_response may now take lists of templates and use select_template instead of get_template. Thanks, hugo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@717 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-29 13:26:49 +00:00
Adrian Holovaty 8a7189f38f Fixed #501 -- Fixed block.super in multi-level templates, and added unit tests to confirm. Thanks for the patch, django@kieranholland.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@715 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-29 04:22:09 +00:00
Adrian Holovaty c1a16d54b0 Fixed #553 -- Added django.core.meta.fields.Field.get_internal_type() hook, for creating custom meta.Field subclasses. Thanks, wojtek3
git-svn-id: http://code.djangoproject.com/svn/django/trunk@713 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-28 23:08:47 +00:00
Jacob Kaplan-Moss cd34c163cc Moved JING from django.core.validators into settings where it belongs. Fixes #568.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@712 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-27 16:34:10 +00:00
Jacob Kaplan-Moss 2d1303bd68 Added EMAIL_SUBJECT_PREFIX setting so you can customize the "[Django]" prefix
on emails send with mail_admins/mail_managers.  Refs #568.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-27 16:32:21 +00:00
Adrian Holovaty c084005d58 Fixed #131 -- URLconfs that are 'included' now receive captured parameters from parent URLconfs. Thanks for the idea, jcernelli@gmail.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@704 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-27 04:24:19 +00:00
Adrian Holovaty d86624877d Fixed #213 -- Improved formfields.TimeField.html2python() so that it doesn't fail for None input
git-svn-id: http://code.djangoproject.com/svn/django/trunk@702 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-27 03:34:58 +00:00
Jacob Kaplan-Moss 9b72153139 Quick bug fix to [699] - fixes #515.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@701 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-26 16:30:14 +00:00
Jacob Kaplan-Moss adce221d92 Added exception handlers to take care of the bugs with the file and db backends
(refs #515).  Eugene, I'm going to leave #515 open; can you check the bug fixes
in this revision and mark the ticket as closed if you're satisfied?  I don't 
run Django in a threaded environment, so I'm having issues reproducing your 
errors.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@699 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-26 12:38:41 +00:00
Adrian Holovaty c44fd057fa Subclassed models now use their own class name (or explicitly defined verbose_name) as the verbose_name, not the parent's verbose_name. See also #558 and [697].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@698 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-26 05:12:22 +00:00
Adrian Holovaty 60bb739d9e Fixed #558 -- Subclassed models now use their own class name (or explicitly defined module_name) as the module_name, not the parent's module_name
git-svn-id: http://code.djangoproject.com/svn/django/trunk@697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-26 05:03:40 +00:00
Jacob Kaplan-Moss 871ffbe7ee Fixed #515 (again) - renamed "key" field in SQL cache to "cache_key" because
MySQL reserves "key".


git-svn-id: http://code.djangoproject.com/svn/django/trunk@695 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-26 03:14:37 +00:00
Adrian Holovaty a978dbe779 Fixed #489 -- Changed MySQL backend to use longtext for XMLField
git-svn-id: http://code.djangoproject.com/svn/django/trunk@694 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-26 02:36:53 +00:00
Jacob Kaplan-Moss 0fa1aa8711 Added a database-backed cache backend, along with a tool in django-admin to
create the necessary table structure.  This closes #515; thanks again, 
Eugene!


git-svn-id: http://code.djangoproject.com/svn/django/trunk@692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-25 22:03:30 +00:00
Adrian Holovaty 68c0742008 Fixed #468 -- Model classes now get an accessor method to get the human-readable value for each field that has 'choices' set. Thanks, Robert
git-svn-id: http://code.djangoproject.com/svn/django/trunk@687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-25 20:36:05 +00:00
Jacob Kaplan-Moss 272eab5cd8 Added "locmem" and "file" cache backends. "locmem" is a thread-safe local-memory cache, and "file" is a file-based cache.
This refs #515; much thanks to Eugene Lazutkin!


git-svn-id: http://code.djangoproject.com/svn/django/trunk@686 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-25 20:01:35 +00:00
Adrian Holovaty 26c4356e01 Improved model validator so that it checks for PIL if ImageFields are used
git-svn-id: http://code.djangoproject.com/svn/django/trunk@685 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-25 20:01:30 +00:00
Adrian Holovaty c05cce5c52 Fixed #556 -- ManyToManyField join tables no longer assume the primary keys of both associated tables are integers. Also added unit tests to confirm.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-25 18:29:59 +00:00
Adrian Holovaty 109a915775 Fixed #489 -- Changed MySQL backend to use longtext instead of text for TextField
git-svn-id: http://code.djangoproject.com/svn/django/trunk@680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-24 17:37:30 +00:00
Adrian Holovaty 58641f8068 Added django.core.extensions get_object_or_404 and get_list_or_404
git-svn-id: http://code.djangoproject.com/svn/django/trunk@673 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-23 21:40:04 +00:00
Adrian Holovaty 3d426607a8 Fixed #264 -- Added django.core.validators.isValidIPAddress4. Thanks, Hugo and Simon
git-svn-id: http://code.djangoproject.com/svn/django/trunk@671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-23 02:02:15 +00:00
Adrian Holovaty 1a5ada0101 Fixed #539 -- Added support for strides to 'slice' template filter, and made the code more efficient. Thanks, Esaj
git-svn-id: http://code.djangoproject.com/svn/django/trunk@666 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-23 00:12:24 +00:00
Adrian Holovaty 62f036d67d Added django.core.template_loader.render_to_string and django.core.extensions.render_to_response. django.core.extensions.load_and_render is deprecated in favor of render_to_response.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@664 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-22 14:57:05 +00:00
Adrian Holovaty 17418cd982 Added django.core.validators.isValidHTML
git-svn-id: http://code.djangoproject.com/svn/django/trunk@663 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-22 14:51:57 +00:00
Adrian Holovaty a6946dac54 Fixed #533 -- Fixed bug when using custom context_instance in load_and_render(). Thanks, Brantley
git-svn-id: http://code.djangoproject.com/svn/django/trunk@657 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-21 21:41:37 +00:00
Adrian Holovaty 0505000533 Changed django.core.extensions.load_and_render to take context_instance instead of context_class keyword arg, so DjangoContext can be used
git-svn-id: http://code.djangoproject.com/svn/django/trunk@656 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-21 18:18:04 +00:00
Adrian Holovaty 63994a9801 Added django.core.extensions.load_and_render, which factors out the boilerplate of loading a template, rendering a context and returning an HttpResponse
git-svn-id: http://code.djangoproject.com/svn/django/trunk@655 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-21 17:24:33 +00:00
Adrian Holovaty 7dfb86724d Improved model validator so that it validates admin.list_display values
git-svn-id: http://code.djangoproject.com/svn/django/trunk@650 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-20 02:48:25 +00:00
Adrian Holovaty e7982bb5b0 Fixed #491 -- Non-user connections are now supported for PostgreSQL. Thanks, jafo@tummy.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@647 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-19 01:23:03 +00:00
Adrian Holovaty bcc2873c70 Companion django.core.extensions checkin to [644]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@645 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-17 23:08:24 +00:00
Adrian Holovaty 1e910f94d2 Fixed mutable-argument bug in template.Context init. Thanks, Luke
git-svn-id: http://code.djangoproject.com/svn/django/trunk@644 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-17 23:06:16 +00:00
Jacob Kaplan-Moss 526de4987a Fixed "unique" validator for fields with relations.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@643 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-15 16:54:46 +00:00
Adrian Holovaty f55f98f989 Fixed #500 -- Created a TEMPLATE_FILE_EXTENSION setting that lets you override the default '.html' if you want to use a different extension (or none at all) for templates
git-svn-id: http://code.djangoproject.com/svn/django/trunk@640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-14 01:24:36 +00:00
Adrian Holovaty adaf046591 Fixed metasystem bug when using get_related_many_to_many() method with a custom-named primary key. Thanks, stane
git-svn-id: http://code.djangoproject.com/svn/django/trunk@639 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-13 03:48:06 +00:00
Adrian Holovaty 99e0f7a932 Removed utils.text.fix_microsoft_characters, which didn't actually do anything. Refs #467.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@637 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-13 03:28:34 +00:00
Adrian Holovaty 6e034a831a Fixed #481 -- Added all other HTTP status codes to WSGI backend. Thanks, eugene
git-svn-id: http://code.djangoproject.com/svn/django/trunk@636 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-13 03:21:44 +00:00
Adrian Holovaty 095305cb44 Fixed #486 -- Fixed bug in template filter parsing in edge cases, and added unit tests. Thanks, Simon
git-svn-id: http://code.djangoproject.com/svn/django/trunk@634 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-11 15:18:04 +00:00
Adrian Holovaty f46402bc90 Made 'django-admin.py init' more robust
git-svn-id: http://code.djangoproject.com/svn/django/trunk@632 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-06 22:14:40 +00:00
Adrian Holovaty e5a801590a Improved model validator to check for upload_to attribute in FileFields
git-svn-id: http://code.djangoproject.com/svn/django/trunk@622 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-05 15:04:20 +00:00
Adrian Holovaty 5c22b8b4b7 Improved model validator to make sure prepopulate_from is a list or tuple
git-svn-id: http://code.djangoproject.com/svn/django/trunk@617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-02 22:50:53 +00:00
Adrian Holovaty ccbea84834 Fixed #404 -- Fixed random ordering in MySQL by abstracting random function into db backend modules. Thanks, mattycakes@gmail.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@615 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-02 20:46:00 +00:00
Adrian Holovaty 3aa1276bff Fixed #453 -- 'django-admin install' now does model validation before installation. Lightly refactored django.core.management to add a get_validation_errors() function, which validate() wraps.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-02 18:38:23 +00:00
Adrian Holovaty 24006427d9 Changed django.core.management.validate to take an optional 'outfile' argument, defaulting to sys.stdout
git-svn-id: http://code.djangoproject.com/svn/django/trunk@608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-02 18:28:26 +00:00
Adrian Holovaty 59b204526e Fixed #454 -- Clarified django-admin '--help' output to use 'modelmodule' instead of 'app'. Thanks, Maniac
git-svn-id: http://code.djangoproject.com/svn/django/trunk@607 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-02 18:26:16 +00:00
Adrian Holovaty 5d7c8a0c4f Fixed bug in [601]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@604 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-02 17:59:43 +00:00
Adrian Holovaty 324f717c5e Fixed bug in has_related_links=True, which is legacy and shouldn't be used by anybody
git-svn-id: http://code.djangoproject.com/svn/django/trunk@601 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-02 16:34:14 +00:00
Adrian Holovaty 582e6a1010 Fixed #392 -- Fixed bug in memcache setup if arguments are given. Thanks, adrian@exoweb.net
git-svn-id: http://code.djangoproject.com/svn/django/trunk@598 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-01 23:09:48 +00:00
Adrian Holovaty 887f6331d4 Fixed #446 -- Fixed bug in yesno template filter. Thanks, Hugo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@589 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-01 02:22:46 +00:00
Adrian Holovaty def5d10ffc Fixed #365 -- Changed template.resolve_variable to resolve hard-coded strings. Thanks, davidschein
git-svn-id: http://code.djangoproject.com/svn/django/trunk@587 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-01 02:18:04 +00:00
Adrian Holovaty dbc4adeeda Fixed #385 -- Fixed bug in yesno template filter. Thanks, eugene@lazutkin.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-31 16:47:06 +00:00
Adrian Holovaty 9635ac07a5 Fixed #403 -- Fixed bug in floatformat template filter. Thanks, nesh
git-svn-id: http://code.djangoproject.com/svn/django/trunk@581 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-31 16:45:10 +00:00
Adrian Holovaty cb6aa1035b Fixed #407 -- Code no longer assumes request.META['REMOTE_ADDR'] exists. Thanks, sune.kirkeby@gmail.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@580 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-31 16:27:59 +00:00
Adrian Holovaty abe7fb8173 Fixed #413 -- get_file_url() for FileFields now uses proper slashes on Windows. Thanks, Adam Endicott
git-svn-id: http://code.djangoproject.com/svn/django/trunk@579 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-31 16:22:07 +00:00
Adrian Holovaty c6e4b232c2 Fixed #349 -- Fixed bug in development server admin media on Windows. Thanks, ibatugow@gmail.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@575 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-29 21:48:32 +00:00
Adrian Holovaty d80ac5ac25 Fixed #256 and #334 -- Added {% ifequal %} template tag. Also, {% ifequal %} and {% ifnotequal %} now both accept an optional {% else %} clause. Unit tests included.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@574 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-29 21:11:41 +00:00
Adrian Holovaty 299c3cdd8c Fixed small bug in manipulator handling of one-to-one-related foreign keys
git-svn-id: http://code.djangoproject.com/svn/django/trunk@572 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-29 16:49:18 +00:00
Adrian Holovaty 2ce78063fa Fixed bug in metasystem manipulator_validator_unique_for_date(), related to [549]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-29 16:44:40 +00:00
Adrian Holovaty 25aef18d83 Fixed bug in metasystem method_get_next_in_order and method_get_previous_in_order, related to [549]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@570 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-29 15:35:04 +00:00
Adrian Holovaty 939e2bccd5 Changed django-admin.py inspectdb to output new-style model syntax
git-svn-id: http://code.djangoproject.com/svn/django/trunk@550 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-26 04:06:18 +00:00
Adrian Holovaty 25264c8604 Fixed #122 -- BIG, BACKWARDS-INCOMPATIBLE CHANGE. Changed model syntax to use fieldname=FieldClass() syntax. See ModelSyntaxChangeInstructions for important information on how to change your models
git-svn-id: http://code.djangoproject.com/svn/django/trunk@549 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-25 22:51:30 +00:00
Adrian Holovaty aec0a73d73 Changed 'coding error' and 'database error' e-mails to include request.path in subject
git-svn-id: http://code.djangoproject.com/svn/django/trunk@548 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-25 00:50:01 +00:00
Adrian Holovaty e5e1ea602d Fixed #350 -- 'offset' DB API parameter now works in MySQL 3. Tests from [540] pass. Thanks, ronan@cremin.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@541 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-19 21:51:14 +00:00
Adrian Holovaty 00c6acaaf3 Fixed #360 -- runserver now takes optional 'ip:port' in addition to 'port'. Thanks, benno@jeamland.net
git-svn-id: http://code.djangoproject.com/svn/django/trunk@539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-19 21:23:56 +00:00
Adrian Holovaty 8d6c276328 Fixed #371 -- Fixed bug in 'random' template filter. Thanks, Boffbowsh
git-svn-id: http://code.djangoproject.com/svn/django/trunk@538 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-19 14:59:09 +00:00
Adrian Holovaty 28d41fe270 Tweaked [531] slightly, so that it checks for 'is None' instead of boolean 'not'
git-svn-id: http://code.djangoproject.com/svn/django/trunk@532 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-18 00:15:39 +00:00
Adrian Holovaty 8a939224fa Added friendly error message if a view returns None instead of an HttpResponse object.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@531 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-18 00:14:15 +00:00
Adrian Holovaty f5ab1320ed Fixed bug in manipulator_valid_rel_key() -- it assumed the related object's primary key was called 'id'
git-svn-id: http://code.djangoproject.com/svn/django/trunk@530 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-17 22:46:43 +00:00
Adrian Holovaty 07889c13a6 Fixed #1 -- Added anonymous session support via middleware and request.session. Removed the former request.session, which wasn't being used anyway. Removed auth.Session model. See the BackwardsIncompatibleChanges wiki page for IMPORTANT notes on code you'll have to change and a DB table you'll have to create.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@518 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-16 22:54:05 +00:00
Adrian Holovaty f21ff30b10 Small formatting change to validation error in [516], to be consistent with other validation errors.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@517 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-16 18:28:00 +00:00
Jacob Kaplan-Moss 7d374ad597 Added raw_id_admin support to ManyToManyField objects; fixes #260
git-svn-id: http://code.djangoproject.com/svn/django/trunk@516 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-16 18:08:37 +00:00
Adrian Holovaty d22e88898f Changed handlers (both mod_python and WSGI) to support setting multiple cookies per request
git-svn-id: http://code.djangoproject.com/svn/django/trunk@511 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-15 22:47:41 +00:00
Adrian Holovaty c727729183 Changed meta.py save() code from [507] to work under sqlite. All tests now pass in all 3 database backends.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@510 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-15 20:03:34 +00:00
Adrian Holovaty 7cfddb3c43 Improved model validator to validate 'choices' for a field
git-svn-id: http://code.djangoproject.com/svn/django/trunk@509 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-15 19:00:50 +00:00
Adrian Holovaty 27986994ee Fixed #320 -- Changed save() code so that it doesn't rely on cursor.rowcount. MySQLdb sets cursor.rowcount to 0 in an UPDATE statement even if the record already exists. Now save() does a SELECT query to find out whether a record with the primary key already exists.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@507 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-15 16:00:28 +00:00
Adrian Holovaty db127b7983 Fixed #322 -- Development server now calls validate() again. Thanks, rmunn
git-svn-id: http://code.djangoproject.com/svn/django/trunk@505 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-15 15:24:56 +00:00
Adrian Holovaty 91c71d36e6 Fixed #322 -- 'django-admin runserver' no longer validates models.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@504 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-15 14:48:07 +00:00
Adrian Holovaty 8f9e5b6b3b Added 'django-admin.py validate', which validates all installed models. Validation only handles common errors at this point, but we'll be improving it each time we think of a potential model syntax problem. Also changed the development Web server to validate automatically at server start.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@503 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-15 05:05:52 +00:00
Adrian Holovaty 4a7159865e Improved error handling for invalid model parameters that aren't custom functions.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@502 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-15 04:44:19 +00:00
Adrian Holovaty 1e479ba90d Fixed #93 and #279 -- 'django-admin startproject' no longer creates invalid settings/admin.py on Windows
git-svn-id: http://code.djangoproject.com/svn/django/trunk@498 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-15 01:24:16 +00:00
Adrian Holovaty bc00059b2f Fixed #316 -- Added special-case for MySQL microseconds, so that it doesn't throw a warning when microseconds are given.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@497 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-15 01:03:39 +00:00
Adrian Holovaty 2c3067b5e5 Fixed #311 -- Small change to docstring. Thanks, rmunn
git-svn-id: http://code.djangoproject.com/svn/django/trunk@496 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-15 00:53:18 +00:00
Adrian Holovaty bf108187a2 Fixed #321 -- Undid [494], which assumed the installed version of MySQLdb had a 'cursors.CursorNW'. Thanks for being consistent, MySQLdb. This opens #316 again.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@495 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-15 00:50:31 +00:00
Adrian Holovaty a9b43edde2 Fixed #316 -- Changed MySQL backend to disregard warnings
git-svn-id: http://code.djangoproject.com/svn/django/trunk@494 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-14 23:59:29 +00:00
Adrian Holovaty 199aa88ffb Moved django.core.handlers.wsgi.AdminMediaHandler to django.core.servers.basehttp. Makes more sense to have it in there, because its only use is for the development server.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@491 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-12 04:16:29 +00:00
Adrian Holovaty 8d8da826db Changed timestamp and time typecasting to preserve microseconds. Added unit tests to test this behavior, and added a db_typecast unit test module. Refs #306.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-11 19:34:34 +00:00
Adrian Holovaty e67882721d Refactored django.core.urlresolvers a tiny bit
git-svn-id: http://code.djangoproject.com/svn/django/trunk@479 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 22:20:18 +00:00
Adrian Holovaty fcfb8edc15 Fixed #126 -- HttpRequest now has a 'raw_post_data' attribute.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@478 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 22:12:05 +00:00
Adrian Holovaty 77d20bedd4 Fixed #192 -- File uploads now work with built-in Web server. Thanks, mordaha@gmail.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@476 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 21:20:45 +00:00
Adrian Holovaty 46d8bbab3d Added help_doc to django.core.management.install
git-svn-id: http://code.djangoproject.com/svn/django/trunk@470 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 20:16:15 +00:00
Adrian Holovaty 199938649e Fixed #81 -- Admin now supports primary_key=True for non-integer fields. Note that you'll have to make a change to your database if you're using a previous Django installation and want to use non-integer primary key fields. See the BackwardsIncompatibleChanges wiki page for info.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@469 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 19:32:38 +00:00
Adrian Holovaty 254f31819b Fixed #299 -- Slugify no longer removes hyphens. Thanks, gch@cs.cmu.edu
git-svn-id: http://code.djangoproject.com/svn/django/trunk@464 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 15:40:14 +00:00
Adrian Holovaty 4622e0ff82 Refactored the way save() works so that non-integer primary keys are now possible. custom_pk unit tests (from [458]) now pass. Refs #81.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 05:08:27 +00:00
Adrian Holovaty 7bac552069 Changed [459] to use a better interface for the exception
git-svn-id: http://code.djangoproject.com/svn/django/trunk@460 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 04:48:47 +00:00
Adrian Holovaty 024e68e260 Changed MySQL backend so that it fails silently if rollback() isn't supported (the code catches NotSupportedError exception)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@459 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 04:45:10 +00:00
Adrian Holovaty 5b812ae02c Undid [455] -- it's not a good enough solution for what I'm trying to do
git-svn-id: http://code.djangoproject.com/svn/django/trunk@457 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 03:50:46 +00:00
Adrian Holovaty 6d234fae8c Slightly refactored metasystem -- changed Field pre_save() hooks to pre_save_add(), in preparation for some bigger changes. Refs #81.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@455 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 03:44:51 +00:00
Adrian Holovaty 258e6bc330 Simplified metasystem get_db_prep_save() hook so that it doesn't take an 'add' parameter -- it wasn't being used, anyway.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@454 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 03:12:37 +00:00
Adrian Holovaty 991832d0c4 Fixed #154 -- Fixed constraint error when deleting an object with a many-to-many field
git-svn-id: http://code.djangoproject.com/svn/django/trunk@447 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 00:21:41 +00:00
Adrian Holovaty b888113f49 Small change to docstring in django.core.template
git-svn-id: http://code.djangoproject.com/svn/django/trunk@443 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-09 22:43:34 +00:00
Adrian Holovaty 4f00611f74 Fixed #211 -- edit_inline_type is deprecated, in favor of edit_inline itself. For example, instead of 'edit_inline=True, edit_inline_type=meta.TABULAR', use 'edit_inline=meta.TABULAR'.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@440 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-09 21:08:00 +00:00
Adrian Holovaty a90e9f43db Companion checkin to [432]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@433 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-08 18:30:07 +00:00
Adrian Holovaty 4003f9f482 Changed 'django-admin adminindex' to output relative links, not absolute links. Thanks, Joe Grace
git-svn-id: http://code.djangoproject.com/svn/django/trunk@426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-07 01:02:48 +00:00
Adrian Holovaty 59c3ebc6dd Greatly improved the 404 error message when DEBUG=True. If none of the urlpatterns matches, Django now displays a list of all the urlpatterns it tried. This should catch a lot of newbie errors, and it's helpful even for power users.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-05 22:22:41 +00:00
Adrian Holovaty a55598cbdd Refactored the internals of URL parsing to use less code
git-svn-id: http://code.djangoproject.com/svn/django/trunk@411 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-05 20:50:19 +00:00
Adrian Holovaty 888cf1f889 Fixed #275 -- Bug in validators.RequiredIfOtherFieldsGiven. Thanks, jhernandez
git-svn-id: http://code.djangoproject.com/svn/django/trunk@410 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-05 15:41:58 +00:00
Adrian Holovaty 0b9330b085 Changed default ManyToOne num_in_admin from 0 to 3, to help avoid confusion when people forget to set num_in_admin
git-svn-id: http://code.djangoproject.com/svn/django/trunk@409 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-05 15:05:16 +00:00
Adrian Holovaty 502755878d Fixed #266 -- Added ValidateIfOtherFieldEquals validator. Thanks again, Hugo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@405 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-04 15:12:11 +00:00
Adrian Holovaty 63eecadfc6 Tightened up some code in django.core.validators
git-svn-id: http://code.djangoproject.com/svn/django/trunk@404 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-04 15:05:55 +00:00
Adrian Holovaty 0c6019295a Refactored django.core.validators.RequiredIfOtherFieldGiven to remove duplicate code
git-svn-id: http://code.djangoproject.com/svn/django/trunk@403 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-04 15:05:15 +00:00
Adrian Holovaty 2315ccc499 Fixed #268 -- Added AnyValidator and fixed small bug in [399]. Thanks, Hugo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@402 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-04 14:57:20 +00:00
Adrian Holovaty dae5863058 Fixed #263 -- inspectdb output now includes a comment reminding people to run sqlinitialdata. Thanks, Hugo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@401 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-04 14:51:46 +00:00
Adrian Holovaty 3f2df5e7aa Fixed #269 -- Added MatchesRegularExpression validator. Thanks, Hugo!
git-svn-id: http://code.djangoproject.com/svn/django/trunk@399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-04 14:42:01 +00:00
Adrian Holovaty cfbf261709 Improved 'django-admin inspectdb' so that it doesn't raise an exception for unknown field types. Now it uses TextField by default and outputs a Python comment.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@398 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-04 03:49:24 +00:00
Adrian Holovaty 808e50986b Fixed #257 -- Empty model modules no longer cause an error. Thanks, Bill de hÓra
git-svn-id: http://code.djangoproject.com/svn/django/trunk@397 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-04 03:32:56 +00:00
Adrian Holovaty f4e4ae96cb Improved 'django-admin inspectdb' so that it detects ForeignKey relationships -- PostgreSQL only
git-svn-id: http://code.djangoproject.com/svn/django/trunk@395 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-02 22:33:39 +00:00
Jacob Kaplan-Moss ce0d0cd9e2 Made a bunch of fixes to auto-generated admin documentation:
* Views are no longer "doubled"
    * Links work better (view -> model links and friends were broken)
    * Performance has been improved so now the pages no longer need to be cached.
    


git-svn-id: http://code.djangoproject.com/svn/django/trunk@391 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-02 19:59:51 +00:00
Jacob Kaplan-Moss ffc3edd79e Fixed a subtle bug with the {% load %} tag: if a tag/filter was removed from template.registered_tags/filters, {% load %} would fail (since module-level code is only run on an initial import). {% load %} now reloads the module, which makes sure that the tag always works even when someone's been doing something screwy. This fixes #242 (and wouldn't had been found without it, so much thanks).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@390 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-02 18:47:46 +00:00
Adrian Holovaty d9401b78f1 Added first stab at 'django-admin.py inspectdb', which takes a database name and introspects the tables, outputting a Django model. Works in PostgreSQL and MySQL. It's missing some niceties at the moment, such as detection of primary-keys and relationships, but it works. Refs #90.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-02 17:08:24 +00:00
Jacob Kaplan-Moss 1510ca1a80 Fixed #227 -- the sqlite backend now correctly typecasts unicode objects to bytestrings (thanks hugo)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@383 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-01 21:49:57 +00:00
Adrian Holovaty e0c3dd3318 Refactored meta.py -- created a django.core.meta package, with init.py and fields.py
git-svn-id: http://code.djangoproject.com/svn/django/trunk@378 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-01 21:29:52 +00:00
Adrian Holovaty b307fb09bb Fixed #239 and #107 -- Changed model init() to use Field.get_default() if the value wasn't explicitly passed as a keyword argument. That means setting 'id=None' is no longer necessary, and you can leave off fields if you want them to have default values set.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@360 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-01 16:26:39 +00:00
Adrian Holovaty 1a8fc57bf6 Fixed #214 -- Added get_values() and get_values_iterator() module-level functions to DB API. Thanks, rmunn
git-svn-id: http://code.djangoproject.com/svn/django/trunk@359 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-01 15:32:42 +00:00
Jacob Kaplan-Moss af95567c14 Improved error message in urlresolvers (fixes #240)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@357 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-01 14:41:01 +00:00
Adrian Holovaty 47ce61533a Fixed #228 -- Better handling of timezones. Thanks, rmunn
git-svn-id: http://code.djangoproject.com/svn/django/trunk@347 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-29 21:40:09 +00:00
Adrian Holovaty 017b8753a6 Fixed #219 and #188 -- Database timestamp typecast no longer assumes '-' delineates the time zone
git-svn-id: http://code.djangoproject.com/svn/django/trunk@346 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-29 21:10:09 +00:00
Adrian Holovaty 1d2ab36068 Fixed bug for models with a ForeignKey('self') and order_with_respect_to
git-svn-id: http://code.djangoproject.com/svn/django/trunk@332 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-27 19:20:29 +00:00
Adrian Holovaty d52db2d879 Changed django.core.management.get_sql_delete to be more robust when many-to-many tables don't exist
git-svn-id: http://code.djangoproject.com/svn/django/trunk@330 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 23:18:08 +00:00
Adrian Holovaty d8ef66b17d Fixed #186 -- Refactored meta.py to remove duplicate code between function_get_list and function_get_iterator. Thanks, rmunn@pobox.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@329 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 23:04:50 +00:00
Adrian Holovaty b23c63bcfe Fixed #206 -- 'django-admin sqlclear' now deletes from admin log to prevent referential integrity violations
git-svn-id: http://code.djangoproject.com/svn/django/trunk@323 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 22:38:54 +00:00
Adrian Holovaty aeff2cb530 Fixed #93 -- Fixed 'django-admin startproject' to use os.path.join instead of string concatenation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@322 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 22:15:51 +00:00
Adrian Holovaty 5a3da949fa Fixed #198 -- istartswith and iendswith weren't working properly. Thanks, brantley
git-svn-id: http://code.djangoproject.com/svn/django/trunk@321 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 18:38:44 +00:00
Adrian Holovaty 8a86e7713f Fixed #161 -- Log output for 'django-admin runserver' no longer includes admin media
git-svn-id: http://code.djangoproject.com/svn/django/trunk@320 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 17:49:49 +00:00
Adrian Holovaty 284948b9cf Fixed #166 -- Added an 'in' lookup type to the database API
git-svn-id: http://code.djangoproject.com/svn/django/trunk@318 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 16:53:58 +00:00
Adrian Holovaty 786c750c40 Fixed #163 -- Added 'pk' database API option, which is a shorthand for (primary_key)__exact
git-svn-id: http://code.djangoproject.com/svn/django/trunk@316 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 16:11:43 +00:00
Adrian Holovaty e207378ad3 Fixed #204 -- Changed 'django-admin createsuperuser' to disallow blank passwords
git-svn-id: http://code.djangoproject.com/svn/django/trunk@314 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 14:37:00 +00:00
Jacob Kaplan-Moss 48441f467f Fixed #193 -- thanks (again), steadicat
git-svn-id: http://code.djangoproject.com/svn/django/trunk@311 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-25 22:17:47 +00:00
Jacob Kaplan-Moss 12ffae6df4 Fixed #197 -- thanks for finding that, mmarshall
git-svn-id: http://code.djangoproject.com/svn/django/trunk@309 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-25 22:15:07 +00:00
Adrian Holovaty c97efb6799 Fixed #63 -- Refactored django.core.handlers into subclasses to remove duplicate code
git-svn-id: http://code.djangoproject.com/svn/django/trunk@298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-22 18:34:38 +00:00
Adrian Holovaty d573cb021e Fixed #112 -- WSGI handler now displays proper text status. Thanks, sune.kirkeby@gmail.com!
git-svn-id: http://code.djangoproject.com/svn/django/trunk@297 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-22 18:12:05 +00:00
Adrian Holovaty 837a64565b Django now outputs a warning if you use old ordering syntax
git-svn-id: http://code.djangoproject.com/svn/django/trunk@293 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-22 13:03:50 +00:00
Adrian Holovaty 8b3c05afa5 Fixed #146 -- Changed order_by and ordering parameters to be less verbose. The old syntax is still supported but will not be supported by first release.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@292 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-22 13:02:27 +00:00
Adrian Holovaty 05bdb8d64b Fixed a legacy ordering_tuple --> order_by renaming in core.paginator
git-svn-id: http://code.djangoproject.com/svn/django/trunk@291 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-22 05:11:37 +00:00
Jacob Kaplan-Moss e320a0936e Added sqlite3 database backend -- somewhat tested, but probably not 100% perfect.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@288 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-22 03:15:43 +00:00
Jacob Kaplan-Moss 78cff1837a Refactor dictfetch* methods from mysql backend out into a seperate module; this is so that future db backends that need these functions can share them.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@276 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-21 15:48:20 +00:00
Adrian Holovaty 841b426243 Cleaned up [269] a tiny bit
git-svn-id: http://code.djangoproject.com/svn/django/trunk@272 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-21 15:01:31 +00:00
Jacob Kaplan-Moss ccffb19946 Fixed #132 -- thanks anonymous user
git-svn-id: http://code.djangoproject.com/svn/django/trunk@270 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-21 14:01:17 +00:00
Jacob Kaplan-Moss 907ae72e81 fixes #133 -- thanks Joeri
git-svn-id: http://code.djangoproject.com/svn/django/trunk@269 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-21 13:57:42 +00:00
Adrian Holovaty 9566a61a22 Added auto-reload to standalone server! Fixes #113. Thanks very much to Jason Huggins for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@266 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-21 04:08:54 +00:00
Adrian Holovaty c21f6ecee2 Fixed #92 -- meta.Admin 'fields' parameter is now optional. If it's not given, Django will use all editable fields by default. This cuts down on redundancy. Also updated relevant docs to reflect the change.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@265 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-21 03:46:16 +00:00
Adrian Holovaty 304b08e325 Improved 'django-admin runserver' so that it explicitly tells you how to stop it. Also trapped KeyboardInterrupt so stopping it doesn't give an ugly traceback.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@264 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-21 03:24:28 +00:00
Adrian Holovaty 8d144dadd8 Fixed #114 -- Changed uses of deprecated 'whrandom' module to 'random'
git-svn-id: http://code.djangoproject.com/svn/django/trunk@262 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-21 02:20:40 +00:00
Adrian Holovaty d330be0169 Added 'django-admin createsuperuser' and updated tutorial to use it instead of manually creating the user in the Python interactive prompt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@261 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-21 02:17:45 +00:00
Adrian Holovaty bc5359f754 Added optional rel_name parameter to ManyToManyField, which makes it possible to many-to-many-relate a single model to another model more than once. Also updated the model docs to reflect this
git-svn-id: http://code.djangoproject.com/svn/django/trunk@257 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 22:55:01 +00:00
Adrian Holovaty 895d232671 Small code cleanup -- changed django.core.management.get_sql_delete to use get_m2m_db_table(), and moved get_m2m_db_table() from Field to ManyToManyField, because it's only used by the latter
git-svn-id: http://code.djangoproject.com/svn/django/trunk@256 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 21:56:12 +00:00
Adrian Holovaty 1fc28dea11 Fixed #97 -- Refactored django-admin.py so that it only contains command-line-interface code. Moved the actual meat into django/core/management.py
git-svn-id: http://code.djangoproject.com/svn/django/trunk@242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 15:00:34 +00:00
Adrian Holovaty e215ed3609 Fixed #102 -- Now using text/plain mimetype for exceptions displayed in the browser, so angle brackets are no longer an issue
git-svn-id: http://code.djangoproject.com/svn/django/trunk@241 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 06:13:06 +00:00
Adrian Holovaty 584cab7bc5 Fixed ForeignKey('self') so that extra cruft parameters aren't necessary. Also refactored the way meta.Admin is handled, so that fields aren't initialized until you manually call meta.Admin.get_field_objs()
git-svn-id: http://code.djangoproject.com/svn/django/trunk@238 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 05:46:00 +00:00
Adrian Holovaty 20820f2e85 Made ModPythonHandler.get_response() tolerant of repr(request) that has an exception
git-svn-id: http://code.djangoproject.com/svn/django/trunk@232 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 00:47:10 +00:00
Adrian Holovaty 5874952a8e Improved error message when DATABASE_ENGINE is invalid. It now displays a list of all available database backends
git-svn-id: http://code.djangoproject.com/svn/django/trunk@215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 19:04:12 +00:00
Adrian Holovaty df66763406 Fixed #67 -- Human-readable name is now optional in model fields. If a second positional argument isn't given, Django will use the first argument, converting underscores to spaces. This change is fully backwards-compatible.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@212 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 17:20:37 +00:00
Adrian Holovaty 3e09a1fc1c Quick bugfix to [207] -- MySQL doesn't have ILIKE
git-svn-id: http://code.djangoproject.com/svn/django/trunk@208 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 15:24:27 +00:00
Adrian Holovaty 5797066383 Added support for istartswith and iendswith in database API
git-svn-id: http://code.djangoproject.com/svn/django/trunk@207 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 15:24:03 +00:00
Adrian Holovaty b430d4c54f Improved error message in urlresolvers.RegexURLResolver.resolve to use repr instead of str on app_path
git-svn-id: http://code.djangoproject.com/svn/django/trunk@204 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 14:47:41 +00:00
Adrian Holovaty fc85642ed5 Added a more helpful error message to django.core.urlresolvers.RegexURLResolver.resolve
git-svn-id: http://code.djangoproject.com/svn/django/trunk@196 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 05:45:31 +00:00
Adrian Holovaty 7d553c0650 Improved TemplateDoesNotExist error message in django.core.template_file
git-svn-id: http://code.djangoproject.com/svn/django/trunk@194 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 04:40:57 +00:00
Adrian Holovaty 3ab5791383 Improved ViewDoesNotExist error messages in django.core.urlresolvers
git-svn-id: http://code.djangoproject.com/svn/django/trunk@193 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 04:30:23 +00:00
Adrian Holovaty 8f4fa5a4e7 Fixed #69 -- Implemented dictfetchone(), dictfetchmany() and dictfetchall() for mysql DB backend. Thanks, Manuzhai!
git-svn-id: http://code.djangoproject.com/svn/django/trunk@190 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 02:13:20 +00:00
Adrian Holovaty 62cc287b2b Fixed #76 -- development server now serves images, too, at whatever relative URL is provided by ADMIN_MEDIA_PREFIX
git-svn-id: http://code.djangoproject.com/svn/django/trunk@186 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-18 22:49:04 +00:00
Adrian Holovaty a7506973af Moved default admin from media to django/conf/admin_media, so Django is able to introspect their location, in preparation for #76
git-svn-id: http://code.djangoproject.com/svn/django/trunk@185 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-18 22:35:04 +00:00
Adrian Holovaty cf4c164e9f Changed core.handlers.modpython.populate_apache_request NOT to have side effects on http_response. This has no effect on legacy code but will prevent problems in new code
git-svn-id: http://code.djangoproject.com/svn/django/trunk@181 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-18 20:14:05 +00:00
Adrian Holovaty b68c478aa5 Added 'django-admin.py runserver', which starts a lightweight development server running Django on a local port
git-svn-id: http://code.djangoproject.com/svn/django/trunk@174 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-18 15:25:58 +00:00
Adrian Holovaty 78206fd08c Fixed #56 -- MySQL id columns are now UNSIGNED. Thanks, Manuzhai!
git-svn-id: http://code.djangoproject.com/svn/django/trunk@171 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-18 13:53:45 +00:00
Adrian Holovaty 86d9ae269d Moved django.bin.profiling.handler to django.core.handlers.profiler-hotshot
git-svn-id: http://code.djangoproject.com/svn/django/trunk@170 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-18 06:34:34 +00:00
Adrian Holovaty ca3d89b70f Added WSGI support. Created core.handlers package. Moved ALL mod_python-specific code to django.core.handlers.modpython. Note that django.core.handler is still a valid mod_python handler but IS DEPRECATED. Use django.core.handlers.modpython, instead.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@169 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-18 06:30:26 +00:00
Adrian Holovaty 4e094e26e6 Renamed django.core.handler.CoreHandler to ModPythonHandler, in preparation for WSGI support
git-svn-id: http://code.djangoproject.com/svn/django/trunk@168 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-18 06:10:00 +00:00
Adrian Holovaty feeeda969c Rolled django.core.extensions.DjangoRequest into django.utils.httpwrappers.ModPythonRequest, in preparation for WSGI support
git-svn-id: http://code.djangoproject.com/svn/django/trunk@167 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-18 06:05:18 +00:00
Adrian Holovaty 246c1f88d9 Removed legacy CMSContext and CMSRequest from django.core.extensions, because all World Online code has been changed to remove those. This has no effect on anybody other than World Online
git-svn-id: http://code.djangoproject.com/svn/django/trunk@166 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-18 06:01:39 +00:00
Adrian Holovaty f3a43a2dd4 Folded django.core.handler.CoreHandler.get_request() into CoreHandler.call()
git-svn-id: http://code.djangoproject.com/svn/django/trunk@164 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-18 03:13:02 +00:00
Adrian Holovaty b1c543d091 Factored out database-specific date_trunc behavior into dbmod.get_date_trunc_sql(). Refs #46
git-svn-id: http://code.djangoproject.com/svn/django/trunk@161 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-17 20:16:06 +00:00
Adrian Holovaty d4ddc06021 Changed core.db to give a friendlier error message if the DATABASE_ENGINE setting is invalid
git-svn-id: http://code.djangoproject.com/svn/django/trunk@160 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-17 20:03:24 +00:00
Adrian Holovaty 272b217557 Factored out database-specific date_extract behavior into dbmod.get_date_extract_sql(). Refs #46
git-svn-id: http://code.djangoproject.com/svn/django/trunk@159 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-17 18:23:34 +00:00
Adrian Holovaty 58df4ce636 Fixed #40 -- Removed legacy code from meta.py method_set_related_many_to_many(). Thanks, jforeman@hark.org
git-svn-id: http://code.djangoproject.com/svn/django/trunk@157 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-17 17:27:34 +00:00
Adrian Holovaty 6ae4def03b Fixed #42 -- OneToOneField now works with SQL generation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@156 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-17 17:22:17 +00:00
Adrian Holovaty 1e0fb3b7a3 Added helpful error message if DATABASE_NAME or DATABASE_USER is blank for postgresql
git-svn-id: http://code.djangoproject.com/svn/django/trunk@122 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-16 22:21:50 +00:00
Adrian Holovaty 60bdadb9a3 Moved django.core.handler.ImproperlyConfigured into django.core.exceptions
git-svn-id: http://code.djangoproject.com/svn/django/trunk@120 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-16 22:12:24 +00:00
Adrian Holovaty caef61945d Fixed #39 -- Thanks for the research, deelan!
git-svn-id: http://code.djangoproject.com/svn/django/trunk@113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-16 21:10:25 +00:00
Adrian Holovaty 5721396426 Fixed inconsistent capitalization in [109]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@110 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-16 16:56:27 +00:00
Adrian Holovaty 361be49fe7 Changed postgresql DB backend so that it gives a helpful error message if people are using psycopg 2 instead of version 1
git-svn-id: http://code.djangoproject.com/svn/django/trunk@109 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-16 16:55:11 +00:00
Adrian Holovaty 8d0610d054 Gave django.core.meta.Model a repr(), as a fallback
git-svn-id: http://code.djangoproject.com/svn/django/trunk@89 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-15 23:48:54 +00:00
Jacob Kaplan-Moss 8acc6048e8 Removed the vestigal get_choices_from from ManyToMany relations.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@64 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-15 19:44:52 +00:00
Adrian Holovaty dc2933f73b Fixed #3 -- Made OneToOneField act like ForeignKey and ManyToManyField. This is the last big API change before the official launch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@59 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-15 18:40:21 +00:00
Adrian Holovaty f4c581158d Renamed CMSRequest to DjangoRequest, and CMSContext to DjangoContext. Old code will still work.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@57 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-15 17:09:01 +00:00
Adrian Holovaty a051772b85 Changed mentions of CMS to Django in django.core xheaders and exceptions
git-svn-id: http://code.djangoproject.com/svn/django/trunk@55 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-15 16:52:08 +00:00
Adrian Holovaty eb9c9ab4d0 Changed django.core.mail to use [Django] prefix instead of [CMS]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@54 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-15 16:47:19 +00:00
Adrian Holovaty 2e4322123f Changed many-to-many API to be get_FOO_list instead of get_FOOs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-14 03:17:09 +00:00
Adrian Holovaty 3c0ee70e7c Changed db/backends/postgresql.py to add the password and host params only if they're not blank
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-13 20:59:56 +00:00
Adrian Holovaty ed114e1510 Imported Django from private SVN repository (created from r. 8825)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-13 01:25:57 +00:00