diff options
| author | Tim Graham <timograham@gmail.com> | 2013-10-10 16:42:30 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-10-10 16:49:20 -0400 |
| commit | 1dae4ac1778f04805c0ed62c8debb13b281ba02b (patch) | |
| tree | 5105833792cc07336de819effb1c9dccdbc0c76e /django | |
| parent | ca874b2fe6f768bd042b859d7eba622a68e9f9dd (diff) | |
Whitespace cleanup.
* Removed trailing whitespace.
* Added newline to EOF if missing.
* Removed blank lines at EOF.
* Removed some stray tabs.
Diffstat (limited to 'django')
88 files changed, 363 insertions, 397 deletions
diff --git a/django/bin/django-2to3.py b/django/bin/django-2to3.py index 35566abb94..6d2daec8bf 100755 --- a/django/bin/django-2to3.py +++ b/django/bin/django-2to3.py @@ -7,4 +7,3 @@ import sys from lib2to3.main import main sys.exit(main("django.utils.2to3_fixes")) - diff --git a/django/bin/profiling/gather_profile_stats.py b/django/bin/profiling/gather_profile_stats.py index 0244eb6034..177657ebbc 100644 --- a/django/bin/profiling/gather_profile_stats.py +++ b/django/bin/profiling/gather_profile_stats.py @@ -32,6 +32,6 @@ def gather_stats(p): os.unlink(os.path.join(p, f)) for (path, prof) in profiles.items(): prof.dump_stats(os.path.join(p, "%s.agg.prof" % path)) - + if __name__ == '__main__': gather_stats(sys.argv[1]) diff --git a/django/conf/locale/ar/formats.py b/django/conf/locale/ar/formats.py index 213e5b363f..0df655333c 100644 --- a/django/conf/locale/ar/formats.py +++ b/django/conf/locale/ar/formats.py @@ -7,18 +7,18 @@ from __future__ import unicode_literals # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F، Y' TIME_FORMAT = 'g:i:s A' -# DATETIME_FORMAT = +# DATETIME_FORMAT = YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'd/m/Y' -# SHORT_DATETIME_FORMAT = -# FIRST_DAY_OF_WEEK = +# SHORT_DATETIME_FORMAT = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = '.' -# NUMBER_GROUPING = +# NUMBER_GROUPING = diff --git a/django/conf/locale/bg/formats.py b/django/conf/locale/bg/formats.py index c5e89737b6..4472600398 100644 --- a/django/conf/locale/bg/formats.py +++ b/django/conf/locale/bg/formats.py @@ -7,18 +7,18 @@ from __future__ import unicode_literals # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd F Y' TIME_FORMAT = 'H:i:s' -# DATETIME_FORMAT = -# YEAR_MONTH_FORMAT = +# DATETIME_FORMAT = +# YEAR_MONTH_FORMAT = MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'd.m.Y' -# SHORT_DATETIME_FORMAT = -# FIRST_DAY_OF_WEEK = +# SHORT_DATETIME_FORMAT = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = ' ' # Non-breaking space -# NUMBER_GROUPING = +# NUMBER_GROUPING = diff --git a/django/conf/locale/bn/formats.py b/django/conf/locale/bn/formats.py index eed24e605e..3f0f1f7f43 100644 --- a/django/conf/locale/bn/formats.py +++ b/django/conf/locale/bn/formats.py @@ -7,18 +7,18 @@ from __future__ import unicode_literals # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F, Y' TIME_FORMAT = 'g:i:s A' -# DATETIME_FORMAT = +# DATETIME_FORMAT = YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'j M, Y' -# SHORT_DATETIME_FORMAT = -# FIRST_DAY_OF_WEEK = +# SHORT_DATETIME_FORMAT = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = DECIMAL_SEPARATOR = '.' THOUSAND_SEPARATOR = ',' -# NUMBER_GROUPING = +# NUMBER_GROUPING = diff --git a/django/conf/locale/bs/formats.py b/django/conf/locale/bs/formats.py index 454fab1e1e..cce3900f1e 100644 --- a/django/conf/locale/bs/formats.py +++ b/django/conf/locale/bs/formats.py @@ -11,14 +11,14 @@ DATETIME_FORMAT = 'j. N. Y. G:i T' YEAR_MONTH_FORMAT = 'F Y.' MONTH_DAY_FORMAT = 'j. F' SHORT_DATE_FORMAT = 'Y M j' -# SHORT_DATETIME_FORMAT = -# FIRST_DAY_OF_WEEK = +# SHORT_DATETIME_FORMAT = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = '.' -# NUMBER_GROUPING = +# NUMBER_GROUPING = diff --git a/django/conf/locale/ca/formats.py b/django/conf/locale/ca/formats.py index 0335617ac8..9ccddbb24d 100644 --- a/django/conf/locale/ca/formats.py +++ b/django/conf/locale/ca/formats.py @@ -31,4 +31,3 @@ DATETIME_INPUT_FORMATS = ( DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = '.' NUMBER_GROUPING = 3 - diff --git a/django/conf/locale/cy/formats.py b/django/conf/locale/cy/formats.py index ba4b275938..50ab9f101c 100644 --- a/django/conf/locale/cy/formats.py +++ b/django/conf/locale/cy/formats.py @@ -7,18 +7,18 @@ from __future__ import unicode_literals # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd F Y' TIME_FORMAT = 'g:i:s A' -# DATETIME_FORMAT = -# YEAR_MONTH_FORMAT = -# MONTH_DAY_FORMAT = +# DATETIME_FORMAT = +# YEAR_MONTH_FORMAT = +# MONTH_DAY_FORMAT = SHORT_DATE_FORMAT = 'j M Y' -# SHORT_DATETIME_FORMAT = -# FIRST_DAY_OF_WEEK = +# SHORT_DATETIME_FORMAT = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = -# DECIMAL_SEPARATOR = -# THOUSAND_SEPARATOR = -# NUMBER_GROUPING = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = +# DECIMAL_SEPARATOR = +# THOUSAND_SEPARATOR = +# NUMBER_GROUPING = diff --git a/django/conf/locale/el/formats.py b/django/conf/locale/el/formats.py index a44b909b2e..817f71d3c8 100644 --- a/django/conf/locale/el/formats.py +++ b/django/conf/locale/el/formats.py @@ -7,18 +7,18 @@ from __future__ import unicode_literals # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd E Y' TIME_FORMAT = 'g:i:s A' -# DATETIME_FORMAT = +# DATETIME_FORMAT = YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'd M Y' -# SHORT_DATETIME_FORMAT = -# FIRST_DAY_OF_WEEK = +# SHORT_DATETIME_FORMAT = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = '.' -# NUMBER_GROUPING = +# NUMBER_GROUPING = diff --git a/django/conf/locale/en/formats.py b/django/conf/locale/en/formats.py index e73bc62367..5accf9e3d2 100644 --- a/django/conf/locale/en/formats.py +++ b/django/conf/locale/en/formats.py @@ -41,4 +41,3 @@ DATETIME_INPUT_FORMATS = ( DECIMAL_SEPARATOR = '.' THOUSAND_SEPARATOR = ',' NUMBER_GROUPING = 3 - diff --git a/django/conf/locale/en_GB/formats.py b/django/conf/locale/en_GB/formats.py index 3cf7f79224..c2edd23bcd 100644 --- a/django/conf/locale/en_GB/formats.py +++ b/django/conf/locale/en_GB/formats.py @@ -40,4 +40,3 @@ DATETIME_INPUT_FORMATS = ( DECIMAL_SEPARATOR = '.' THOUSAND_SEPARATOR = ',' NUMBER_GROUPING = 3 - diff --git a/django/conf/locale/es/formats.py b/django/conf/locale/es/formats.py index 7e5ecb39a6..08029a876e 100644 --- a/django/conf/locale/es/formats.py +++ b/django/conf/locale/es/formats.py @@ -31,4 +31,3 @@ DATETIME_INPUT_FORMATS = ( DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = '.' NUMBER_GROUPING = 3 - diff --git a/django/conf/locale/es_NI/formats.py b/django/conf/locale/es_NI/formats.py index 8220b80b78..4bdf24e491 100644 --- a/django/conf/locale/es_NI/formats.py +++ b/django/conf/locale/es_NI/formats.py @@ -10,10 +10,10 @@ YEAR_MONTH_FORMAT = r'F \d\e Y' MONTH_DAY_FORMAT = r'j \d\e F' SHORT_DATE_FORMAT = 'd/m/Y' SHORT_DATETIME_FORMAT = 'd/m/Y H:i' -FIRST_DAY_OF_WEEK = 1 # Monday: ISO 8601 +FIRST_DAY_OF_WEEK = 1 # Monday: ISO 8601 DATE_INPUT_FORMATS = ( - '%d/%m/%Y', '%d/%m/%y', # '25/10/2006', '25/10/06' - '%Y%m%d', # '20061025' + '%d/%m/%Y', '%d/%m/%y', # '25/10/2006', '25/10/06' + '%Y%m%d', # '20061025' ) DATETIME_INPUT_FORMATS = ( @@ -27,4 +27,3 @@ DATETIME_INPUT_FORMATS = ( DECIMAL_SEPARATOR = '.' THOUSAND_SEPARATOR = ',' NUMBER_GROUPING = 3 - diff --git a/django/conf/locale/et/formats.py b/django/conf/locale/et/formats.py index dd0d1a696e..1de3948a2b 100644 --- a/django/conf/locale/et/formats.py +++ b/django/conf/locale/et/formats.py @@ -7,18 +7,18 @@ from __future__ import unicode_literals # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' TIME_FORMAT = 'G:i:s' -# DATETIME_FORMAT = -# YEAR_MONTH_FORMAT = +# DATETIME_FORMAT = +# YEAR_MONTH_FORMAT = MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'd.m.Y' -# SHORT_DATETIME_FORMAT = -# FIRST_DAY_OF_WEEK = +# SHORT_DATETIME_FORMAT = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = ' ' # Non-breaking space -# NUMBER_GROUPING = +# NUMBER_GROUPING = diff --git a/django/conf/locale/eu/formats.py b/django/conf/locale/eu/formats.py index 5b768eabca..7b14262560 100644 --- a/django/conf/locale/eu/formats.py +++ b/django/conf/locale/eu/formats.py @@ -7,18 +7,18 @@ from __future__ import unicode_literals # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = r'Yeko M\re\n d\a' TIME_FORMAT = 'H:i:s' -# DATETIME_FORMAT = -# YEAR_MONTH_FORMAT = -# MONTH_DAY_FORMAT = +# DATETIME_FORMAT = +# YEAR_MONTH_FORMAT = +# MONTH_DAY_FORMAT = SHORT_DATE_FORMAT = 'Y M j' -# SHORT_DATETIME_FORMAT = -# FIRST_DAY_OF_WEEK = +# SHORT_DATETIME_FORMAT = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = '.' -# NUMBER_GROUPING = +# NUMBER_GROUPING = diff --git a/django/conf/locale/fa/formats.py b/django/conf/locale/fa/formats.py index 5682c410e2..30ce9a5628 100644 --- a/django/conf/locale/fa/formats.py +++ b/django/conf/locale/fa/formats.py @@ -12,13 +12,13 @@ YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'Y/n/j' SHORT_DATETIME_FORMAT = 'Y/n/j، G:i:s' -# FIRST_DAY_OF_WEEK = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = '.' -# NUMBER_GROUPING = +# NUMBER_GROUPING = diff --git a/django/conf/locale/fi/formats.py b/django/conf/locale/fi/formats.py index e76144a9e4..da1f003411 100644 --- a/django/conf/locale/fi/formats.py +++ b/django/conf/locale/fi/formats.py @@ -11,14 +11,14 @@ DATETIME_FORMAT = r'j. E Y \k\e\l\l\o G.i.s' YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j. F' SHORT_DATE_FORMAT = 'j.n.Y' -# SHORT_DATETIME_FORMAT = -# FIRST_DAY_OF_WEEK = +# SHORT_DATETIME_FORMAT = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = ' ' # Non-breaking space -# NUMBER_GROUPING = +# NUMBER_GROUPING = diff --git a/django/conf/locale/fy_NL/formats.py b/django/conf/locale/fy_NL/formats.py index 4355928ca0..330c2f296e 100644 --- a/django/conf/locale/fy_NL/formats.py +++ b/django/conf/locale/fy_NL/formats.py @@ -5,20 +5,20 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date -# DATE_FORMAT = -# TIME_FORMAT = -# DATETIME_FORMAT = -# YEAR_MONTH_FORMAT = -# MONTH_DAY_FORMAT = -# SHORT_DATE_FORMAT = -# SHORT_DATETIME_FORMAT = -# FIRST_DAY_OF_WEEK = +# DATE_FORMAT = +# TIME_FORMAT = +# DATETIME_FORMAT = +# YEAR_MONTH_FORMAT = +# MONTH_DAY_FORMAT = +# SHORT_DATE_FORMAT = +# SHORT_DATETIME_FORMAT = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = -# DECIMAL_SEPARATOR = -# THOUSAND_SEPARATOR = -# NUMBER_GROUPING = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = +# DECIMAL_SEPARATOR = +# THOUSAND_SEPARATOR = +# NUMBER_GROUPING = diff --git a/django/conf/locale/ga/formats.py b/django/conf/locale/ga/formats.py index ce271ab533..d998a43a19 100644 --- a/django/conf/locale/ga/formats.py +++ b/django/conf/locale/ga/formats.py @@ -7,18 +7,18 @@ from __future__ import unicode_literals # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' TIME_FORMAT = 'H:i:s' -# DATETIME_FORMAT = -# YEAR_MONTH_FORMAT = +# DATETIME_FORMAT = +# YEAR_MONTH_FORMAT = MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'j M Y' -# SHORT_DATETIME_FORMAT = -# FIRST_DAY_OF_WEEK = +# SHORT_DATETIME_FORMAT = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = DECIMAL_SEPARATOR = '.' THOUSAND_SEPARATOR = ',' -# NUMBER_GROUPING = +# NUMBER_GROUPING = diff --git a/django/conf/locale/gl/formats.py b/django/conf/locale/gl/formats.py index ba7f6c52a0..de592240f0 100644 --- a/django/conf/locale/gl/formats.py +++ b/django/conf/locale/gl/formats.py @@ -16,9 +16,9 @@ FIRST_DAY_OF_WEEK = 1 # Monday # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = '.' -# NUMBER_GROUPING = +# NUMBER_GROUPING = diff --git a/django/conf/locale/he/formats.py b/django/conf/locale/he/formats.py index 1c8b1b5566..6c63e1b3ac 100644 --- a/django/conf/locale/he/formats.py +++ b/django/conf/locale/he/formats.py @@ -12,13 +12,13 @@ YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j בF' SHORT_DATE_FORMAT = 'd/m/Y' SHORT_DATETIME_FORMAT = 'd/m/Y H:i:s' -# FIRST_DAY_OF_WEEK = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = DECIMAL_SEPARATOR = '.' THOUSAND_SEPARATOR = ',' -# NUMBER_GROUPING = +# NUMBER_GROUPING = diff --git a/django/conf/locale/hi/formats.py b/django/conf/locale/hi/formats.py index f4fabe00cd..52e02040ec 100644 --- a/django/conf/locale/hi/formats.py +++ b/django/conf/locale/hi/formats.py @@ -7,18 +7,18 @@ from __future__ import unicode_literals # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' TIME_FORMAT = 'g:i:s A' -# DATETIME_FORMAT = -# YEAR_MONTH_FORMAT = +# DATETIME_FORMAT = +# YEAR_MONTH_FORMAT = MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'd-m-Y' -# SHORT_DATETIME_FORMAT = -# FIRST_DAY_OF_WEEK = +# SHORT_DATETIME_FORMAT = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = DECIMAL_SEPARATOR = '.' THOUSAND_SEPARATOR = ',' -# NUMBER_GROUPING = +# NUMBER_GROUPING = diff --git a/django/conf/locale/is/formats.py b/django/conf/locale/is/formats.py index 90f251abe7..e5e99521ff 100644 --- a/django/conf/locale/is/formats.py +++ b/django/conf/locale/is/formats.py @@ -7,18 +7,18 @@ from __future__ import unicode_literals # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j. F Y' TIME_FORMAT = 'H:i:s' -# DATETIME_FORMAT = +# DATETIME_FORMAT = YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j. F' SHORT_DATE_FORMAT = 'j.n.Y' -# SHORT_DATETIME_FORMAT = -# FIRST_DAY_OF_WEEK = +# SHORT_DATETIME_FORMAT = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = '.' -# NUMBER_GROUPING = +# NUMBER_GROUPING = diff --git a/django/conf/locale/ja/formats.py b/django/conf/locale/ja/formats.py index 263aa0a344..2f6d2b43cc 100644 --- a/django/conf/locale/ja/formats.py +++ b/django/conf/locale/ja/formats.py @@ -12,13 +12,13 @@ YEAR_MONTH_FORMAT = 'Y年n月' MONTH_DAY_FORMAT = 'n月j日' SHORT_DATE_FORMAT = 'Y/m/d' SHORT_DATETIME_FORMAT = 'Y/m/d G:i:s' -# FIRST_DAY_OF_WEEK = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = DECIMAL_SEPARATOR = '.' THOUSAND_SEPARATOR = ',' -# NUMBER_GROUPING = +# NUMBER_GROUPING = diff --git a/django/conf/locale/km/formats.py b/django/conf/locale/km/formats.py index ace2fc1eea..13a43107f4 100644 --- a/django/conf/locale/km/formats.py +++ b/django/conf/locale/km/formats.py @@ -8,17 +8,17 @@ from __future__ import unicode_literals DATE_FORMAT = 'j ខែ F ឆ្នាំ Y' TIME_FORMAT = 'G:i:s' DATETIME_FORMAT = 'j ខែ F ឆ្នាំ Y, G:i:s' -# YEAR_MONTH_FORMAT = +# YEAR_MONTH_FORMAT = MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'j M Y' SHORT_DATETIME_FORMAT = 'j M Y, G:i:s' -# FIRST_DAY_OF_WEEK = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = '.' -# NUMBER_GROUPING = +# NUMBER_GROUPING = diff --git a/django/conf/locale/kn/formats.py b/django/conf/locale/kn/formats.py index ce1999ac93..4924708650 100644 --- a/django/conf/locale/kn/formats.py +++ b/django/conf/locale/kn/formats.py @@ -7,18 +7,18 @@ from __future__ import unicode_literals # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' TIME_FORMAT = 'h:i:s A' -# DATETIME_FORMAT = -# YEAR_MONTH_FORMAT = +# DATETIME_FORMAT = +# YEAR_MONTH_FORMAT = MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'j M Y' -# SHORT_DATETIME_FORMAT = -# FIRST_DAY_OF_WEEK = +# SHORT_DATETIME_FORMAT = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = -# DECIMAL_SEPARATOR = -# THOUSAND_SEPARATOR = -# NUMBER_GROUPING = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = +# DECIMAL_SEPARATOR = +# THOUSAND_SEPARATOR = +# NUMBER_GROUPING = diff --git a/django/conf/locale/ml/formats.py b/django/conf/locale/ml/formats.py index e73bc62367..5accf9e3d2 100644 --- a/django/conf/locale/ml/formats.py +++ b/django/conf/locale/ml/formats.py @@ -41,4 +41,3 @@ DATETIME_INPUT_FORMATS = ( DECIMAL_SEPARATOR = '.' THOUSAND_SEPARATOR = ',' NUMBER_GROUPING = 3 - diff --git a/django/conf/locale/ro/formats.py b/django/conf/locale/ro/formats.py index 5435837483..6d7d063d15 100644 --- a/django/conf/locale/ro/formats.py +++ b/django/conf/locale/ro/formats.py @@ -12,13 +12,13 @@ YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'd.m.Y' SHORT_DATETIME_FORMAT = 'd.m.Y, H:i:s' -# FIRST_DAY_OF_WEEK = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = '.' -# NUMBER_GROUPING = +# NUMBER_GROUPING = diff --git a/django/conf/locale/sq/formats.py b/django/conf/locale/sq/formats.py index 1c04e2e5e8..7172826722 100644 --- a/django/conf/locale/sq/formats.py +++ b/django/conf/locale/sq/formats.py @@ -7,18 +7,18 @@ from __future__ import unicode_literals # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd F Y' TIME_FORMAT = 'g.i.s.A' -# DATETIME_FORMAT = +# DATETIME_FORMAT = YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'Y-m-d' -# SHORT_DATETIME_FORMAT = -# FIRST_DAY_OF_WEEK = +# SHORT_DATETIME_FORMAT = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = '.' -# NUMBER_GROUPING = +# NUMBER_GROUPING = diff --git a/django/conf/locale/ta/formats.py b/django/conf/locale/ta/formats.py index 1c08f17501..4e206f4d8c 100644 --- a/django/conf/locale/ta/formats.py +++ b/django/conf/locale/ta/formats.py @@ -7,18 +7,18 @@ from __future__ import unicode_literals # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F, Y' TIME_FORMAT = 'g:i:s A' -# DATETIME_FORMAT = -# YEAR_MONTH_FORMAT = +# DATETIME_FORMAT = +# YEAR_MONTH_FORMAT = MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'j M, Y' -# SHORT_DATETIME_FORMAT = -# FIRST_DAY_OF_WEEK = +# SHORT_DATETIME_FORMAT = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = -# DECIMAL_SEPARATOR = -# THOUSAND_SEPARATOR = -# NUMBER_GROUPING = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = +# DECIMAL_SEPARATOR = +# THOUSAND_SEPARATOR = +# NUMBER_GROUPING = diff --git a/django/conf/locale/te/formats.py b/django/conf/locale/te/formats.py index 02399d6c1b..275ab8dc8f 100644 --- a/django/conf/locale/te/formats.py +++ b/django/conf/locale/te/formats.py @@ -7,18 +7,18 @@ from __future__ import unicode_literals # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' TIME_FORMAT = 'g:i:s A' -# DATETIME_FORMAT = -# YEAR_MONTH_FORMAT = +# DATETIME_FORMAT = +# YEAR_MONTH_FORMAT = MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'j M Y' -# SHORT_DATETIME_FORMAT = -# FIRST_DAY_OF_WEEK = +# SHORT_DATETIME_FORMAT = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = -# DECIMAL_SEPARATOR = -# THOUSAND_SEPARATOR = -# NUMBER_GROUPING = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = +# DECIMAL_SEPARATOR = +# THOUSAND_SEPARATOR = +# NUMBER_GROUPING = diff --git a/django/conf/locale/th/formats.py b/django/conf/locale/th/formats.py index 7847a7c251..714b2037df 100644 --- a/django/conf/locale/th/formats.py +++ b/django/conf/locale/th/formats.py @@ -12,13 +12,13 @@ YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'j M Y' SHORT_DATETIME_FORMAT = 'j M Y, G:i:s' -# FIRST_DAY_OF_WEEK = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = DECIMAL_SEPARATOR = '.' THOUSAND_SEPARATOR = ',' -# NUMBER_GROUPING = +# NUMBER_GROUPING = diff --git a/django/conf/locale/uk/formats.py b/django/conf/locale/uk/formats.py index 11293f047a..e2a3363ca8 100644 --- a/django/conf/locale/uk/formats.py +++ b/django/conf/locale/uk/formats.py @@ -12,14 +12,14 @@ DATETIME_FORMAT = 'j E Y р. H:i:s' YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'j M Y' -# SHORT_DATETIME_FORMAT = -# FIRST_DAY_OF_WEEK = +# SHORT_DATETIME_FORMAT = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = ' ' -# NUMBER_GROUPING = +# NUMBER_GROUPING = diff --git a/django/conf/locale/vi/formats.py b/django/conf/locale/vi/formats.py index b491c2d20c..93ede97b98 100644 --- a/django/conf/locale/vi/formats.py +++ b/django/conf/locale/vi/formats.py @@ -12,13 +12,13 @@ YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'd-m-Y' SHORT_DATETIME_FORMAT = 'H:i:s d-m-Y' -# FIRST_DAY_OF_WEEK = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = '.' -# NUMBER_GROUPING = +# NUMBER_GROUPING = diff --git a/django/conf/locale/zh_CN/formats.py b/django/conf/locale/zh_CN/formats.py index 4355928ca0..330c2f296e 100644 --- a/django/conf/locale/zh_CN/formats.py +++ b/django/conf/locale/zh_CN/formats.py @@ -5,20 +5,20 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date -# DATE_FORMAT = -# TIME_FORMAT = -# DATETIME_FORMAT = -# YEAR_MONTH_FORMAT = -# MONTH_DAY_FORMAT = -# SHORT_DATE_FORMAT = -# SHORT_DATETIME_FORMAT = -# FIRST_DAY_OF_WEEK = +# DATE_FORMAT = +# TIME_FORMAT = +# DATETIME_FORMAT = +# YEAR_MONTH_FORMAT = +# MONTH_DAY_FORMAT = +# SHORT_DATE_FORMAT = +# SHORT_DATETIME_FORMAT = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = -# DECIMAL_SEPARATOR = -# THOUSAND_SEPARATOR = -# NUMBER_GROUPING = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = +# DECIMAL_SEPARATOR = +# THOUSAND_SEPARATOR = +# NUMBER_GROUPING = diff --git a/django/conf/locale/zh_TW/formats.py b/django/conf/locale/zh_TW/formats.py index 4355928ca0..330c2f296e 100644 --- a/django/conf/locale/zh_TW/formats.py +++ b/django/conf/locale/zh_TW/formats.py @@ -5,20 +5,20 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date -# DATE_FORMAT = -# TIME_FORMAT = -# DATETIME_FORMAT = -# YEAR_MONTH_FORMAT = -# MONTH_DAY_FORMAT = -# SHORT_DATE_FORMAT = -# SHORT_DATETIME_FORMAT = -# FIRST_DAY_OF_WEEK = +# DATE_FORMAT = +# TIME_FORMAT = +# DATETIME_FORMAT = +# YEAR_MONTH_FORMAT = +# MONTH_DAY_FORMAT = +# SHORT_DATE_FORMAT = +# SHORT_DATETIME_FORMAT = +# FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = -# DECIMAL_SEPARATOR = -# THOUSAND_SEPARATOR = -# NUMBER_GROUPING = +# DATE_INPUT_FORMATS = +# TIME_INPUT_FORMATS = +# DATETIME_INPUT_FORMATS = +# DECIMAL_SEPARATOR = +# THOUSAND_SEPARATOR = +# NUMBER_GROUPING = diff --git a/django/conf/urls/__init__.py b/django/conf/urls/__init__.py index f4a129a9e0..fff5e35582 100644 --- a/django/conf/urls/__init__.py +++ b/django/conf/urls/__init__.py @@ -61,4 +61,3 @@ def url(regex, view, kwargs=None, name=None, prefix=''): if prefix: view = prefix + '.' + view return RegexURLPattern(regex, view, kwargs, name) - diff --git a/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js b/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js index c82c8c05cb..0d7ca41d94 100644 --- a/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js +++ b/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js @@ -13,7 +13,7 @@ function html_unescape(text) { // IE doesn't accept periods or dashes in the window name, but the element IDs // we use to generate popup window names may contain them, therefore we map them -// to allowed characters in a reversible way so that we can locate the correct +// to allowed characters in a reversible way so that we can locate the correct // element when the popup window is dismissed. function id_to_windowname(text) { text = text.replace(/\./g, '__dot__'); diff --git a/django/contrib/auth/fixtures/natural.json b/django/contrib/auth/fixtures/natural.json index 795c1a3b7a..7811c7a548 100644 --- a/django/contrib/auth/fixtures/natural.json +++ b/django/contrib/auth/fixtures/natural.json @@ -1,31 +1,31 @@ [ { - "pk": 1, - "model": "auth.group", + "pk": 1, + "model": "auth.group", "fields": { - "name": "my_group", + "name": "my_group", "permissions": [] } - }, + }, { - "pk": 1, - "model": "auth.user", + "pk": 1, + "model": "auth.user", "fields": { - "username": "my_username", - "first_name": "", - "last_name": "", - "is_active": true, - "is_superuser": true, - "is_staff": true, - "last_login": "2012-01-13 00:14:00", + "username": "my_username", + "first_name": "", + "last_name": "", + "is_active": true, + "is_superuser": true, + "is_staff": true, + "last_login": "2012-01-13 00:14:00", "groups": [ [ "my_group" ] - ], - "user_permissions": [], - "password": "pbkdf2_sha256$10000$LUyhxJjuLwXF$f6Zbpnx1L5dPze8m0itBaHMDyZ/n6JyhuavQy2RrBIM=", - "email": "email@example.com", + ], + "user_permissions": [], + "password": "pbkdf2_sha256$10000$LUyhxJjuLwXF$f6Zbpnx1L5dPze8m0itBaHMDyZ/n6JyhuavQy2RrBIM=", + "email": "email@example.com", "date_joined": "2012-01-13 00:14:00" } } diff --git a/django/contrib/auth/fixtures/regular.json b/django/contrib/auth/fixtures/regular.json index dad891df2c..b9f2680766 100644 --- a/django/contrib/auth/fixtures/regular.json +++ b/django/contrib/auth/fixtures/regular.json @@ -1,29 +1,29 @@ [ { - "pk": 1, - "model": "auth.group", + "pk": 1, + "model": "auth.group", "fields": { - "name": "my_group", + "name": "my_group", "permissions": [] } - }, + }, { - "pk": 1, - "model": "auth.user", + "pk": 1, + "model": "auth.user", "fields": { - "username": "my_username", - "first_name": "", - "last_name": "", - "is_active": true, - "is_superuser": true, - "is_staff": true, - "last_login": "2012-01-13 00:14:00", + "username": "my_username", + "first_name": "", + "last_name": "", + "is_active": true, + "is_superuser": true, + "is_staff": true, + "last_login": "2012-01-13 00:14:00", "groups": [ 1 - ], - "user_permissions": [], - "password": "pbkdf2_sha256$10000$LUyhxJjuLwXF$f6Zbpnx1L5dPze8m0itBaHMDyZ/n6JyhuavQy2RrBIM=", - "email": "email@example.com", + ], + "user_permissions": [], + "password": "pbkdf2_sha256$10000$LUyhxJjuLwXF$f6Zbpnx1L5dPze8m0itBaHMDyZ/n6JyhuavQy2RrBIM=", + "email": "email@example.com", "date_joined": "2012-01-13 00:14:00" } } diff --git a/django/contrib/auth/hashers.py b/django/contrib/auth/hashers.py index f6dfaa6b34..c49c25ce66 100644 --- a/django/contrib/auth/hashers.py +++ b/django/contrib/auth/hashers.py @@ -501,4 +501,3 @@ class CryptPasswordHasher(BasePasswordHasher): (_('salt'), salt), (_('hash'), mask_hash(data, show=3)), ]) - diff --git a/django/contrib/auth/tests/templates/context_processors/auth_attrs_no_access.html b/django/contrib/auth/tests/templates/context_processors/auth_attrs_no_access.html index 8d1c8b69c3..8b13789179 100644 --- a/django/contrib/auth/tests/templates/context_processors/auth_attrs_no_access.html +++ b/django/contrib/auth/tests/templates/context_processors/auth_attrs_no_access.html @@ -1 +1 @@ - + diff --git a/django/contrib/auth/tests/test_context_processors.py b/django/contrib/auth/tests/test_context_processors.py index d1d912eb15..bf30790a8a 100644 --- a/django/contrib/auth/tests/test_context_processors.py +++ b/django/contrib/auth/tests/test_context_processors.py @@ -112,7 +112,7 @@ class AuthContextProcessorTests(TestCase): self.assertContains(response, "Has auth permissions") self.assertContains(response, "Has auth.add_permission permissions") self.assertNotContains(response, "nonexisting") - + def test_perm_in_perms_attrs(self): u = User.objects.create_user(username='normal', password='secret') u.user_permissions.add( diff --git a/django/contrib/comments/moderation.py b/django/contrib/comments/moderation.py index 6648aebb59..cdf00a9a24 100644 --- a/django/contrib/comments/moderation.py +++ b/django/contrib/comments/moderation.py @@ -334,7 +334,7 @@ class Moderator(object): moderation_class = self._registry[model] # Comment will be disallowed outright (HTTP 403 response) - if not moderation_class.allow(comment, content_object, request): + if not moderation_class.allow(comment, content_object, request): return False if moderation_class.moderate(comment, content_object, request): diff --git a/django/contrib/flatpages/tests/test_forms.py b/django/contrib/flatpages/tests/test_forms.py index 29fc0cabb9..e60daead03 100644 --- a/django/contrib/flatpages/tests/test_forms.py +++ b/django/contrib/flatpages/tests/test_forms.py @@ -96,4 +96,3 @@ class FlatpageAdminFormTests(TestCase): self.assertEqual( f.errors, {'sites': [translation.ugettext('This field is required.')]}) - diff --git a/django/contrib/flatpages/tests/test_middleware.py b/django/contrib/flatpages/tests/test_middleware.py index 1ad8fa93b3..79e046b7a1 100644 --- a/django/contrib/flatpages/tests/test_middleware.py +++ b/django/contrib/flatpages/tests/test_middleware.py @@ -154,5 +154,3 @@ class FlatpageMiddlewareAppendSlashTests(TestCase): response = self.client.get('/') self.assertEqual(response.status_code, 200) self.assertContains(response, "<p>Root</p>") - - diff --git a/django/contrib/flatpages/tests/test_templatetags.py b/django/contrib/flatpages/tests/test_templatetags.py index 23fa8faf2d..473abce1b1 100644 --- a/django/contrib/flatpages/tests/test_templatetags.py +++ b/django/contrib/flatpages/tests/test_templatetags.py @@ -133,4 +133,3 @@ class FlatpageTemplateTagTests(TestCase): "{% load flatpages %}{% get_flatpages for user as flatpages asdf%}") self.assertRaises(TemplateSyntaxError, render, "{% load flatpages %}{% get_flatpages prefix for user as flatpages asdf%}") - diff --git a/django/contrib/flatpages/tests/urls.py b/django/contrib/flatpages/tests/urls.py index e0e7a074b0..77a70939f1 100644 --- a/django/contrib/flatpages/tests/urls.py +++ b/django/contrib/flatpages/tests/urls.py @@ -5,4 +5,3 @@ urlpatterns = patterns('', (r'^flatpage_root', include('django.contrib.flatpages.urls')), (r'^accounts/', include('django.contrib.auth.urls')), ) - diff --git a/django/contrib/formtools/tests/wizard/namedwizardtests/forms.py b/django/contrib/formtools/tests/wizard/namedwizardtests/forms.py index 39e914d05d..c89f51e179 100644 --- a/django/contrib/formtools/tests/wizard/namedwizardtests/forms.py +++ b/django/contrib/formtools/tests/wizard/namedwizardtests/forms.py @@ -49,4 +49,3 @@ class SessionContactWizard(ContactWizard): class CookieContactWizard(ContactWizard): storage_name = 'django.contrib.formtools.wizard.storage.cookie.CookieStorage' - diff --git a/django/contrib/formtools/tests/wizard/test_loadstorage.py b/django/contrib/formtools/tests/wizard/test_loadstorage.py index bb0b06eecf..f0f350e712 100644 --- a/django/contrib/formtools/tests/wizard/test_loadstorage.py +++ b/django/contrib/formtools/tests/wizard/test_loadstorage.py @@ -15,4 +15,3 @@ class TestLoadStorage(TestCase): 'django.contrib.formtools.wizard.storage.idontexist.IDontExistStorage', 'wizard1') self.assertRaises(MissingStorage, get_storage, 'django.contrib.formtools.wizard.storage.base.IDontExistStorage', 'wizard1') - diff --git a/django/contrib/formtools/tests/wizard/wizardtests/forms.py b/django/contrib/formtools/tests/wizard/wizardtests/forms.py index dbb0e83d6f..ad565478d1 100644 --- a/django/contrib/formtools/tests/wizard/wizardtests/forms.py +++ b/django/contrib/formtools/tests/wizard/wizardtests/forms.py @@ -63,4 +63,3 @@ class SessionContactWizard(ContactWizard): class CookieContactWizard(ContactWizard): storage_name = 'django.contrib.formtools.wizard.storage.cookie.CookieStorage' - diff --git a/django/contrib/gis/db/backends/spatialite/client.py b/django/contrib/gis/db/backends/spatialite/client.py index 536065a800..f9684877c5 100644 --- a/django/contrib/gis/db/backends/spatialite/client.py +++ b/django/contrib/gis/db/backends/spatialite/client.py @@ -2,4 +2,3 @@ from django.db.backends.sqlite3.client import DatabaseClient class SpatiaLiteClient(DatabaseClient): executable_name = 'spatialite' - diff --git a/django/contrib/gis/db/models/sql/conversion.py b/django/contrib/gis/db/models/sql/conversion.py index 160b623e6d..6687befa24 100644 --- a/django/contrib/gis/db/models/sql/conversion.py +++ b/django/contrib/gis/db/models/sql/conversion.py @@ -21,7 +21,7 @@ class DistanceField(BaseField): class GeomField(BaseField): """ - Wrapper for Geometry values. It is a lightweight alternative to + Wrapper for Geometry values. It is a lightweight alternative to using GeometryField (which requires an SQL query upon instantiation). """ pass diff --git a/django/contrib/gis/feeds.py b/django/contrib/gis/feeds.py index 89bc8c531e..b1d00779c7 100644 --- a/django/contrib/gis/feeds.py +++ b/django/contrib/gis/feeds.py @@ -64,7 +64,7 @@ class GeoFeedMixin(object): # Getting the lower-case geometry type. gtype = str(geom.geom_type).lower() if gtype == 'point': - self.add_georss_point(handler, geom.coords, w3c_geo=w3c_geo) + self.add_georss_point(handler, geom.coords, w3c_geo=w3c_geo) else: if w3c_geo: raise ValueError('W3C Geo only supports Point geometries.') # For formatting consistent w/the GeoRSS simple standard: diff --git a/django/contrib/gis/gdal/__init__.py b/django/contrib/gis/gdal/__init__.py index 2aa867bb69..cf3de0d3aa 100644 --- a/django/contrib/gis/gdal/__init__.py +++ b/django/contrib/gis/gdal/__init__.py @@ -52,4 +52,3 @@ try: except ImportError: # No ctypes, but don't raise an exception. pass - diff --git a/django/contrib/gis/gdal/base.py b/django/contrib/gis/gdal/base.py index e86277e95e..0ccaac0f2e 100644 --- a/django/contrib/gis/gdal/base.py +++ b/django/contrib/gis/gdal/base.py @@ -33,4 +33,3 @@ class GDALBase(object): raise TypeError('Incompatible pointer type') ptr = property(_get_ptr, _set_ptr) - diff --git a/django/contrib/gis/gdal/envelope.py b/django/contrib/gis/gdal/envelope.py index f145526af0..9774f686e7 100644 --- a/django/contrib/gis/gdal/envelope.py +++ b/django/contrib/gis/gdal/envelope.py @@ -36,7 +36,7 @@ class Envelope(object): The initialization function may take an OGREnvelope structure, 4-element tuple or list, or 4 individual arguments. """ - + if len(args) == 1: if isinstance(args[0], OGREnvelope): # OGREnvelope (a ctypes Structure) was passed in. @@ -87,48 +87,48 @@ class Envelope(object): self._envelope.MinY = seq[1] self._envelope.MaxX = seq[2] self._envelope.MaxY = seq[3] - - def expand_to_include(self, *args): - """ - Modifies the envelope to expand to include the boundaries of - the passed-in 2-tuple (a point), 4-tuple (an extent) or - envelope. - """ - # We provide a number of different signatures for this method, - # and the logic here is all about converting them into a - # 4-tuple single parameter which does the actual work of - # expanding the envelope. - if len(args) == 1: - if isinstance(args[0], Envelope): - return self.expand_to_include(args[0].tuple) + + def expand_to_include(self, *args): + """ + Modifies the envelope to expand to include the boundaries of + the passed-in 2-tuple (a point), 4-tuple (an extent) or + envelope. + """ + # We provide a number of different signatures for this method, + # and the logic here is all about converting them into a + # 4-tuple single parameter which does the actual work of + # expanding the envelope. + if len(args) == 1: + if isinstance(args[0], Envelope): + return self.expand_to_include(args[0].tuple) elif hasattr(args[0], 'x') and hasattr(args[0], 'y'): - return self.expand_to_include(args[0].x, args[0].y, args[0].x, args[0].y) - elif isinstance(args[0], (tuple, list)): - # A tuple was passed in. - if len(args[0]) == 2: - return self.expand_to_include((args[0][0], args[0][1], args[0][0], args[0][1])) - elif len(args[0]) == 4: - (minx, miny, maxx, maxy) = args[0] - if minx < self._envelope.MinX: - self._envelope.MinX = minx - if miny < self._envelope.MinY: - self._envelope.MinY = miny - if maxx > self._envelope.MaxX: - self._envelope.MaxX = maxx - if maxy > self._envelope.MaxY: - self._envelope.MaxY = maxy - else: - raise OGRException('Incorrect number of tuple elements (%d).' % len(args[0])) - else: - raise TypeError('Incorrect type of argument: %s' % str(type(args[0]))) - elif len(args) == 2: - # An x and an y parameter were passed in - return self.expand_to_include((args[0], args[1], args[0], args[1])) - elif len(args) == 4: + return self.expand_to_include(args[0].x, args[0].y, args[0].x, args[0].y) + elif isinstance(args[0], (tuple, list)): + # A tuple was passed in. + if len(args[0]) == 2: + return self.expand_to_include((args[0][0], args[0][1], args[0][0], args[0][1])) + elif len(args[0]) == 4: + (minx, miny, maxx, maxy) = args[0] + if minx < self._envelope.MinX: + self._envelope.MinX = minx + if miny < self._envelope.MinY: + self._envelope.MinY = miny + if maxx > self._envelope.MaxX: + self._envelope.MaxX = maxx + if maxy > self._envelope.MaxY: + self._envelope.MaxY = maxy + else: + raise OGRException('Incorrect number of tuple elements (%d).' % len(args[0])) + else: + raise TypeError('Incorrect type of argument: %s' % str(type(args[0]))) + elif len(args) == 2: + # An x and an y parameter were passed in + return self.expand_to_include((args[0], args[1], args[0], args[1])) + elif len(args) == 4: # Individual parameters passed in. - return self.expand_to_include(args) - else: - raise OGRException('Incorrect number (%d) of arguments.' % len(args[0])) + return self.expand_to_include(args) + else: + raise OGRException('Incorrect number (%d) of arguments.' % len(args[0])) @property def min_x(self): diff --git a/django/contrib/gis/gdal/error.py b/django/contrib/gis/gdal/error.py index 1d89ad1a42..bd337adbb1 100644 --- a/django/contrib/gis/gdal/error.py +++ b/django/contrib/gis/gdal/error.py @@ -32,7 +32,7 @@ OGRERR_NONE = 0 def check_err(code): "Checks the given OGRERR, and raises an exception where appropriate." - + if code == OGRERR_NONE: return elif code in OGRERR_DICT: diff --git a/django/contrib/gis/gdal/prototypes/ds.py b/django/contrib/gis/gdal/prototypes/ds.py index f798069fd0..11d3b2452f 100644 --- a/django/contrib/gis/gdal/prototypes/ds.py +++ b/django/contrib/gis/gdal/prototypes/ds.py @@ -1,6 +1,6 @@ """ This module houses the ctypes function prototypes for OGR DataSource - related data structures. OGR_Dr_*, OGR_DS_*, OGR_L_*, OGR_F_*, + related data structures. OGR_Dr_*, OGR_DS_*, OGR_L_*, OGR_F_*, OGR_Fld_* routines are relevant here. """ from ctypes import c_char_p, c_double, c_int, c_long, c_void_p, POINTER diff --git a/django/contrib/gis/gdal/prototypes/generation.py b/django/contrib/gis/gdal/prototypes/generation.py index 577d29bbaa..229733e168 100644 --- a/django/contrib/gis/gdal/prototypes/generation.py +++ b/django/contrib/gis/gdal/prototypes/generation.py @@ -77,7 +77,7 @@ def string_output(func, argtypes, offset=-1, str_result=False, decoding=None): """ Generates a ctypes prototype for the given function with the given argument types that returns a string from a GDAL pointer. - The `const` flag indicates whether the allocated pointer should + The `const` flag indicates whether the allocated pointer should be freed via the GDAL library routine VSIFree -- but only applies only when `str_result` is True. """ @@ -114,7 +114,7 @@ def void_output(func, argtypes, errcheck=True): func.errcheck = check_errcode else: func.restype = None - + return func def voidptr_output(func, argtypes): diff --git a/django/contrib/gis/gdal/prototypes/geom.py b/django/contrib/gis/gdal/prototypes/geom.py index fa0b503c65..6a5239399e 100644 --- a/django/contrib/gis/gdal/prototypes/geom.py +++ b/django/contrib/gis/gdal/prototypes/geom.py @@ -34,7 +34,7 @@ to_kml = string_output(lgdal.OGR_G_ExportToKML, [c_void_p, c_char_p], str_result getx = pnt_func(lgdal.OGR_G_GetX) gety = pnt_func(lgdal.OGR_G_GetY) getz = pnt_func(lgdal.OGR_G_GetZ) - + # Geometry creation routines. from_wkb = geom_output(lgdal.OGR_G_CreateFromWkb, [c_char_p, c_void_p, POINTER(c_void_p), c_int], offset=-2) from_wkt = geom_output(lgdal.OGR_G_CreateFromWkt, [POINTER(c_char_p), c_void_p, POINTER(c_void_p)], offset=-1) @@ -95,4 +95,3 @@ geom_transform_to = void_output(lgdal.OGR_G_TransformTo, [c_void_p, c_void_p]) # For retrieving the envelope of the geometry. get_envelope = env_func(lgdal.OGR_G_GetEnvelope, [c_void_p, POINTER(OGREnvelope)]) - diff --git a/django/contrib/gis/geos/__init__.py b/django/contrib/gis/geos/__init__.py index 945f561fb7..9e7c700aa0 100644 --- a/django/contrib/gis/geos/__init__.py +++ b/django/contrib/gis/geos/__init__.py @@ -1,6 +1,6 @@ """ The GeoDjango GEOS module. Please consult the GeoDjango documentation -for more details: +for more details: http://geodjango.org/docs/geos.html """ try: diff --git a/django/contrib/gis/geos/error.py b/django/contrib/gis/geos/error.py index 46bdfe691a..0ebc54f7cc 100644 --- a/django/contrib/gis/geos/error.py +++ b/django/contrib/gis/geos/error.py @@ -15,6 +15,6 @@ class GEOSIndexError(GEOSException, KeyError): an Exception is raised. Fixes ticket #4740. """ # "If, during the method lookup, a method raises an exception, the exception - # will be propagated, unless the exception has an attribute + # will be propagated, unless the exception has an attribute # `silent_variable_failure` whose value is True." -- Django template docs. silent_variable_failure = True diff --git a/django/contrib/gis/geos/io.py b/django/contrib/gis/geos/io.py index 54ba6b4ac5..1c13d365f7 100644 --- a/django/contrib/gis/geos/io.py +++ b/django/contrib/gis/geos/io.py @@ -16,5 +16,3 @@ class WKTReader(_WKTReader): def read(self, wkt): "Returns a GEOSGeometry for the given WKT string." return GEOSGeometry(super(WKTReader, self).read(wkt)) - - diff --git a/django/contrib/gis/geos/prototypes/topology.py b/django/contrib/gis/geos/prototypes/topology.py index dfea3e98b6..8bd5dc08cc 100644 --- a/django/contrib/gis/geos/prototypes/topology.py +++ b/django/contrib/gis/geos/prototypes/topology.py @@ -3,7 +3,7 @@ topological operations on geometries. """ __all__ = ['geos_boundary', 'geos_buffer', 'geos_centroid', 'geos_convexhull', - 'geos_difference', 'geos_envelope', 'geos_intersection', + 'geos_difference', 'geos_envelope', 'geos_intersection', 'geos_linemerge', 'geos_pointonsurface', 'geos_preservesimplify', 'geos_simplify', 'geos_symdifference', 'geos_union', 'geos_relate'] diff --git a/django/contrib/gis/maps/google/__init__.py b/django/contrib/gis/maps/google/__init__.py index 9be689c07a..37fdf94f1e 100644 --- a/django/contrib/gis/maps/google/__init__.py +++ b/django/contrib/gis/maps/google/__init__.py @@ -30,20 +30,20 @@ {{ google.style }} => "<style>{{ google.vml_css }}</style>" Explanation: - - The `xhtml` property provides the correct XML namespace needed for + - The `xhtml` property provides the correct XML namespace needed for Google Maps to operate in IE using XHTML. Google Maps on IE uses - VML to draw polylines. Returns, by default: + VML to draw polylines. Returns, by default: <html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"> - + - The `style` property provides the correct style tag for the CSS properties required by Google Maps on IE: <style type="text/css">v\:* {behavior:url(#default#VML);}</style> - - The `scripts` property provides the necessary <script> tags for + - The `scripts` property provides the necessary <script> tags for including the Google Maps javascript, as well as including the generated javascript. - - The `body` property provides the correct attributes for the + - The `body` property provides the correct attributes for the body tag to load the generated javascript. By default, returns: <body onload="gmap_load()" onunload="GUnload()"> diff --git a/django/contrib/gis/shortcuts.py b/django/contrib/gis/shortcuts.py index 16b0fdff9e..85f9bfd0c0 100644 --- a/django/contrib/gis/shortcuts.py +++ b/django/contrib/gis/shortcuts.py @@ -21,7 +21,7 @@ def render_to_kml(*args, **kwargs): def render_to_kmz(*args, **kwargs): """ - Compresses the KML content and returns as KMZ (using the correct + Compresses the KML content and returns as KMZ (using the correct MIME type). """ return HttpResponse(compress_kml(loader.render_to_string(*args, **kwargs)), diff --git a/django/contrib/gis/sitemaps/__init__.py b/django/contrib/gis/sitemaps/__init__.py index 9b6287f899..b2c96e4a55 100644 --- a/django/contrib/gis/sitemaps/__init__.py +++ b/django/contrib/gis/sitemaps/__init__.py @@ -1,4 +1,3 @@ # Geo-enabled Sitemap classes. from django.contrib.gis.sitemaps.georss import GeoRSSSitemap from django.contrib.gis.sitemaps.kml import KMLSitemap, KMZSitemap - diff --git a/django/contrib/gis/sitemaps/georss.py b/django/contrib/gis/sitemaps/georss.py index ccb7dc2e91..7dd2701221 100644 --- a/django/contrib/gis/sitemaps/georss.py +++ b/django/contrib/gis/sitemaps/georss.py @@ -50,4 +50,3 @@ class GeoRSSSitemap(Sitemap): def location(self, obj): return urlresolvers.reverse('django.contrib.gis.views.feed', args=(obj,)) - diff --git a/django/contrib/gis/sitemaps/kml.py b/django/contrib/gis/sitemaps/kml.py index 837fe62b62..dd12429ed6 100644 --- a/django/contrib/gis/sitemaps/kml.py +++ b/django/contrib/gis/sitemaps/kml.py @@ -13,7 +13,7 @@ class KMLSitemap(Sitemap): # If no locations specified, then we try to build for # every model in installed applications. self.locations = self._build_kml_sources(locations) - + def _build_kml_sources(self, sources): """ Goes through the given sources and returns a 3-tuple of @@ -33,7 +33,7 @@ class KMLSitemap(Sitemap): source._meta.model_name, field.name)) elif isinstance(source, (list, tuple)): - if len(source) != 3: + if len(source) != 3: raise ValueError('Must specify a 3-tuple of (app_label, module_name, field_name).') kml_sources.append(source) else: @@ -54,7 +54,7 @@ class KMLSitemap(Sitemap): def location(self, obj): return urlresolvers.reverse('django.contrib.gis.sitemaps.views.%s' % self.geo_format, - kwargs={'label' : obj[0], + kwargs={'label' : obj[0], 'model' : obj[1], 'field_name': obj[2], } diff --git a/django/contrib/gis/templates/gis/admin/openlayers.html b/django/contrib/gis/templates/gis/admin/openlayers.html index a61b68921f..8d441cd664 100644 --- a/django/contrib/gis/templates/gis/admin/openlayers.html +++ b/django/contrib/gis/templates/gis/admin/openlayers.html @@ -5,11 +5,11 @@ #{{ id }}_map .aligned label { float:inherit; } #{{ id }}_admin_map { position: relative; vertical-align: top; float: {{ LANGUAGE_BIDI|yesno:"right,left" }}; } {% if not display_wkt %}#{{ id }} { display: none; }{% endif %} - .olControlEditingToolbar .olControlModifyFeatureItemActive { + .olControlEditingToolbar .olControlModifyFeatureItemActive { background-image: url("{% static "admin/img/gis/move_vertex_on.png" %}"); background-repeat: no-repeat; } - .olControlEditingToolbar .olControlModifyFeatureItemInactive { + .olControlEditingToolbar .olControlModifyFeatureItemInactive { background-image: url("{% static "admin/img/gis/move_vertex_off.png" %}"); background-repeat: no-repeat; } diff --git a/django/contrib/gis/tests/data/geometries.json b/django/contrib/gis/tests/data/geometries.json index b1a6ad14bf..c2b9e4f27e 100644 --- a/django/contrib/gis/tests/data/geometries.json +++ b/django/contrib/gis/tests/data/geometries.json @@ -5,7 +5,7 @@ {"wkt": "POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0))", "n_i": 0, "ext_ring_cs": [[0, 0], [0, 100], [100, 100], [100, 0], [0, 0]], "n_p": 5, "area": 10000.0, "centroid": [50.0, 50.0]}, {"wkt": "POLYGON ((-95.3848703124799471 29.7056021479768511, -95.3851905195191847 29.7046588196500281, -95.3859356966379011 29.7025053545605502, -95.3860723000647539 29.7020963367038391, -95.3871517697222089 29.6989779021280995, -95.3865578518265522 29.6990856888057202, -95.3862634205175226 29.6999471753441782, -95.3861991779541967 29.6999591988978615, -95.3856773799358137 29.6998323107113578, -95.3856209915427229 29.6998005235473741, -95.3855833545501639 29.6996619391729801, -95.3855776331865002 29.6996232659570047, -95.3850162731712885 29.6997236706530536, -95.3831047357410284 29.7000847603095082, -95.3829800724914776 29.7000676365023502, -95.3828084594470909 29.6999969684031200, -95.3828131504821499 29.6999090511531065, -95.3828022942979601 29.6998152117366025, -95.3827893930918833 29.6997790953076759, -95.3825174668099862 29.6998267772748825, -95.3823521544804862 29.7000451723151606, -95.3820491918785223 29.6999682034582335, -95.3817932841505893 29.6999640407204772, -95.3815438924600443 29.7005983712500630, -95.3807812390843424 29.7007538492921590, -95.3778578936435935 29.7012966201172048, -95.3770817300034679 29.7010555145969093, -95.3772763716395957 29.7004995005932031, -95.3769891024414420 29.7005797730360186, -95.3759855007185990 29.7007754783987821, -95.3759516423090474 29.7007305400669388, -95.3765252155960042 29.6989549173240874, -95.3766842746727832 29.6985134987163164, -95.3768510987262914 29.6980530300744938, -95.3769198676258014 29.6977137204527573, -95.3769616670751930 29.6973351617272172, -95.3770309229297766 29.6969821084304186, -95.3772352596880637 29.6959751305871613, -95.3776232419333354 29.6945439060847463, -95.3776849628727064 29.6943364710766069, -95.3779699491714723 29.6926548349458947, -95.3781945479573494 29.6920088336742545, -95.3785807118394189 29.6908279316076005, -95.3787441368896651 29.6908846275832197, -95.3787903214163890 29.6907152912461640, -95.3791765069353659 29.6893335376821526, -95.3794935959513026 29.6884781789101595, -95.3796592071232112 29.6880066681407619, -95.3799788182090111 29.6873687353035081, -95.3801545516183893 29.6868782380716993, -95.3801258908302145 29.6867756621337762, -95.3801104284899566 29.6867229678809572, -95.3803803523746154 29.6863753372986459, -95.3821028558287622 29.6837392961470421, -95.3827289584682205 29.6828097375216160, -95.3827494698109035 29.6790739156259278, -95.3826022014838486 29.6776502228345507, -95.3825047356438063 29.6765773006280753, -95.3823473035336917 29.6750405250369127, -95.3824540163482055 29.6750076408228587, -95.3838984230304305 29.6745679207378679, -95.3916547074937426 29.6722459226508377, -95.3926154662749468 29.6719609085105489, -95.3967246645118081 29.6707316485589736, -95.3974588054406780 29.6705065336410989, -95.3978523748756828 29.6703795547846845, -95.3988598162279970 29.6700874981900853, -95.3995628600665952 29.6698505300412414, -95.4134721665944170 29.6656841279906232, -95.4143262068232616 29.6654291174019278, -95.4159685142480214 29.6649750989232288, -95.4180067396277565 29.6643253024318021, -95.4185886692196590 29.6641482768691063, -95.4234155309609662 29.6626925393704788, -95.4287785503196346 29.6611023620959706, -95.4310287312749352 29.6604222580752648, -95.4320295629628959 29.6603361318136720, -95.4332899683975739 29.6600560661713608, -95.4342675748811047 29.6598454934599900, -95.4343110414310871 29.6598411486215490, -95.4345576779282538 29.6598147020668499, -95.4348823041721630 29.6597875803673112, -95.4352827715209457 29.6597762346946681, -95.4355290431309982 29.6597827926562374, -95.4359197997999331 29.6598014511782715, -95.4361907884752156 29.6598444333523368, -95.4364608955807228 29.6598901433108217, -95.4367250147512323 29.6599494499910712, -95.4364898759758091 29.6601880616540186, -95.4354501111810691 29.6616378572201107, -95.4381459623171224 29.6631265631655126, -95.4367852490863129 29.6642266600024023, -95.4370040894557263 29.6643425389568769, -95.4367078350812648 29.6645492592343238, -95.4366081749871285 29.6646291473027297, -95.4358539359938192 29.6652308742342932, -95.4350327668927889 29.6658995989314462, -95.4350580905272921 29.6678812477895271, -95.4349710541447536 29.6680054925936965, -95.4349500440473548 29.6671410080890006, -95.4341492724148850 29.6678790545191688, -95.4340248868274728 29.6680353198492135, -95.4333227845797438 29.6689245624945990, -95.4331325652123326 29.6691616138940901, -95.4321314741096955 29.6704473333237253, -95.4320435792664341 29.6702578985411982, -95.4320147929883547 29.6701800936425109, -95.4319764538662980 29.6683246590817085, -95.4317490976340679 29.6684974372577166, -95.4305958185342718 29.6694049049170374, -95.4296600735653016 29.6701723430938493, -95.4284928989940937 29.6710931793380972, -95.4274630532378580 29.6719378813640091, -95.4273056811974811 29.6720684984625791, -95.4260554084574864 29.6730668861566969, -95.4253558063699643 29.6736342467365724, -95.4249278826026028 29.6739557343648919, -95.4248648873821423 29.6745400910786152, -95.4260016131471929 29.6750987014005858, -95.4258567183010911 29.6753452063069929, -95.4260238081486847 29.6754322077221353, -95.4258707374502393 29.6756647377294307, -95.4257951755816691 29.6756407098663360, -95.4257701599566985 29.6761077719536068, -95.4257726684792260 29.6761711204603955, -95.4257980187195614 29.6770219651929423, -95.4252712669032519 29.6770161558853758, -95.4249234392992065 29.6770068683962300, -95.4249574272905789 29.6779707498635759, -95.4244725881033702 29.6779825646764159, -95.4222269476429545 29.6780711474441716, -95.4223032371999267 29.6796029391538809, -95.4239133706588945 29.6795331493690355, -95.4224579084327331 29.6813706893847780, -95.4224290108823965 29.6821953228763924, -95.4230916478977349 29.6822130268724109, -95.4222928279595521 29.6832041816675343, -95.4228763710016352 29.6832087677714505, -95.4223401691637179 29.6838987872753748, -95.4211655906087088 29.6838784024852984, -95.4201984153205558 29.6851319258758082, -95.4206156387716362 29.6851623398125319, -95.4213438084897660 29.6851763011334739, -95.4212071118618752 29.6853679931624974, -95.4202651399651245 29.6865313962980508, -95.4172061157659783 29.6865816431043932, -95.4182217951255183 29.6872251197301544, -95.4178664826439160 29.6876750901471631, -95.4180678442928780 29.6877960336377207, -95.4188763472917572 29.6882826379510938, -95.4185374500596311 29.6887137897831934, -95.4182121713132290 29.6885097429738813, -95.4179857231741551 29.6888118367840086, -95.4183106010563620 29.6890048676118212, -95.4179489865331334 29.6894546700979056, -95.4175581746284820 29.6892323606815438, -95.4173439957341571 29.6894990139807007, -95.4177411199311081 29.6897435034738422, -95.4175789200209721 29.6899207529979208, -95.4170598559864800 29.6896042165807508, -95.4166733682539814 29.6900891174451367, -95.4165941362704331 29.6900347214235047, -95.4163537218065301 29.6903529467753238, -95.4126843270708775 29.6881086357212780, -95.4126604121378392 29.6880942378803496, -95.4126672298953338 29.6885951670109982, -95.4126680884821923 29.6887052446594275, -95.4158080137241882 29.6906382377959339, -95.4152061403821961 29.6910871045531586, -95.4155842583188161 29.6917382915894308, -95.4157426793520358 29.6920726941677096, -95.4154520563662203 29.6922052332446427, -95.4151389936167078 29.6923261661269571, -95.4148649784384872 29.6924343866430256, -95.4144051352401590 29.6925623927348106, -95.4146792019416665 29.6926770338507744, -95.4148824479948985 29.6928117893696388, -95.4149851734360226 29.6929823719519774, -95.4140436551925291 29.6929626643100946, -95.4140465993023241 29.6926545917254892, -95.4137269186733334 29.6927395764256090, -95.4137372859685513 29.6935432485666624, -95.4135702836218655 29.6933186678088283, -95.4133925235973237 29.6930415229852152, -95.4133017035615580 29.6928685062036166, -95.4129588921634593 29.6929391128977862, -95.4125107395559695 29.6930481664661485, -95.4102647423187307 29.6935850183258019, -95.4081931340840157 29.6940907430947760, -95.4078783596459772 29.6941703429951609, -95.4049213975000043 29.6948723732981961, -95.4045944244127071 29.6949626434239207, -95.4045865139788134 29.6954109019001358, -95.4045953345484037 29.6956972800496963, -95.4038879332535146 29.6958296089365490, -95.4040366394459340 29.6964389004769842, -95.4032774779020798 29.6965643341263892, -95.4026066501239853 29.6966646227683881, -95.4024991226393837 29.6961389766619703, -95.4011781398631911 29.6963566063186377, -95.4011524097636112 29.6962596176762190, -95.4018184046368276 29.6961399466727336, -95.4016995838361908 29.6956442609415099, -95.4007100753964608 29.6958900524002978, -95.4008032469935188 29.6962639900781404, -95.3995660267125487 29.6965636449370329, -95.3996140564775601 29.6967877962763644, -95.3996364430014410 29.6968901984825280, -95.3984003269631842 29.6968679634805746, -95.3981442026887265 29.6983660679730335, -95.3980178461957706 29.6990890276252415, -95.3977097967130163 29.7008526152273049, -95.3962347157626027 29.7009697553607630, -95.3951949050136250 29.7004740386619019, -95.3957564950617183 29.6990281830553187, -95.3965927101519924 29.6968771129030706, -95.3957496517238184 29.6970800358387095, -95.3957720559467361 29.6972264611230727, -95.3957391586571788 29.6973548894558732, -95.3956286413405365 29.6974949857280883, -95.3955111053256957 29.6975661086270186, -95.3953215342724121 29.6976022763384790, -95.3951795558443365 29.6975846977491038, -95.3950369632041060 29.6975175779330200, -95.3949401089966500 29.6974269267953304, -95.3948740281415581 29.6972903308506346, -95.3946650813866910 29.6973397326847923, -95.3947654059391112 29.6974882560192022, -95.3949627316619768 29.6980355864961858, -95.3933200807862249 29.6984590863712796, -95.3932606497523494 29.6984464798710839, -95.3932983699113350 29.6983154306484352, -95.3933058014696655 29.6982165816983610, -95.3932946347785133 29.6981089778195759, -95.3931780601756287 29.6977068906794841, -95.3929928222970602 29.6977541771878180, -95.3930873169846478 29.6980676264932946, -95.3932743746374570 29.6981249406449663, -95.3929512584706316 29.6989526513922222, -95.3919850280655197 29.7014358632108646, -95.3918950918929056 29.7014169320765724, -95.3916928317890296 29.7019232352846423, -95.3915424614970959 29.7022988712928289, -95.3901530441668939 29.7058519502930061, -95.3899656322116698 29.7059156823562418, -95.3897628748670883 29.7059900058266777, -95.3896062677805787 29.7060738276384946, -95.3893941800512266 29.7061891695242046, -95.3892150365492455 29.7062641292949436, -95.3890502563035199 29.7063339729630940, -95.3888717930715586 29.7063896908080736, -95.3886925428988945 29.7064453871994978, -95.3885376849411983 29.7064797304524149, -95.3883284158984139 29.7065153575050189, -95.3881046767627794 29.7065368368267357, -95.3878809284696132 29.7065363048447537, -95.3876046356120924 29.7065288525102424, -95.3873060894974714 29.7064822806001452, -95.3869851943158409 29.7063993367575350, -95.3865967896568065 29.7062870572919202, -95.3861785624983156 29.7061492099008184, -95.3857375009733488 29.7059887337478798, -95.3854573290902152 29.7058683664514618, -95.3848703124799471 29.7056021479768511))", "n_i": 0, "ext_ring_cs": false, "n_p": 264, "area": 0.00129917360654, "centroid": [-95.403569179437341, 29.681772571690402]} ], - "multipolygons": [ + "multipolygons": [ {"wkt": "MULTIPOLYGON (((100 20, 180 20, 180 100, 100 100, 100 20)), ((20 100, 100 100, 100 180, 20 180, 20 100)), ((100 180, 180 180, 180 260, 100 260, 100 180)), ((180 100, 260 100, 260 180, 180 180, 180 100)))","valid": true, "num_geom":4, "n_p":20}, {"wkt": "MULTIPOLYGON (((60 300, 320 220, 260 60, 60 100, 60 300)), ((60 300, 320 220, 260 60, 60 100, 60 300)))", "valid": false}, {"wkt": "MULTIPOLYGON (((180 60, 240 160, 300 60, 180 60)), ((80 80, 180 60, 160 140, 240 160, 360 140, 300 60, 420 100, 320 280, 120 260, 80 80)))", "valid": true, "num_geom": 2, "n_p": 14} diff --git a/django/contrib/gis/tests/geogapp/fixtures/initial_data.json b/django/contrib/gis/tests/geogapp/fixtures/initial_data.json index 066441172d..2324bcdc16 100644 --- a/django/contrib/gis/tests/geogapp/fixtures/initial_data.json +++ b/django/contrib/gis/tests/geogapp/fixtures/initial_data.json @@ -1,65 +1,65 @@ -[ +[ { - "pk": 1, - "model": "geogapp.city", + "pk": 1, + "model": "geogapp.city", "fields": { - "name": "Houston", + "name": "Houston", "point": "POINT (-95.363151 29.763374)" } - }, + }, { - "pk": 2, - "model": "geogapp.city", + "pk": 2, + "model": "geogapp.city", "fields": { - "name": "Dallas", + "name": "Dallas", "point": "POINT (-96.801611 32.782057)" } - }, + }, { - "pk": 3, - "model": "geogapp.city", + "pk": 3, + "model": "geogapp.city", "fields": { "name": "Oklahoma City", "point": "POINT (-97.521157 34.464642)" } - }, + }, { - "pk": 4, - "model": "geogapp.city", + "pk": 4, + "model": "geogapp.city", "fields": { "name": "Wellington", "point": "POINT (174.783117 -41.315268)" } - }, + }, { - "pk": 5, - "model": "geogapp.city", + "pk": 5, + "model": "geogapp.city", "fields": { - "name": "Pueblo", + "name": "Pueblo", "point": "POINT (-104.609252 38.255001)" } - }, + }, { - "pk": 6, - "model": "geogapp.city", + "pk": 6, + "model": "geogapp.city", "fields": { - "name": "Lawrence", + "name": "Lawrence", "point": "POINT (-95.235060 38.971823)" } - }, + }, { - "pk": 7, - "model": "geogapp.city", + "pk": 7, + "model": "geogapp.city", "fields": { - "name": "Chicago", + "name": "Chicago", "point": "POINT (-87.650175 41.850385)" } - }, + }, { - "pk": 8, - "model": "geogapp.city", + "pk": 8, + "model": "geogapp.city", "fields": { - "name": "Victoria", + "name": "Victoria", "point": "POINT (-123.305196 48.462611)" } }, diff --git a/django/contrib/gis/tests/layermap/models.py b/django/contrib/gis/tests/layermap/models.py index b58dccdf37..fe8326dac5 100644 --- a/django/contrib/gis/tests/layermap/models.py +++ b/django/contrib/gis/tests/layermap/models.py @@ -40,7 +40,7 @@ class CityBase(models.Model): class ICity1(CityBase): dt = models.DateField() - + class ICity2(ICity1): dt_time = models.DateTimeField(auto_now=True) diff --git a/django/contrib/redirects/admin.py b/django/contrib/redirects/admin.py index a9b2a3228f..05737abf18 100644 --- a/django/contrib/redirects/admin.py +++ b/django/contrib/redirects/admin.py @@ -1,11 +1,11 @@ - from django.contrib import admin from django.contrib.redirects.models import Redirect + class RedirectAdmin(admin.ModelAdmin): list_display = ('old_path', 'new_path') list_filter = ('site',) search_fields = ('old_path', 'new_path') radio_fields = {'site': admin.VERTICAL} -admin.site.register(Redirect, RedirectAdmin)
\ No newline at end of file +admin.site.register(Redirect, RedirectAdmin) diff --git a/django/contrib/sitemaps/management/commands/ping_google.py b/django/contrib/sitemaps/management/commands/ping_google.py index 7fa1690a14..3d5b95d6c7 100644 --- a/django/contrib/sitemaps/management/commands/ping_google.py +++ b/django/contrib/sitemaps/management/commands/ping_google.py @@ -11,4 +11,3 @@ class Command(BaseCommand): else: sitemap_url = None ping_google(sitemap_url=sitemap_url) - diff --git a/django/contrib/sitemaps/models.py b/django/contrib/sitemaps/models.py index 7ff128fa69..6e7633bfe0 100644 --- a/django/contrib/sitemaps/models.py +++ b/django/contrib/sitemaps/models.py @@ -1 +1 @@ -# This file intentionally left blank
\ No newline at end of file +# This file intentionally left blank diff --git a/django/contrib/sites/admin.py b/django/contrib/sites/admin.py index 2442c24292..36ac85fe8d 100644 --- a/django/contrib/sites/admin.py +++ b/django/contrib/sites/admin.py @@ -6,4 +6,4 @@ class SiteAdmin(admin.ModelAdmin): list_display = ('domain', 'name') search_fields = ('domain', 'name') -admin.site.register(Site, SiteAdmin)
\ No newline at end of file +admin.site.register(Site, SiteAdmin) diff --git a/django/contrib/sites/managers.py b/django/contrib/sites/managers.py index becb35b404..0f4eabaaa7 100644 --- a/django/contrib/sites/managers.py +++ b/django/contrib/sites/managers.py @@ -8,15 +8,15 @@ class CurrentSiteManager(models.Manager): super(CurrentSiteManager, self).__init__() self.__field_name = field_name self.__is_validated = False - + def _validate_field_name(self): field_names = self.model._meta.get_all_field_names() - + # If a custom name is provided, make sure the field exists on the model if self.__field_name is not None and self.__field_name not in field_names: raise ValueError("%s couldn't find a field named %s in %s." % \ (self.__class__.__name__, self.__field_name, self.model._meta.object_name)) - + # Otherwise, see if there is a field called either 'site' or 'sites' else: for potential_name in ['site', 'sites']: @@ -24,7 +24,7 @@ class CurrentSiteManager(models.Manager): self.__field_name = potential_name self.__is_validated = True break - + # Now do a type check on the field (FK or M2M only) try: field = self.model._meta.get_field(self.__field_name) @@ -34,7 +34,7 @@ class CurrentSiteManager(models.Manager): raise ValueError("%s couldn't find a field named %s in %s." % \ (self.__class__.__name__, self.__field_name, self.model._meta.object_name)) self.__is_validated = True - + def get_queryset(self): if not self.__is_validated: self._validate_field_name() diff --git a/django/core/mail/backends/filebased.py b/django/core/mail/backends/filebased.py index 4a74c34f1f..0f6cc0ae20 100644 --- a/django/core/mail/backends/filebased.py +++ b/django/core/mail/backends/filebased.py @@ -57,4 +57,3 @@ class EmailBackend(ConsoleEmailBackend): self.stream.close() finally: self.stream = None - diff --git a/django/core/management/commands/sqldropindexes.py b/django/core/management/commands/sqldropindexes.py index fce77211fb..029378eaa6 100644 --- a/django/core/management/commands/sqldropindexes.py +++ b/django/core/management/commands/sqldropindexes.py @@ -20,4 +20,3 @@ class Command(AppCommand): def handle_app(self, app, **options): return '\n'.join(sql_destroy_indexes(app, self.style, connections[options.get('database')])) - diff --git a/django/core/serializers/json.py b/django/core/serializers/json.py index 8ea0b0815e..fea5f3c087 100644 --- a/django/core/serializers/json.py +++ b/django/core/serializers/json.py @@ -109,4 +109,3 @@ class DjangoJSONEncoder(json.JSONEncoder): # Older, deprecated class name (for backwards compatibility purposes). DateTimeAwareJSONEncoder = DjangoJSONEncoder - diff --git a/django/dispatch/__init__.py b/django/dispatch/__init__.py index 9aeb83c5e1..e6cd630d0c 100644 --- a/django/dispatch/__init__.py +++ b/django/dispatch/__init__.py @@ -6,4 +6,4 @@ See license.txt for original license. Heavily modified for Django's purposes. """ -from django.dispatch.dispatcher import Signal, receiver
\ No newline at end of file +from django.dispatch.dispatcher import Signal, receiver diff --git a/django/utils/autoreload.py b/django/utils/autoreload.py index 6de15a2916..33d37c6835 100644 --- a/django/utils/autoreload.py +++ b/django/utils/autoreload.py @@ -179,4 +179,3 @@ def main(main_func, args=None, kwargs=None): wrapped_main_func = check_errors(main_func) reloader(wrapped_main_func, args, kwargs) - diff --git a/django/utils/regex_helper.py b/django/utils/regex_helper.py index 449bb8da42..ade1448f27 100644 --- a/django/utils/regex_helper.py +++ b/django/utils/regex_helper.py @@ -339,4 +339,3 @@ def flatten_result(source): for i in range(len(result)): result[i] += piece return result, result_args - diff --git a/django/utils/safestring.py b/django/utils/safestring.py index 3774012d32..bec59385f7 100644 --- a/django/utils/safestring.py +++ b/django/utils/safestring.py @@ -135,4 +135,3 @@ def mark_for_escaping(s): if isinstance(s, (six.text_type, Promise)): return EscapeText(s) return EscapeBytes(bytes(s)) - diff --git a/django/utils/translation/trans_null.py b/django/utils/translation/trans_null.py index 7ef07793a4..7746392097 100644 --- a/django/utils/translation/trans_null.py +++ b/django/utils/translation/trans_null.py @@ -60,4 +60,3 @@ def get_language_from_request(request, check_path=False): def get_language_from_path(request, supported=None): return None - diff --git a/django/views/decorators/http.py b/django/views/decorators/http.py index 410979e1e4..a0da002dc9 100644 --- a/django/views/decorators/http.py +++ b/django/views/decorators/http.py @@ -163,4 +163,3 @@ def etag(etag_func): def last_modified(last_modified_func): return condition(last_modified_func=last_modified_func) - |