54 Commits

Author	SHA1	Message	Date
Adrian Holovaty	56a75a2a4e	Fixed #5077 -- django/utils/encoding.py no longer imports settings, as it doesn't use that module. Thanks, Collin Grady ... git-svn-id: http://code.djangoproject.com/svn/django/trunk@5810 bcc190cf-cafb-0310-a4f2-bffc1f526a37	2007-08-06 05:06:15 +00:00
Malcolm Tredinnick	953badbea5	Merged Unicode branch into trunk (r4952:5608). This should be fully ... backwards compatible for all practical purposes. Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702 git-svn-id: http://code.djangoproject.com/svn/django/trunk@5609 bcc190cf-cafb-0310-a4f2-bffc1f526a37	2007-07-04 12:11:04 +00:00
Malcolm Tredinnick	56d56e5bac	Added a FIXME that I forgot to include earlier. ... git-svn-id: http://code.djangoproject.com/svn/django/trunk@4923 bcc190cf-cafb-0310-a4f2-bffc1f526a37	2007-04-04 13:25:53 +00:00
Malcolm Tredinnick	1bddac37b6	Moved smart_unicode and StrAndUnicode to django.utils.encoding. They are useful ... outside of newforms. This is backwards compatible as far as smart_unicode goes (since newforms.util still imports it). All imports of smart_unicode and StrAndUnicode have also been updated. git-svn-id: http://code.djangoproject.com/svn/django/trunk@4918 bcc190cf-cafb-0310-a4f2-bffc1f526a37	2007-04-04 06:34:19 +00:00