innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
12,351 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

62 Commits

Author SHA1 Message Date
Aymeric Augustin cacd845996 [py3] Fixed remaining Python 3 syntax errors. 
django.utils.unittest.* weren't touched -- they're only imported on Python 2.6.
 2012-07-22 09:29:53 +02:00
Aymeric Augustin e84f79f051 Fixed #18042 -- Advanced deprecation warnings. 
Thanks Ramiro for the patch.
 2012-05-03 15:27:01 +02:00
Claude Paroz 596cb9c7e2 Replaced print statement by print function (forward compatibility syntax). 2012-04-30 20:45:03 +02:00
Claude Paroz 3904b74a3f Fixed #18013 -- Use the new 'as' syntax for exceptions. 
Thanks Clueless for the initial patch.
Note that unittest has been purposely left out (external package only used by Python 2.6).
 2012-04-29 20:57:15 +02:00
Aymeric Augustin d38690796c Removed the deprecated reset and sqlreset management commands. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-31 12:38:11 +00:00
Jannis Leidel 538257b4ae Fixed #10080 -- Slightly extended the fix made in r10401 by also taking command line options into account that don't have have a default set. Thanks, Claude Paroz. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17467 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-09 18:56:41 +00:00
Aymeric Augustin 175e6d77df Fixed #11745 -- Grouped commands by application in the output of `manage.py help`. Made 'version' consistent with 'help' while I was in the area, and added tests. Thanks Jannis for the feedback and review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-07 18:46:29 +00:00
Aymeric Augustin 40f0ecc56a Implemented PEP386-compatible version numbers. Thanks Jannis for the guidance. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17357 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-08 15:05:15 +00:00
Jannis Leidel a9a0f0b03f Fixed #17042 -- Extended startproject and startapp management commands to better handle custom app and project templates. Many thanks to Preston Holmes for his initial patch and Alex Gaynor, Carl Meyer, Donald Stufft, Jacob Kaplan-Moss and Julien Phalip for code reviewing. 
* Added ability to pass the project or app directory path as the second argument
* Added ``--template`` option for specifying custom project and app templates
* Cleaned up admin_scripts tests a little while I was there

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17246 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-22 22:38:02 +00:00
Adrian Holovaty 20c8aa2a20 Fixed various dodgy behaviours 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17226 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-17 17:37:24 +00:00
Carl Meyer 38f1fe3b35 Fixed #15372 -- Switched to a startproject default layout that allows us to avoid sys.path hacks. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 05:56:15 +00:00
Alex Gaynor 8e1226b4a0 Kill some more dead code. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 22:46:44 +00:00
Jannis Leidel fb590bfa9b Replaced `has_key()` calls with `in` to ease Python 3 port. Thanks, Martin von Löwis. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16740 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-09 19:33:40 +00:00
Ramiro Morales 1d7fa75c97 Fixed #15064 -- Made manage.py honor the existence and value of DJANGO_SETTINGS_MODULE env var. Thanks olau for the report and Shawn Milochik for a patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16222 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-13 12:15:52 +00:00
Adrian Holovaty 471c9aee97 Fixed #9158 -- Changed django-admin.py help to be printed to stdout instead of stderr, so that it's more easily greppable. Thanks, petr.marhoun@gmail.com 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-26 17:45:42 +00:00
Russell Keith-Magee b151bccdcc Fixed #15359 -- Ensure that the -h option is always honored by django-admin.py. Thanks to teubank for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15605 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-21 13:45:57 +00:00
Russell Keith-Magee d75922dad6 Fixed #13610 -- Improved error reporting when the ENGINE setting is ommitted from a database configuration. Thanks to Gregor Müllegger for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13489 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-05 13:18:50 +00:00
Adrian Holovaty a4b0947a92 Fixed #11842 -- django-admin.py now displays usage information if invoked with no arguments. Thanks, bitprophet 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12198 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-10 21:36:12 +00:00
Adrian Holovaty 5ceed0a053 Changed a whole bunch of places to raise exception instances instead of old-style raising exception classes plus a comma. Good for the future Python 3 conversion 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12180 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-10 18:36:20 +00:00
Russell Keith-Magee 7875421a03 Fixed #11243 -- Ensured that bash_completion output is emitted in sorted order. Thanks to Alex Gaynor for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11747 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-19 04:35:31 +00:00
Joseph Kocherhans 677ddcbb04 Fixed #10752. Added more advanced bash completion. Thanks, Arthur Koziel. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11526 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-11 23:15:59 +00:00
Jacob Kaplan-Moss d20a0834ac Fixed #9751: admin scripts now calculate the project directory correctly when the settings module is a directory with an ``__init__.py``. Thanks to Eric Holscher. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10751 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-12 21:45:03 +00:00
Jacob Kaplan-Moss 8da2322cad Fixed #10080: `call_command` now takes option defaults into account, sparing individual commands from any difference between `call_command` and being run from the shell. Thanks, Alex Koshelev. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10400 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-05 17:27:26 +00:00
Jacob Kaplan-Moss 624caace17 Fixed #9005: don't wig out when reversing a URL if SETTINGS_MODULE isn't set. While I was there, I fixed #10599 by re-raising the original error message, which is almost always a better idea. Thanks, Eric 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10350 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 22:46:46 +00:00
Jacob Kaplan-Moss c485e236bd Fixed #8193: all dynamic imports in Django are now done correctly. I know this because Brett Cannon borrowed the time machine and brought Python 2.7's '`importlib` back for inclusion in Django. Thanks for the patch-from-the-future, Brett! 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10088 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-18 16:55:59 +00:00
Jacob Kaplan-Moss fd28d04c39 Merge branch 'master' into upstream-trunk 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-02-16 21:03:09 +00:00
Malcolm Tredinnick 9c6efb2eea Fixed #9789 -- Handle jython's compiled settings filename correctly. 
Patch from Frank Wierzbicki.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-19 12:46:54 +00:00
Malcolm Tredinnick 3e267a695e Fixed #9455 -- Tiny cleanup to avoid an "undefined variable" warning. The net 
effect is the same in any case (bailing out to the global exception catcher).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9470 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-11-16 09:27:16 +00:00
Malcolm Tredinnick 79968f9867 Fixed #8703 -- Allow deeply nested import paths for DJANGO_SETTINGS_MODULE when 
running django-admin.py. Also adds a parameter to setup_environ() for others to
use as well.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8768 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 18:21:06 +00:00
Malcolm Tredinnick c92b424e57 Fixed #8239 -- Google App Engine has a restricted "imp" module, which doesn't 
include one of the methods we use when constructing management help commands.
So postpone the resolving of the method name until when we actually need it
(which isn't run as part of GAE). Patch from Guido van Rossum.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8425 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-17 17:35:33 +00:00
Russell Keith-Magee 05ef002048 Fixed #8246 -- Corrected the handling of settings files. Thanks to AdamG and chrj for their parallel reports and fixes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8323 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-12 13:39:46 +00:00
Russell Keith-Magee ec7d8b7c61 Fixed #5943 -- Modified django-admin to behave like manage.py if settings are provided, either as --settings or DJANGO_SETTINGS_MODULE. Thanks to Joseph Kocherhans and Todd O'Bryan for their work on this ticket. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8282 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-10 08:42:49 +00:00
Russell Keith-Magee 9dfad99257 Fixed #8120, #7997 -- Cleaned up the help messages displayed by django-admin so that the lax options aren't repeated, and the lax options are displayed when no subcommand is provided. Thanks to Scott Moonen <smoonen@andstuff.org> and trevor for the respective reports. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8228 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 13:40:11 +00:00
Russell Keith-Magee 196b282775 Fixed #5825 -- Modified the custom command loader to allow for explicit specification of the project name, even if the project directory isn't in the python path. This brings custom command loading into alignment with application loading. Thanks to jdetaeye@frepple.com for the original report, and to abozanich for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8227 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 12:27:40 +00:00
Russell Keith-Magee 8e0b6bdcd5 Fixed #6017 -- Modified the Lax parser to allow --settings and the other core management arguments to appear anywhere in the argument list. Thanks to Todd O'Bryan for the suggestion and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7888 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-11 13:18:19 +00:00
Jacob Kaplan-Moss 32933d27b2 Fixed a corner case in management.setup_environ (it was triggered under Cygwin, but also perhaps could happen elsewhere). Thanks, Doug Napoleone. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7316 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-19 04:04:19 +00:00
Adrian Holovaty 0c8f8f27fb Undid [6718], as it broke 'django-admin.py runserver' for a reason I haven't figured out yet 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6871 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-04 05:53:33 +00:00
Adrian Holovaty dca16b283d Cleaned up some docstrings and removed some unnecessary long-line breaking in django/core/management/__init__.py as I try to figure out why django-admin.py runserver has stopped working 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6870 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-04 05:46:46 +00:00
Malcolm Tredinnick a88ca126fc Fixed #5002 -- Fixed a small problem when running via pdb. Thanks, dummylink@gmail.com. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6853 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-02 23:26:01 +00:00
Malcolm Tredinnick 81832f594d Fixed #5743 -- Tweaked the exceptions raised when importing settings so that we 
cooperate with Python's standard help() function. Patch from ionut_bizau and
Ben Slavin.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6832 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-02 15:27:44 +00:00
Russell Keith-Magee 6b626800f8 Fixed #5943 -- Modified django-admin.py to work like manage.py whenever a --settings option is provided. Thanksfor the patch, Todd O'Bryan. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6718 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-26 12:32:57 +00:00
Gary Wilson Jr 2dfad61fcc Added to docstring of `setup_environ` about what the function returns. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6620 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-27 16:03:24 +00:00
Malcolm Tredinnick 0ffeb3a42f Fixed "django-admin.py --version" so that it doesn't print the version string 
twice.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6591 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-21 22:06:52 +00:00
Gary Wilson Jr 088cb3c2f3 Django coding style fixes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6528 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-19 01:26:09 +00:00
Gary Wilson Jr d2952d47ce Refs #5690 -- Changed path joining to use `os.pardir` instead of `'..'`. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6456 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-06 02:23:59 +00:00
Russell Keith-Magee 872f06d770 Fixed #5566 -- Fixed typo from [6042]. Thanks to thomas@gumption.com and mir for bringing attention to this. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6404 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-22 00:27:07 +00:00
Russell Keith-Magee 87d71277b8 Fixed misleading comment from [6402]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6403 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-21 17:54:15 +00:00
Russell Keith-Magee 901c3708fb Fixed #5564 -- Fixed handling of the ProjectCommand used by startapp. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6402 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-21 17:52:36 +00:00
Russell Keith-Magee 626a341587 Clean up of the command line argument error processing from [6400]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6401 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-21 16:52:32 +00:00
Russell Keith-Magee 302eeaf190 Fixed #5516 -- Added the ability for applications to define their own management commands. Pieces of this patch taken from a contribution by Todd O'Bryan. Thanks Todd. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6400 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-21 16:19:20 +00:00