PEP 8 changes

Author: tehranian

django_url_shortener/settings.py

@@ -14,7 +14,7 @@
 
 DATABASES = {
     'default': {
-        'ENGINE': '', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
+        'ENGINE': '',                    # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
         'NAME': '',                      # Or path to database file if using sqlite3.
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.

manage.py

@@ -3,7 +3,8 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "django_url_shortener.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE",
+                          "django_url_shortener.settings")
 
     from django.core.management import execute_from_command_line
 

shortener/admin.py

@@ -2,7 +2,9 @@
 
 from shortener.models import Link
 
+
 class LinkAdmin(admin.ModelAdmin):
     pass
 
+
 admin.site.register(Link, LinkAdmin)

shortener/forms.py

@@ -3,8 +3,10 @@
 from shortener.baseconv import base62, EncodingError
 from shortener.models import Link
 
+
 too_long_error = "Your custom name is too long. Are you sure you wanted a shortening service? :)"
 
+
 class LinkSubmitForm(forms.Form):
     url = forms.URLField(
         label='URL to be shortened',)

shortener/models.py

@@ -5,6 +5,7 @@
 
 from shortener.baseconv import base62
 
+
 class Link(models.Model):
     """
     Model that represents a shortened URL

shortener/templatetags/shortener_helpers.py

@@ -2,6 +2,7 @@
 
 register = template.Library()
 
+
 @register.simple_tag(takes_context=True)
 def short_url(context, link):
     request = context['request']

shortener/tests.py

@@ -16,15 +16,15 @@
 class TemplateTagTestCase(TestCase):
     def setUp(self):
         self.HTTP_HOST = "django.testserver"
-        self.factory = RequestFactory(HTTP_HOST = self.HTTP_HOST)
+        self.factory = RequestFactory(HTTP_HOST=self.HTTP_HOST)
 
     def test_short_url(self):
         link = Link.objects.create(url='http://www.python.org/')
         request = self.factory.get(reverse('index'))
         out = Template(
             "{% load shortener_helpers %}"
             "{% short_url link %}"
-        ).render(RequestContext(request, {'link': link,}))
+        ).render(RequestContext(request, {'link': link}))
         self.assertEqual(
             out, 'http://%s/%s' % (self.HTTP_HOST, link.to_base62()))
 
@@ -36,19 +36,19 @@ def test_short_url_with_custom(self):
         out = Template(
             "{% load shortener_helpers %}"
             "{% short_url link %}"
-        ).render(RequestContext(request, {'link': link,}))
+        ).render(RequestContext(request, {'link': link}))
         self.assertEqual(
             out, 'http://%s/%s' % (self.HTTP_HOST, link.to_base62()))
 
 
 class ViewTestCase(TestCase):
     def setUp(self):
         # needed for the short_url templatetag
-        self.client = Client(HTTP_HOST = "django.testserver")
+        self.client = Client(HTTP_HOST="django.testserver")
 
     def test_submit(self):
         url = u'http://www.python.org/'
-        response = self.client.post(reverse('submit'), {'url': url,})
+        response = self.client.post(reverse('submit'), {'url': url})
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'shortener/submit_success.html')
         self.assertIn('link', response.context)
@@ -123,7 +123,7 @@ def test_submit_long_custom(self):
 
     def test_follow(self):
         url = u'http://www.python.org/'
-        response = self.client.post(reverse('submit'), {'url': url,})
+        response = self.client.post(reverse('submit'), {'url': url})
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'shortener/submit_success.html')
 

shortener/urls.py

@@ -7,4 +7,3 @@
     url(r'^submit/$', 'submit', name='submit'),
     url(r'^(?P<base62_id>\w+)$', 'follow', name='follow'),
 )
-

shortener/views.py

@@ -26,7 +26,7 @@ def info(request, base62_id):
     View which shows information on a particular link
     """
     link = get_object_or_404(Link, id=base62.to_decimal(base62_id))
-    return render(request, 'shortener/link_info.html', {'link': link,})
+    return render(request, 'shortener/link_info.html', {'link': link})
 
 
 @require_POST
@@ -55,6 +55,5 @@ def index(request):
     values = {
         'link_form': LinkSubmitForm(),
         'recent_links': Link.objects.all().order_by('-date_submitted')[:5],
-        'most_popular_links': Link.objects.all().order_by('-usage_count')[:5],}
+        'most_popular_links': Link.objects.all().order_by('-usage_count')[:5]}
     return render(request, 'shortener/index.html', values)
-