Andrew Godwin 03ec3219a0 Merge branch 'master' into schema-alteration ...

Conflicts:
	django/db/backends/mysql/introspection.py
	django/db/backends/oracle/creation.py
	django/db/backends/postgresql_psycopg2/creation.py
	django/db/models/base.py
	django/db/models/loading.py

2013-07-22 19:04:25 +01:00

..

2to3_fixes

[py3] Added fixer for python_2_unicode_compatible.

2012-08-12 14:44:40 +02:00

translation

Removed obsolete attribute of DjangoTranslation

2013-05-25 14:01:52 +02:00

__init__.py

Imported Django from private SVN repository (created from r. 8825)

2005-07-13 01:25:57 +00:00

_os.py

Fixed loaddata for Django checkouts with non ASCII chars in the name.

2013-06-03 13:18:16 +02:00

archive.py

Ensured that the archive module consistantly explicitly closed all files.

2012-08-15 02:53:40 -07:00

autoreload.py

Made dev server autoreloader ignore filenames reported as None.

2013-01-11 15:31:39 -03:00

baseconv.py

Fix copyright holder

2012-07-06 15:24:07 -03:00

cache.py

[py3] Always fed hashlib with bytes.

2013-02-27 10:02:07 +01:00

checksums.py

Removed django.contrib.localflavor.

2012-12-29 21:59:06 +01:00

crypto.py

Switched to using some constants the hmac module exposes.

2013-06-02 10:31:38 -07:00

daemonize.py

Switched to octal notation (bis).

2012-07-20 13:42:44 +02:00

datastructures.py

Merge branch 'master' into schema-alteration

2013-07-02 10:49:53 +01:00

dateformat.py

Replaced an antiquated pattern.

2013-05-17 18:08:58 +02:00

dateparse.py

Fixed #18728 -- Made colon optional in tzinfo

2012-08-19 21:47:41 +02:00

dates.py

Fixed #9988 (again) -- Updated list of Associated Press months names to use a translation context. Thanks, Claude Paroz.

2011-01-21 22:25:50 +00:00

datetime_safe.py

Fixed #12524 -- Clarified handling of pre-1000AD dates in datetime_safe (and thus, the serializers). Patch includes moving the datetime_safe tests into the utils regressiontests module. Thanks to gsf for the report and initial patch.

2010-02-13 14:02:32 +00:00

decorators.py

Restricted a workaround for a bug in Python to the affected versions.

2013-03-12 14:05:10 +01:00

deprecation.py

Fixed #15363 -- Renamed and normalized to get_queryset the methods that return a QuerySet.

2013-03-08 10:11:45 -05:00

dictconfig.py

Deprecated django.utils.dictconfig.

2013-07-01 22:50:58 +02:00

encoding.py

Removed django.utils.encoding.StrAndUnicode class, deprecated in Django 1.5.

2013-06-28 23:16:28 -03:00

feedgenerator.py

Fixed #14656 -- Added Atom1Feed published element

2013-07-19 10:38:34 -04:00

formats.py

Fixed #19917 -- Added microseconds in default TIME_INPUT_FORMATS

2013-03-02 18:11:10 +01:00

functional.py

Merge branch 'master' into schema-alteration

2013-07-22 19:04:25 +01:00

html_parser.py

Fix an HTML-parser test that's failed in Python 2.6.8 since 5c79dd58.

2012-09-09 12:13:42 -06:00

html.py

Removed several unused imports.

2013-06-19 17:18:40 +02:00

http.py

Fixed #14881 -- Modified password reset to work with a non-integer UserModel.pk.

2013-06-26 13:11:47 -04:00

image.py

Added clarification comments to django.utils.image; refs #19934

2013-07-12 12:38:00 +02:00

importlib.py

[py3] Added Python 3 compatibility for xrange.

2012-07-22 09:29:56 +02:00

ipv6.py

Fixed #20199 -- Allow ModelForm fields to override error_messages from model fields

2013-06-18 08:01:17 -04:00

itercompat.py

Fixed #20746 -- Removed Python 2.6 specific code/docs

2013-07-14 13:02:55 -04:00

jslex.py

Fixed #16971 - Made the parsing of javascript files by 'makemessages' much faster. Thanks Antti Haapala for the implementation and Ned Batchelder for the patch.

2011-10-04 20:11:41 +00:00

log.py

Relied on NullHandler from the logging stdlib module.

2013-07-01 23:16:25 +02:00

module_loading.py

Fixed #20167 -- Preserve the traceback of ImportErrors in import_by_path.

2013-03-31 23:00:06 -04:00

numberformat.py

Fixed #18800 -- Support numbers bigger than max float in numberformat.

2012-09-18 19:43:50 +02:00

regex_helper.py

[py3] Ported django.utils.regex_helper.

2012-08-07 12:00:24 +02:00

safestring.py

Fixed #20296 -- Allowed SafeData and EscapeData to be lazy

2013-05-25 16:06:44 +02:00

six.py

Fixed #20016: worked around Jython not having a buffer.

2013-03-27 13:39:52 -05:00

synch.py

Removed with_statement imports, useless in Python >= 2.6. Refs #17965. Thanks jonash for the patch.

2012-03-30 08:02:08 +00:00

termcolors.py

Initial stab at a migrate command, it's probably quite a way off.

2013-06-07 18:47:17 +01:00

text.py

Removed several unused imports.

2013-06-19 17:18:40 +02:00

timesince.py

Fixed #20711 -- Fixed broken link in timesince.py docstring

2013-07-07 12:40:05 -04:00

timezone.py

Accepted None in tzname().

2013-02-11 21:56:35 +01:00

tree.py

Replaced an antiquated pattern.

2013-05-17 18:08:58 +02:00

tzinfo.py

Accepted None in tzname().

2013-02-11 21:56:35 +01:00

unittest.py

This doesn't need to be a package any more.

2013-07-01 22:46:35 +02:00

version.py

Ensured get_version returns a native string.

2012-10-25 21:49:18 +02:00

xmlutils.py

Eliminated lots of mutable default arguments (since they are bugs

2006-06-03 13:37:34 +00:00