diff options
| author | Alasdair Nicol <alasdair@memset.com> | 2013-10-18 00:58:02 +0100 |
|---|---|---|
| committer | Alasdair Nicol <alasdair@memset.com> | 2013-10-18 01:46:24 +0100 |
| commit | bab9123daa5d05150951f74183906a76d2b0cf27 (patch) | |
| tree | 4fc24535f85f84c69e64c6eac654294725d906df /django | |
| parent | 65d1d65d52a87bba22845bcb7c3c921a8789ec19 (diff) | |
Fixed #21268 -- Fixed E303 pep8 warnings
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/templatetags/admin_list.py | 1 | ||||
| -rw-r--r-- | django/contrib/auth/tests/test_auth_backends.py | 1 | ||||
| -rw-r--r-- | django/contrib/auth/tests/test_views.py | 1 | ||||
| -rw-r--r-- | django/contrib/contenttypes/tests.py | 1 | ||||
| -rw-r--r-- | django/contrib/formtools/preview.py | 1 | ||||
| -rw-r--r-- | django/contrib/formtools/tests/tests.py | 1 | ||||
| -rw-r--r-- | django/contrib/gis/geos/tests/test_mutable_list.py | 1 | ||||
| -rw-r--r-- | django/contrib/gis/tests/test_measure.py | 1 | ||||
| -rw-r--r-- | django/contrib/sessions/tests.py | 1 | ||||
| -rw-r--r-- | django/contrib/sitemaps/tests/test_http.py | 1 | ||||
| -rw-r--r-- | django/core/handlers/base.py | 1 | ||||
| -rw-r--r-- | django/core/urlresolvers.py | 1 | ||||
| -rw-r--r-- | django/forms/models.py | 1 | ||||
| -rw-r--r-- | django/test/runner.py | 1 | ||||
| -rw-r--r-- | django/utils/six.py | 6 |
15 files changed, 0 insertions, 20 deletions
diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py index f1c11831ab..4e0af56312 100644 --- a/django/contrib/admin/templatetags/admin_list.py +++ b/django/contrib/admin/templatetags/admin_list.py @@ -155,7 +155,6 @@ def result_headers(cl): if i not in ordering_field_columns: o_list_primary.insert(0, make_qs_param(new_order_type, i)) - yield { "text": text, "sortable": True, diff --git a/django/contrib/auth/tests/test_auth_backends.py b/django/contrib/auth/tests/test_auth_backends.py index 280d760afb..ce829e575e 100644 --- a/django/contrib/auth/tests/test_auth_backends.py +++ b/django/contrib/auth/tests/test_auth_backends.py @@ -236,7 +236,6 @@ class CustomUserModelBackendAuthenticateTest(TestCase): self.assertEqual(test_user, authenticated_user) - class TestObj(object): pass diff --git a/django/contrib/auth/tests/test_views.py b/django/contrib/auth/tests/test_views.py index d9a848bdd2..dc2e985248 100644 --- a/django/contrib/auth/tests/test_views.py +++ b/django/contrib/auth/tests/test_views.py @@ -198,7 +198,6 @@ class PasswordResetTest(AuthViewsTestCase): self.assertEqual(len(mail.outbox), 0) self.assertEqual(len(logger_calls), 1) - def _test_confirm_start(self): # Start by creating the email self.client.post('/password_reset/', {'email': 'staffmember@example.com'}) diff --git a/django/contrib/contenttypes/tests.py b/django/contrib/contenttypes/tests.py index f300294cd6..3f648bd456 100644 --- a/django/contrib/contenttypes/tests.py +++ b/django/contrib/contenttypes/tests.py @@ -203,7 +203,6 @@ class ContentTypesTests(TestCase): DeferredProxyModel: proxy_model_ct, }) - @override_settings(ALLOWED_HOSTS=['example.com']) def test_shortcut_view(self): """ diff --git a/django/contrib/formtools/preview.py b/django/contrib/formtools/preview.py index 53b0da6e8e..2ef7b6d146 100644 --- a/django/contrib/formtools/preview.py +++ b/django/contrib/formtools/preview.py @@ -101,7 +101,6 @@ class FormPreview(object): "Context for template rendering." return {'form': form, 'stage_field': self.unused_name('stage'), 'state': self.state} - def parse_params(self, *args, **kwargs): """ Given captured args and kwargs from the URLconf, saves something in diff --git a/django/contrib/formtools/tests/tests.py b/django/contrib/formtools/tests/tests.py index e1e6ab860b..fff483ce38 100644 --- a/django/contrib/formtools/tests/tests.py +++ b/django/contrib/formtools/tests/tests.py @@ -139,7 +139,6 @@ class PreviewTests(TestCase): response = self.client.post('/preview/', self.test_data) self.assertEqual(response.content, success_string_encoded) - def test_form_submit_bad_hash(self): """ Test contrib.formtools.preview form submittal does not proceed diff --git a/django/contrib/gis/geos/tests/test_mutable_list.py b/django/contrib/gis/geos/tests/test_mutable_list.py index 3cf1daf12a..d6ca2f66ec 100644 --- a/django/contrib/gis/geos/tests/test_mutable_list.py +++ b/django/contrib/gis/geos/tests/test_mutable_list.py @@ -145,7 +145,6 @@ class ListMixinTest(unittest.TestCase): pl[::k] = ssl self.assertEqual(pl, ul[:], 'set slice [::%d]' % (k)) - def test03_delslice(self): 'Delete slice' for Len in range(self.limit): diff --git a/django/contrib/gis/tests/test_measure.py b/django/contrib/gis/tests/test_measure.py index 131e1ba7aa..21870b6f0c 100644 --- a/django/contrib/gis/tests/test_measure.py +++ b/django/contrib/gis/tests/test_measure.py @@ -32,7 +32,6 @@ class DistanceTest(unittest.TestCase): self.assertEqual(d.m, 1.0) self.assertEqual(d.mm, 1000.0) - def testInitInvalid(self): "Testing initialisation from invalid units" self.assertRaises(AttributeError, D, banana=100) diff --git a/django/contrib/sessions/tests.py b/django/contrib/sessions/tests.py index 0b10e14530..275eba5713 100644 --- a/django/contrib/sessions/tests.py +++ b/django/contrib/sessions/tests.py @@ -284,7 +284,6 @@ class SessionTestsMixin(object): self.assertEqual(len(calls), 1) self.assertTrue('corrupted' in calls[0]) - def test_actual_expiry(self): # this doesn't work with JSONSerializer (serializing timedelta) with override_settings(SESSION_SERIALIZER='django.contrib.sessions.serializers.PickleSerializer'): diff --git a/django/contrib/sitemaps/tests/test_http.py b/django/contrib/sitemaps/tests/test_http.py index 6d6862e0a6..aba3e736c2 100644 --- a/django/contrib/sitemaps/tests/test_http.py +++ b/django/contrib/sitemaps/tests/test_http.py @@ -42,7 +42,6 @@ class HTTPSitemapTests(SitemapTestsBase): """ % self.base_url self.assertXMLEqual(response.content.decode('utf-8'), expected_content) - def test_simple_sitemap_section(self): "A simple sitemap section can be rendered" response = self.client.get('/simple/sitemap-simple.xml') diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py index fe7abed903..9679ae88dc 100644 --- a/django/core/handlers/base.py +++ b/django/core/handlers/base.py @@ -30,7 +30,6 @@ class BaseHandler(object): def __init__(self): self._request_middleware = self._view_middleware = self._template_response_middleware = self._response_middleware = self._exception_middleware = None - def load_middleware(self): """ Populate middleware lists from settings.MIDDLEWARE_CLASSES. diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py index 14fc282281..e3f1e3ecb5 100644 --- a/django/core/urlresolvers.py +++ b/django/core/urlresolvers.py @@ -156,7 +156,6 @@ class LocaleRegexProvider(object): self._regex = regex self._regex_dict = {} - @property def regex(self): """ diff --git a/django/forms/models.py b/django/forms/models.py index 1a6e7d2a7a..3b01e9b6c7 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -840,7 +840,6 @@ class BaseInlineFormSet(BaseModelFormSet): return 0 return super(BaseInlineFormSet, self).initial_form_count() - def _construct_form(self, i, **kwargs): form = super(BaseInlineFormSet, self)._construct_form(i, **kwargs) if self.save_as_new: diff --git a/django/test/runner.py b/django/test/runner.py index 700a52c775..fd0bfe8cb0 100644 --- a/django/test/runner.py +++ b/django/test/runner.py @@ -89,7 +89,6 @@ class DiscoverRunner(object): break kwargs['top_level_dir'] = top_level - if not (tests and tests.countTestCases()): # if no tests found, it's probably a package; try discovery tests = self.test_loader.discover(start_dir=label, **kwargs) diff --git a/django/utils/six.py b/django/utils/six.py index e3720b1308..b5f0162393 100644 --- a/django/utils/six.py +++ b/django/utils/six.py @@ -130,7 +130,6 @@ class MovedAttribute(_LazyDescr): return getattr(module, self.attr) - class _MovedItems(types.ModuleType): """Lazy loading of moved objects""" @@ -198,7 +197,6 @@ del attr moves = sys.modules[__name__ + ".moves"] = _MovedItems(__name__ + ".moves") - class Module_six_moves_urllib_parse(types.ModuleType): """Lazy loading of moved objects in six.moves.urllib_parse""" @@ -484,13 +482,11 @@ if PY3: import builtins exec_ = getattr(builtins, "exec") - def reraise(tp, value, tb=None): if value.__traceback__ is not tb: raise value.with_traceback(tb) raise value - print_ = getattr(builtins, "print") del builtins @@ -507,12 +503,10 @@ else: _locs_ = _globs_ exec("""exec _code_ in _globs_, _locs_""") - exec_("""def reraise(tp, value, tb=None): raise tp, value, tb """) - def print_(*args, **kwargs): """The new-style print function.""" fp = kwargs.pop("file", sys.stdout) |
