From 17abf1f48e5e15e388edee7902eeb7463f1b695e Mon Sep 17 00:00:00 2001 From: James Tauber Date: Thu, 31 Jul 2014 17:56:29 -0400 Subject: [PATCH] flake8 compliance --- docs/conf.py | 6 ++-- setup.py | 20 ++++++------- user_messages/forms.py | 12 ++++---- user_messages/models.py | 2 -- .../templatetags/user_messages_tags.py | 1 + user_messages/tests/__init__.py | 4 +-- user_messages/tests/manage.py | 6 +++- user_messages/tests/test_messages.py | 28 +++++++++++-------- user_messages/urls.py | 5 ++-- user_messages/utils.py | 1 + user_messages/views.py | 14 ++++++---- 11 files changed, 56 insertions(+), 43 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 7fe464f..a443bf9 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -11,8 +11,6 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os - # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. @@ -178,8 +176,8 @@ # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ - ('index', 'user-messages.tex', u'user-messages Documentation', - u'Eldarion', 'manual'), + ('index', 'user-messages.tex', u'user-messages Documentation', + u'Eldarion', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of diff --git a/setup.py b/setup.py index 5311e91..b640fb7 100644 --- a/setup.py +++ b/setup.py @@ -2,20 +2,20 @@ setup( - name = "user-messages", - version = "0.1", - author = "Eldarion", - author_email = "development@eldarion.com", - description = "a reusable private user messages application for Django", - long_description = open("README.rst").read(), - license = "BSD", - url = "http://github.com/eldarion/user_messages", - packages = [ + name="user-messages", + version="0.1", + author="Eldarion", + author_email="development@eldarion.com", + description="a reusable private user messages application for Django", + long_description=open("README.rst").read(), + license="BSD", + url="http://github.com/eldarion/user_messages", + packages=[ "user_messages", "user_messages.tests", "user_messages.templatetags", ], - classifiers = [ + classifiers=[ "Development Status :: 3 - Alpha", "Environment :: Web Environment", "Intended Audience :: Developers", diff --git a/user_messages/forms.py b/user_messages/forms.py index 0d743cd..71aff34 100644 --- a/user_messages/forms.py +++ b/user_messages/forms.py @@ -20,8 +20,8 @@ def __init__(self, *args, **kwargs): def save(self): data = self.cleaned_data - return Message.objects.new_message(self.user, [data["to_user"]], - data["subject"], data["content"]) + return Message.objects.new_message( + self.user, [data["to_user"]], data["subject"], data["content"]) class NewMessageFormMultiple(forms.Form): @@ -39,8 +39,8 @@ def __init__(self, *args, **kwargs): def save(self): data = self.cleaned_data - return Message.objects.new_message(self.user, data["to_user"], - data["subject"], data["content"]) + return Message.objects.new_message( + self.user, data["to_user"], data["subject"], data["content"]) class MessageReplyForm(forms.Form): @@ -53,5 +53,5 @@ def __init__(self, *args, **kwargs): super(MessageReplyForm, self).__init__(*args, **kwargs) def save(self): - return Message.objects.new_reply(self.thread, self.user, - self.cleaned_data["content"]) + return Message.objects.new_reply( + self.thread, self.user, self.cleaned_data["content"]) diff --git a/user_messages/models.py b/user_messages/models.py index 4b3afa1..3170de5 100644 --- a/user_messages/models.py +++ b/user_messages/models.py @@ -1,5 +1,3 @@ -from datetime import datetime - from django.core.urlresolvers import reverse from django.db import models diff --git a/user_messages/templatetags/user_messages_tags.py b/user_messages/templatetags/user_messages_tags.py index 6dc3db6..279a13e 100644 --- a/user_messages/templatetags/user_messages_tags.py +++ b/user_messages/templatetags/user_messages_tags.py @@ -3,6 +3,7 @@ register = template.Library() + @register.filter def unread(thread, user): return bool(thread.userthread_set.filter(user=user, unread=True)) diff --git a/user_messages/tests/__init__.py b/user_messages/tests/__init__.py index fc828d6..1f5f69e 100644 --- a/user_messages/tests/__init__.py +++ b/user_messages/tests/__init__.py @@ -1,2 +1,2 @@ -from user_messages.tests.test_messages import (TestMessages, TestMessageViews, - TestTemplateTags) +from user_messages.tests.test_messages import ( # noqa + TestMessages, TestMessageViews, TestTemplateTags) diff --git a/user_messages/tests/manage.py b/user_messages/tests/manage.py index 5e78ea9..07e3e4c 100755 --- a/user_messages/tests/manage.py +++ b/user_messages/tests/manage.py @@ -1,11 +1,15 @@ #!/usr/bin/env python + from django.core.management import execute_manager + + try: - import settings # Assumed to be in the same directory. + import settings # Assumed to be in the same directory. except ImportError: import sys sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__) sys.exit(1) + if __name__ == "__main__": execute_manager(settings) diff --git a/user_messages/tests/test_messages.py b/user_messages/tests/test_messages.py index be04f5f..69deea4 100644 --- a/user_messages/tests/test_messages.py +++ b/user_messages/tests/test_messages.py @@ -13,10 +13,10 @@ class BaseTest(TestCase): def setUp(self): - self.brosner = User.objects.create_superuser("brosner", - "brosner@brosner.brosner", "abc123") - self.jtauber = User.objects.create_superuser("jtauber", - "jtauber@jtauber.jtauber", "abc123") + self.brosner = User.objects.create_superuser( + "brosner", "brosner@brosner.brosner", "abc123") + self.jtauber = User.objects.create_superuser( + "jtauber", "jtauber@jtauber.jtauber", "abc123") if hasattr(self, "template_dirs"): self._old_template_dirs = settings.TEMPLATE_DIRS settings.TEMPLATE_DIRS = self.template_dirs @@ -28,8 +28,8 @@ def tearDown(self): class TestMessages(BaseTest): def test_messages(self): - Message.objects.new_message(self.brosner, [self.jtauber], "Really?", - "You can't be serious") + Message.objects.new_message( + self.brosner, [self.jtauber], "Really?", "You can't be serious") self.assertEqual(Thread.objects.inbox(self.brosner).count(), 0) self.assertEqual(Thread.objects.inbox(self.jtauber).count(), 1) @@ -44,17 +44,22 @@ def test_messages(self): Message.objects.new_reply(thread, self.brosner, "If you say so...") Message.objects.new_reply(thread, self.jtauber, "Indeed I do") - self.assertEqual(Thread.objects.get(pk=thread.pk).latest_message.content, + self.assertEqual( + Thread.objects.get(pk=thread.pk).latest_message.content, "Indeed I do") - self.assertEqual(Thread.objects.get(pk=thread.pk).first_message.content, + self.assertEqual( + Thread.objects.get(pk=thread.pk).first_message.content, "You can't be serious") def test_ordered(self): - t1 = Message.objects.new_message(self.brosner, [self.jtauber], "Subject", + t1 = Message.objects.new_message( + self.brosner, [self.jtauber], "Subject", "A test message").thread - t2 = Message.objects.new_message(self.brosner, [self.jtauber], "Another", + t2 = Message.objects.new_message( + self.brosner, [self.jtauber], "Another", "Another message").thread - t3 = Message.objects.new_message(self.brosner, [self.jtauber], "Pwnt", + t3 = Message.objects.new_message( + self.brosner, [self.jtauber], "Pwnt", "Haha I'm spamming your inbox").thread self.assertEqual(Thread.ordered([t2, t1, t3]), [t3, t2, t1]) @@ -122,6 +127,7 @@ def test_create_message(self): def test_urls(self): self.assertEqual(reverse("message_create", args=[10]), "/create/10/") + class TestTemplateTags(BaseTest): def test_unread(self): thread = Message.objects.new_message(self.brosner, [self.jtauber], "Why did you the internet?", "I demand to know.").thread diff --git a/user_messages/urls.py b/user_messages/urls.py index a3cb325..2d3f528 100644 --- a/user_messages/urls.py +++ b/user_messages/urls.py @@ -1,7 +1,8 @@ -from django.conf.urls.defaults import patterns, include, url, handler404, handler500 +from django.conf.urls.defaults import patterns, url -urlpatterns = patterns("user_messages.views", +urlpatterns = patterns( + "user_messages.views", url(r"^inbox/$", "inbox", name="messages_inbox"), url(r"^create/$", "message_create", name="message_create"), url(r"^create/(?P\d+)/$", "message_create", name="message_create"), diff --git a/user_messages/utils.py b/user_messages/utils.py index 3a854fd..2974b29 100644 --- a/user_messages/utils.py +++ b/user_messages/utils.py @@ -6,6 +6,7 @@ def cached_attribute(func): cache_name = "_%s" % func.__name__ + @wraps(func) def inner(self, *args, **kwargs): if hasattr(self, cache_name): diff --git a/user_messages/views.py b/user_messages/views.py index 8a9a187..a6d216d 100644 --- a/user_messages/views.py +++ b/user_messages/views.py @@ -16,14 +16,16 @@ def inbox(request, template_name="user_messages/inbox.html"): threads_unread = Thread.ordered(Thread.objects.unread(request.user)) return render_to_response(template_name, { "threads": threads, - "unread" : threads_unread + "unread": threads_unread }, context_instance=RequestContext(request)) @login_required -def thread_detail(request, thread_id, +def thread_detail( + request, thread_id, template_name="user_messages/thread_detail.html", - form_class=MessageReplyForm): + form_class=MessageReplyForm +): qs = Thread.objects.filter(userthread__user=request.user).distinct() thread = get_object_or_404(qs, pk=thread_id) if request.method == "POST": @@ -41,9 +43,11 @@ def thread_detail(request, thread_id, @login_required -def message_create(request, user_id=None, +def message_create( + request, user_id=None, template_name="user_messages/message_create.html", - form_class=None, multiple=False): + form_class=None, multiple=False +): if form_class is None: if multiple: form_class = NewMessageFormMultiple