diff --git a/pinry/api/api.py b/pinry/api/api.py index 60e62e3..841ab9c 100644 --- a/pinry/api/api.py +++ b/pinry/api/api.py @@ -4,7 +4,7 @@ from tastypie import fields from pinry.pins.models import Pin -class PinResource(ModelResource): +class PinResource(ModelResource): # pylint: disable-msg=R0904 thumbnail = fields.CharField(readonly=True) class Meta: @@ -13,4 +13,5 @@ class PinResource(ModelResource): include_resource_uri = False def dehydrate_thumbnail(self, bundle): - return Pin.objects.only('image').get(pk=bundle.data['id']).image.url_200x1000 + pin = Pin.objects.only('image').get(pk=bundle.data['id']) + return pin.image.url_200x1000 diff --git a/pinry/core/templatetags/bootstrap_field.py b/pinry/core/templatetags/bootstrap_field.py index d081aaa..9312d77 100644 --- a/pinry/core/templatetags/bootstrap_field.py +++ b/pinry/core/templatetags/bootstrap_field.py @@ -7,5 +7,5 @@ register = template.Library() @register.simple_tag def bootstrap_field(field): - template = loader.get_template('core/templatetags/bootstrap_field.html') - return template.render(Context({'field': field})) + t = loader.get_template('core/templatetags/bootstrap_field.html') + return t.render(Context({'field': field})) diff --git a/pinry/core/tests.py b/pinry/core/tests.py index b1f113b..f90d91a 100644 --- a/pinry/core/tests.py +++ b/pinry/core/tests.py @@ -3,6 +3,9 @@ from django.test.client import Client from django.core.urlresolvers import reverse +# pylint: disable-msg=E1103 + + class HomeTest(unittest.TestCase): def setUp(self): self.client = Client() diff --git a/pinry/core/urls.py b/pinry/core/urls.py index df6cf86..5f74d3d 100644 --- a/pinry/core/urls.py +++ b/pinry/core/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import patterns, include, url +from django.conf.urls import patterns, url urlpatterns = patterns('', diff --git a/pinry/core/views.py b/pinry/core/views.py index 52970e0..e626647 100644 --- a/pinry/core/views.py +++ b/pinry/core/views.py @@ -1,5 +1,5 @@ from django.template.response import TemplateResponse -from django.http import HttpResponseRedirect, Http404, HttpResponse +from django.http import HttpResponseRedirect from django.core.urlresolvers import reverse from django.contrib.auth.decorators import login_required from django.contrib.auth import logout @@ -10,12 +10,14 @@ from django.contrib import messages def home(request): return HttpResponseRedirect(reverse('pins:recent-pins')) + def register(request): if request.method == 'POST': form = UserCreationForm(request.POST) if form.is_valid(): form.save() - messages.success(request, 'Thank you for registering, you can now login.') + messages.success(request, 'Thank you for registering, you can now ' + 'login.') return HttpResponseRedirect(reverse('core:login')) else: form = UserCreationForm() diff --git a/pinry/pins/forms.py b/pinry/pins/forms.py index e3b6e68..fefad13 100644 --- a/pinry/pins/forms.py +++ b/pinry/pins/forms.py @@ -13,7 +13,8 @@ class PinForm(forms.ModelForm): image_file_types = ['png', 'gif', 'jpeg', 'jpg'] file_type = data.split('.')[-1] if file_type.lower() not in image_file_types: - raise forms.ValidationError("Requested URL is not an image file. Only images are currently supported.") + raise forms.ValidationError("Requested URL is not an image file. " + "Only images are currently supported.") # Check if pin already exists try: @@ -26,7 +27,9 @@ class PinForm(forms.ModelForm): elif protocol == 'https': opp_data = data.replace('https://', 'http://') else: - raise forms.ValidationError("Currently only support HTTP and HTTPS protocols, please be sure you include this in the URL.") + raise forms.ValidationError("Currently only support HTTP and " + "HTTPS protocols, please be sure " + "you include this in the URL.") try: Pin.objects.get(url=opp_data) diff --git a/pinry/pins/models.py b/pinry/pins/models.py index 31110c7..db34f12 100644 --- a/pinry/pins/models.py +++ b/pinry/pins/models.py @@ -11,16 +11,17 @@ import urllib2 class Pin(models.Model): url = models.TextField() description = models.TextField(blank=True, null=True) - image = ImageWithThumbsField(upload_to='pins/pin', sizes=((200,1000),)) + image = ImageWithThumbsField(upload_to='pins/pin', sizes=((200,1000), )) def __unicode__(self): return self.url - def save(self): + def save(self, *args, **kwargs): if not self.image: temp_img = NamedTemporaryFile() temp_img.write(urllib2.urlopen(self.url).read()) temp_img.flush() + # pylint: disable-msg=E1101 self.image.save(self.url.split('/')[-1], File(temp_img)) super(Pin, self).save() diff --git a/pinry/pins/tests.py b/pinry/pins/tests.py index 52c6669..57b050f 100644 --- a/pinry/pins/tests.py +++ b/pinry/pins/tests.py @@ -7,7 +7,7 @@ from django.core.urlresolvers import reverse # pylint: disable-msg=R0904 -class RecentPinsTest(TestCase): +class RecentPinsTest(TestCase): def setUp(self): self.client = Client() self.url = reverse('pins:recent-pins') diff --git a/pinry/pins/urls.py b/pinry/pins/urls.py index 88fae9f..41a0602 100644 --- a/pinry/pins/urls.py +++ b/pinry/pins/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import patterns, include, url +from django.conf.urls import patterns, url urlpatterns = patterns('pinry.pins.views', diff --git a/pinry/pins/views.py b/pinry/pins/views.py index 07b88e3..c210c60 100644 --- a/pinry/pins/views.py +++ b/pinry/pins/views.py @@ -3,7 +3,6 @@ from django.http import HttpResponseRedirect from django.core.urlresolvers import reverse from django.contrib import messages -from .models import Pin from .forms import PinForm