Skip to content

Commit

Permalink
Avoid the word "stupid".
Browse files Browse the repository at this point in the history
There's always a better word.
  • Loading branch information
aaugustin committed Sep 9, 2014
1 parent d26199c commit 9562ffe
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 14 deletions.
2 changes: 1 addition & 1 deletion docs/intro/tutorial04.txt
Expand Up @@ -182,7 +182,7 @@ Use generic views: Less code is better
======================================

The ``detail()`` (from :doc:`Tutorial 3 </intro/tutorial03>`) and ``results()``
views are stupidly simple -- and, as mentioned above, redundant. The ``index()``
views are very simple -- and, as mentioned above, redundant. The ``index()``
view (also from Tutorial 3), which displays a list of polls, is similar.

These views represent a common case of basic Web development: getting data from
Expand Down
4 changes: 1 addition & 3 deletions docs/ref/templates/builtins.txt
Expand Up @@ -407,9 +407,7 @@ variables or to negate a given variable::
{% endif %}

{% if not athlete_list or coach_list %}
There are no athletes or there are some coaches (OK, so
writing English translations of boolean logic sounds
stupid; it's not our fault).
There are no athletes or there are some coaches.
{% endif %}

{% if athlete_list and not coach_list %}
Expand Down
2 changes: 1 addition & 1 deletion tests/prefetch_related/tests.py
Expand Up @@ -683,7 +683,7 @@ def setUp(self):
def test_prefetch_GFK(self):
TaggedItem.objects.create(tag="awesome", content_object=self.book1)
TaggedItem.objects.create(tag="great", content_object=self.reader1)
TaggedItem.objects.create(tag="stupid", content_object=self.book2)
TaggedItem.objects.create(tag="outstanding", content_object=self.book2)
TaggedItem.objects.create(tag="amazing", content_object=self.reader3)

# 1 for TaggedItem table, 1 for Book table, 1 for Reader table
Expand Down
16 changes: 8 additions & 8 deletions tests/settings_tests/tests.py
Expand Up @@ -366,18 +366,18 @@ def test_double_slash(self):
If the value ends in more than one slash, presume they know what
they're doing.
"""
self.settings_module.MEDIA_URL = '/stupid//'
self.assertEqual('/stupid//', self.settings_module.MEDIA_URL)
self.settings_module.MEDIA_URL = '/wrong//'
self.assertEqual('/wrong//', self.settings_module.MEDIA_URL)

self.settings_module.MEDIA_URL = 'http://media.foo.com/stupid//'
self.assertEqual('http://media.foo.com/stupid//',
self.settings_module.MEDIA_URL = 'http://media.foo.com/wrong//'
self.assertEqual('http://media.foo.com/wrong//',
self.settings_module.MEDIA_URL)

self.settings_module.STATIC_URL = '/stupid//'
self.assertEqual('/stupid//', self.settings_module.STATIC_URL)
self.settings_module.STATIC_URL = '/wrong//'
self.assertEqual('/wrong//', self.settings_module.STATIC_URL)

self.settings_module.STATIC_URL = 'http://static.foo.com/stupid//'
self.assertEqual('http://static.foo.com/stupid//',
self.settings_module.STATIC_URL = 'http://static.foo.com/wrong//'
self.assertEqual('http://static.foo.com/wrong//',
self.settings_module.STATIC_URL)


Expand Down
2 changes: 1 addition & 1 deletion tests/staticfiles_tests/tests.py
Expand Up @@ -73,7 +73,7 @@ def setUp(self):
self._nonascii_filepath = os.path.join(self.testfiles_path, '\u2297.txt')
with codecs.open(self._nonascii_filepath, 'w', 'utf-8') as f:
f.write("\u2297 in the app dir")
# And also create the stupid hidden file to dwarf the setup.py's
# And also create the magic hidden file to trick the setup.py's
# package data handling.
self._hidden_filepath = os.path.join(self.testfiles_path, '.hidden')
with codecs.open(self._hidden_filepath, 'w', 'utf-8') as f:
Expand Down

0 comments on commit 9562ffe

Please sign in to comment.