Skip to content

Commit

Permalink
Fixed #26176 -- Fixed E123 flake8 warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
timgraham committed Feb 5, 2016
1 parent 2753145 commit 406675b
Show file tree
Hide file tree
Showing 16 changed files with 537 additions and 549 deletions.
2 changes: 1 addition & 1 deletion django/contrib/admin/checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def check_dependencies(**kwargs):
"'django.contrib.auth.context_processors.auth' must be in "
"TEMPLATES in order to use the admin application.",
id="admin.E402"
)
)
errors.append(missing_template)
return errors

Expand Down
14 changes: 9 additions & 5 deletions django/contrib/flatpages/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@


class FlatpageForm(forms.ModelForm):
url = forms.RegexField(label=_("URL"), max_length=100, regex=r'^[-\w/\.~]+$',
help_text=_("Example: '/about/contact/'. Make sure to have leading"
" and trailing slashes."),
url = forms.RegexField(
label=_("URL"),
max_length=100,
regex=r'^[-\w/\.~]+$',
help_text=_("Example: '/about/contact/'. Make sure to have leading and trailing slashes."),
error_messages={
"invalid": _("This value must contain only letters, numbers,"
" dots, underscores, dashes, slashes or tildes."),
"invalid": _(
"This value must contain only letters, numbers, dots, "
"underscores, dashes, slashes or tildes."
),
},
)

Expand Down
5 changes: 4 additions & 1 deletion django/contrib/flatpages/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ class FlatPage(models.Model):
title = models.CharField(_('title'), max_length=200)
content = models.TextField(_('content'), blank=True)
enable_comments = models.BooleanField(_('enable comments'), default=False)
template_name = models.CharField(_('template name'), max_length=70, blank=True,
template_name = models.CharField(
_('template name'),
max_length=70,
blank=True,
help_text=_(
"Example: 'flatpages/contact_page.html'. If this isn't provided, "
"the system will use 'flatpages/default.html'."
Expand Down
3 changes: 2 additions & 1 deletion django/contrib/gis/gdal/prototypes/raster.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@
get_band_datatype = int_output(std_call('GDALGetRasterDataType'), [c_void_p])
get_band_nodata_value = double_output(std_call('GDALGetRasterNoDataValue'), [c_void_p, POINTER(c_int)])
set_band_nodata_value = void_output(std_call('GDALSetRasterNoDataValue'), [c_void_p, c_double])
get_band_statistics = void_output(std_call('GDALGetRasterStatistics'),
get_band_statistics = void_output(
std_call('GDALGetRasterStatistics'),
[
c_void_p, c_int, c_int, POINTER(c_double), POINTER(c_double),
POINTER(c_double), POINTER(c_double), c_void_p, c_void_p,
Expand Down
6 changes: 3 additions & 3 deletions django/views/generic/dates.py
Original file line number Diff line number Diff line change
Expand Up @@ -658,11 +658,11 @@ def get_object(self, queryset=None):
if not self.get_allow_future() and date > datetime.date.today():
raise Http404(_(
"Future %(verbose_name_plural)s not available because "
"%(class_name)s.allow_future is False.") % {
"%(class_name)s.allow_future is False."
) % {
'verbose_name_plural': qs.model._meta.verbose_name_plural,
'class_name': self.__class__.__name__,
},
)
})

# Filter down a queryset from self.queryset using the date from the
# URL. This'll get passed as the queryset to DetailView.get_object,
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ install-script = scripts/rpm-install.sh

[flake8]
exclude = build,.git,./django/utils/lru_cache.py,./django/utils/six.py,./django/conf/app_template/*,./django/dispatch/weakref_backports.py,./tests/.env,./xmlrunner,tests/view_tests/tests/py3_test_debug.py,tests/template_tests/annotated_tag_function.py
ignore = E123,E128,E402,W503,W601
ignore = E128,E402,W503,W601
max-line-length = 119

[isort]
Expand Down
2 changes: 1 addition & 1 deletion tests/aggregation_regress/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ def test_values_list_annotation_args_ordering(self):
"""
books = Book.objects.values_list("publisher__name").annotate(
Count("id"), Avg("price"), Avg("authors__age"), avg_pgs=Avg("pages")
).order_by("-publisher__name")
).order_by("-publisher__name")
self.assertEqual(books[0], ('Sams', 1, 23.09, 45.0, 528.0))

def test_annotation_disjunction(self):
Expand Down
5 changes: 3 additions & 2 deletions tests/annotations/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,9 @@ def test_custom_functions(self):
F('ticker_name'),
F('description'),
Value('No Tag'),
function='COALESCE')
).order_by('name')
function='COALESCE'
)
).order_by('name')

self.assertQuerysetEqual(
qs, [
Expand Down
2 changes: 1 addition & 1 deletion tests/gis_tests/geoapp/test_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def test_asgeojson(self):
chicago_json,
City.objects.annotate(
geojson=functions.AsGeoJSON('point', bbox=True, crs=True, precision=5)
).get(name='Chicago').geojson
).get(name='Chicago').geojson
)

@skipUnlessDBFeature("has_AsGML_function")
Expand Down
9 changes: 4 additions & 5 deletions tests/gis_tests/gis_migrations/test_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,9 @@ def test_migrate_gis(self):
# Not all GIS backends have geometry columns model
pass
else:
self.assertEqual(
GeoColumn.objects.filter(
**{'%s__in' % GeoColumn.table_name_col(): ["gis_neighborhood", "gis_household"]}
).count(),
0)
qs = GeoColumn.objects.filter(
**{'%s__in' % GeoColumn.table_name_col(): ["gis_neighborhood", "gis_household"]}
)
self.assertEqual(qs.count(), 0)
# Revert the "unmigration"
call_command("migrate", "gis_migrations", verbosity=0)
Loading

0 comments on commit 406675b

Please sign in to comment.