From 1dae4ac1778f04805c0ed62c8debb13b281ba02b Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Thu, 10 Oct 2013 16:42:30 -0400 Subject: [PATCH] Whitespace cleanup. * Removed trailing whitespace. * Added newline to EOF if missing. * Removed blank lines at EOF. * Removed some stray tabs. --- LICENSE | 6 +- django/bin/django-2to3.py | 1 - django/bin/profiling/gather_profile_stats.py | 2 +- django/conf/locale/ar/formats.py | 14 ++-- django/conf/locale/bg/formats.py | 16 ++-- django/conf/locale/bn/formats.py | 14 ++-- django/conf/locale/bs/formats.py | 12 +-- django/conf/locale/ca/formats.py | 1 - django/conf/locale/cy/formats.py | 22 ++--- django/conf/locale/el/formats.py | 14 ++-- django/conf/locale/en/formats.py | 1 - django/conf/locale/en_GB/formats.py | 1 - django/conf/locale/es/formats.py | 1 - django/conf/locale/es_NI/formats.py | 7 +- django/conf/locale/et/formats.py | 16 ++-- django/conf/locale/eu/formats.py | 18 ++-- django/conf/locale/fa/formats.py | 10 +-- django/conf/locale/fi/formats.py | 12 +-- django/conf/locale/fy_NL/formats.py | 28 +++---- django/conf/locale/ga/formats.py | 16 ++-- django/conf/locale/gl/formats.py | 8 +- django/conf/locale/he/formats.py | 10 +-- django/conf/locale/hi/formats.py | 16 ++-- django/conf/locale/is/formats.py | 14 ++-- django/conf/locale/ja/formats.py | 10 +-- django/conf/locale/km/formats.py | 12 +-- django/conf/locale/kn/formats.py | 20 ++--- django/conf/locale/ml/formats.py | 1 - django/conf/locale/ro/formats.py | 10 +-- django/conf/locale/sq/formats.py | 14 ++-- django/conf/locale/ta/formats.py | 20 ++--- django/conf/locale/te/formats.py | 20 ++--- django/conf/locale/th/formats.py | 10 +-- django/conf/locale/uk/formats.py | 12 +-- django/conf/locale/vi/formats.py | 10 +-- django/conf/locale/zh_CN/formats.py | 28 +++---- django/conf/locale/zh_TW/formats.py | 28 +++---- django/conf/urls/__init__.py | 1 - .../admin/js/admin/RelatedObjectLookups.js | 2 +- django/contrib/auth/fixtures/natural.json | 34 ++++---- django/contrib/auth/fixtures/regular.json | 34 ++++---- django/contrib/auth/hashers.py | 1 - .../auth_attrs_no_access.html | 2 +- .../auth/tests/test_context_processors.py | 2 +- django/contrib/comments/moderation.py | 2 +- django/contrib/flatpages/tests/test_forms.py | 1 - .../flatpages/tests/test_middleware.py | 2 - .../flatpages/tests/test_templatetags.py | 1 - django/contrib/flatpages/tests/urls.py | 1 - .../tests/wizard/namedwizardtests/forms.py | 1 - .../tests/wizard/test_loadstorage.py | 1 - .../tests/wizard/wizardtests/forms.py | 1 - .../gis/db/backends/spatialite/client.py | 1 - .../contrib/gis/db/models/sql/conversion.py | 2 +- django/contrib/gis/feeds.py | 2 +- django/contrib/gis/gdal/__init__.py | 1 - django/contrib/gis/gdal/base.py | 1 - django/contrib/gis/gdal/envelope.py | 82 +++++++++---------- django/contrib/gis/gdal/error.py | 2 +- django/contrib/gis/gdal/prototypes/ds.py | 2 +- .../contrib/gis/gdal/prototypes/generation.py | 4 +- django/contrib/gis/gdal/prototypes/geom.py | 3 +- django/contrib/gis/geos/__init__.py | 2 +- django/contrib/gis/geos/error.py | 2 +- django/contrib/gis/geos/io.py | 2 - .../contrib/gis/geos/prototypes/topology.py | 2 +- django/contrib/gis/maps/google/__init__.py | 10 +-- django/contrib/gis/shortcuts.py | 2 +- django/contrib/gis/sitemaps/__init__.py | 1 - django/contrib/gis/sitemaps/georss.py | 1 - django/contrib/gis/sitemaps/kml.py | 6 +- .../gis/templates/gis/admin/openlayers.html | 4 +- django/contrib/gis/tests/data/geometries.json | 2 +- .../tests/geogapp/fixtures/initial_data.json | 60 +++++++------- django/contrib/gis/tests/layermap/models.py | 2 +- django/contrib/redirects/admin.py | 4 +- .../management/commands/ping_google.py | 1 - django/contrib/sitemaps/models.py | 2 +- django/contrib/sites/admin.py | 2 +- django/contrib/sites/managers.py | 10 +-- django/core/mail/backends/filebased.py | 1 - .../management/commands/sqldropindexes.py | 1 - django/core/serializers/json.py | 1 - django/dispatch/__init__.py | 2 +- django/utils/autoreload.py | 1 - django/utils/regex_helper.py | 1 - django/utils/safestring.py | 1 - django/utils/translation/trans_null.py | 1 - django/views/decorators/http.py | 1 - docs/README | 2 +- docs/_ext/literals_to_xrefs.py | 34 ++++---- docs/_theme/djangodocs/layout.html | 16 ++-- docs/faq/index.txt | 2 +- .../contributing/triaging-tickets.txt | 2 +- docs/misc/design-philosophies.txt | 2 +- docs/misc/index.txt | 2 +- docs/ref/contrib/gis/forms-api.txt | 2 +- docs/ref/models/relations.txt | 2 +- docs/releases/1.0-beta.txt | 2 +- docs/releases/1.1-rc-1.txt | 2 +- docs/releases/1.2-rc-1.txt | 2 +- docs/releases/1.2.7.txt | 2 +- docs/topics/http/index.txt | 2 +- extras/django_bash_completion | 3 +- scripts/manage_translations.py | 2 +- tests/admin_custom_urls/fixtures/actions.json | 34 ++++---- tests/admin_custom_urls/urls.py | 1 - .../custom_templates/app_template/api.py | 2 +- .../custom_templates/app_template/models.py | 2 +- .../additional_dir/additional_file.py | 2 +- .../management/commands/app_command.py | 1 - tests/admin_scripts/tests.py | 2 +- .../fixtures/admin-widgets-users.xml | 2 +- tests/admin_widgets/widgetadmin.py | 5 +- tests/aggregation/models.py | 1 - tests/bash_completion/models.py | 1 - tests/cache/liberal_backend.py | 1 - tests/cache/tests.py | 1 - tests/choices/tests.py | 1 - tests/comment_tests/tests/__init__.py | 1 - tests/conditional_processing/views.py | 1 - tests/context_processors/tests.py | 1 - tests/createsuperuser/tests.py | 1 - tests/custom_columns/models.py | 1 - tests/custom_columns_regress/models.py | 3 - tests/custom_managers_regress/tests.py | 1 - tests/custom_pk/models.py | 1 - tests/decorators/models.py | 1 - tests/defaultfilters/tests.py | 2 +- tests/distinct_on_fields/tests.py | 1 - tests/expressions_regress/models.py | 1 - tests/extra_regress/models.py | 1 - tests/fixtures/fixtures/fixture2.json | 14 ++-- .../fixtures/fixture1.json | 14 ++-- .../fixtures/fixture2.json | 14 ++-- tests/fixtures_regress/fixtures/absolute.json | 4 +- .../fixtures/big-fixture.json | 22 ++--- tests/fixtures_regress/fixtures/sequence.json | 6 +- tests/generic_inline_admin/models.py | 2 - tests/generic_views/test_edit.py | 1 - tests/http_utils/tests.py | 2 +- tests/i18n/resolution/models.py | 2 +- tests/initial_sql_regress/models.py | 1 - tests/known_related_objects/models.py | 1 - tests/m2m_and_m2o/models.py | 1 - tests/m2m_intermediary/models.py | 1 - tests/m2m_regress/tests.py | 1 - tests/mail/models.py | 1 - .../test_migrations/0001_initial.py | 4 +- .../test_migrations_2/0001_initial.py | 4 +- tests/migrations/test_state.py | 6 +- tests/multiple_database/routers.py | 1 - tests/resolve_url/tests.py | 1 - tests/tablespaces/tests.py | 2 +- .../template_tests/templatetags/broken_tag.py | 2 +- tests/test_client/fixtures/testdata.json | 78 +++++++++--------- .../fixtures/testdata.json | 78 +++++++++--------- .../included_named_urls.py | 1 - .../included_named_urls2.py | 1 - .../included_namespace_urls.py | 1 - tests/urlpatterns_reverse/no_urls.py | 1 - tests/urlpatterns_reverse/tests.py | 1 - tests/utils_tests/files/strip_tags1.html | 58 ++++++------- tests/utils_tests/files/strip_tags2.txt | 26 +++--- tests/utils_tests/test_module/bad_module.py | 2 +- tests/utils_tests/test_module/good_module.py | 2 +- tests/validation/__init__.py | 1 - tests/validation/test_custom_messages.py | 1 - tests/validation/test_unique.py | 1 - tests/version/tests.py | 1 - tests/view_tests/__init__.py | 1 - tests/view_tests/templatetags/debugtags.py | 1 - tests/view_tests/tests/test_specials.py | 1 - 173 files changed, 602 insertions(+), 678 deletions(-) delete mode 100644 tests/mail/models.py diff --git a/LICENSE b/LICENSE index d0c3f2838d..5f4f225dd2 100644 --- a/LICENSE +++ b/LICENSE @@ -4,10 +4,10 @@ All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code must retain the above copyright notice, + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright + + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 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, "

Root

") - - 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 }} => "" 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: - + - The `style` property provides the correct style tag for the CSS properties required by Google Maps on IE: - - The `scripts` property provides the necessary - + @@ -89,9 +89,9 @@ - - + +