All code refactored following PEP-8

Author: romulomachado

apps/history/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
 from apps.history.models import History
 
-admin.site.register(History)
 
+admin.site.register(History)

apps/history/features/steps.py

@@ -1,7 +1,7 @@
 from lettuce import step
 from apps.history.models import History
 
+
 @step(u'Given current history is "(.*)"')
 def given_current_history_is_group1(step, history_text):
     History(text=history_text).save()
-

apps/history/models.py

@@ -1,6 +1,7 @@
 from django.db import models
 from docutils.core import publish_parts
 
+
 class History(models.Model):
     text = models.TextField(blank=False)
     updated_at = models.DateTimeField(auto_now=True)
@@ -11,4 +12,3 @@ class Meta:
     def to_html(self):
         parts = publish_parts(source=self.text, writer_name="html4css1")
         return parts['fragment']
-

apps/history/tests.py

@@ -1,10 +1,10 @@
 from django.test import TestCase
-from should_dsl import *
+from should_dsl import should
 from apps.history.models import History
 
+
 class HistoryTest(TestCase):
 
     def test_convert_its_RST_text_to_HTML(self):
         h = History(text="*NSI* site rulz!")
         h.to_html() |should| contain('<em>NSI</em> site rulz!')
-

apps/history/views.py

@@ -1,7 +1,7 @@
 from django.shortcuts import render_to_response
 from apps.history.models import History
 
+
 def show(request):
     return render_to_response('show.html',
-      { 'history': History.objects.all()[0] })
-
+      {'history': History.objects.all()[0]})

apps/members/features/steps.py

@@ -3,12 +3,13 @@
 from apps.members.models import Member
 from lettuce.django import django_url
 
+
 @step(u'Given exist a member:')
 def given_exist_a_member(step):
     Member(**step.hashes[0]).save()
-    
+
+
 @step(r'I go to the "(.+)" member page')
 def i_go_to_member_page(step, member_name):
     member_obj = Member.objects.get(name=member_name)
     world.browser.visit(django_url('/member/%i' % member_obj.id))
-

apps/members/models.py

@@ -2,12 +2,13 @@
 from apps.teams.models import Team
 from apps.projects.models import Project
 
+
 class Member(models.Model):
     name = models.CharField(max_length=100)
     #current_team = models.ManyToManyField(Team)
     current_team = models.CharField(max_length=100)
     currently_does = models.TextField()
-    life_and_work =  models.TextField()
+    life_and_work = models.TextField()
     site = models.URLField(null=True)
     github = models.URLField(null=True)
     twitter = models.URLField(null=True)

apps/members/views.py

@@ -1,7 +1,8 @@
 from django.shortcuts import render_to_response
 from apps.members.models import Member
 
+
 def show(request, member_id):
     member = Member.objects.get(id=member_id)
     return render_to_response('show_member.html',
-      { 'member': member})
+      {'member': member})

apps/news/models.py

@@ -1,16 +1,17 @@
 from django.db import models
 from django.contrib.auth.models import User
 
+
 class News(models.Model):
     title = models.CharField(max_length=200)
     summary = models.CharField(max_length=200, null=True, blank=True)
     body = models.TextField()
     image = models.ImageField(null=True, blank=True, upload_to='images')
     author = models.ForeignKey(User)
     datetime = models.DateTimeField(auto_now=True)
-    
+
     class Meta:
         verbose_name_plural = 'News'
-        
+
     def __unicode__(self):
         return self.title

apps/news/tests.py

@@ -1,6 +1,6 @@
-#encoding: utf-8
-
+#-*- coding:utf-8 -*-
 from django.test import TestCase
 
+
 class TestNews(TestCase):
-    pass
+    pass

apps/projects/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
 from apps.projects.models import Project
 
-admin.site.register(Project)
 
+admin.site.register(Project)

apps/projects/features/steps.py

@@ -4,11 +4,11 @@
 from lettuce import step, world
 from apps.projects.models import Project
 
+
 @step(u'Given exist a project:')
 def given_exist_a_project(step):
     Project(**step.hashes[0]).save()
     file_name = step.hashes[0]['logo'].split('/')[-1]
     shutil.copy2(os.path.join(settings.PROJECT_ROOT_PATH, 'apps', 'projects',
                               'features', 'resources', file_name),
                  os.path.join(settings.MEDIA_ROOT, 'images', 'projects'))
-

apps/projects/models.py

@@ -19,4 +19,3 @@ class Project(models.Model):
 
     def finished(self):
         return self.end_date is not None
-

apps/projects/tests.py

@@ -2,10 +2,10 @@
 from should_dsl import should, should_not
 from apps.projects.models import Project
 
+
 class ProjectTest(TestCase):
     def test_finishing(self):
         project = Project(start_date='2011-01-01', end_date=None)
         project |should_not| be_finished
         project.end_date = '2011-01-31'
         project |should| be_finished
-

apps/projects/views.py

@@ -1,9 +1,9 @@
 from django.shortcuts import render_to_response
 from apps.projects.models import Project
 
+
 def show_all(request):
     projects = Project.objects.all()
     return render_to_response('show_all_projects.html',
-      { 'projects': projects,
-        'project_count': len(projects) })
-
+      {'projects': projects,
+        'project_count': len(projects)})

manage.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 from django.core.management import execute_manager
+
 try:
     import settings # Assumed to be in the same directory.
 except ImportError:

paths.py

@@ -1,10 +1,10 @@
 from lettuce.django import django_url
 
+
 def path_to(page_name):
     return django_url(
         {
           'the history page': '/history',
           'the projects page': '/projects',
           'the teams page': '/teams',
         }[page_name])
-

settings.py

@@ -76,4 +76,3 @@
     'apps.teams',
     'apps.projects',
 )
-

settings_test.py

@@ -10,4 +10,3 @@
         'PORT': '',
         }
 }
-

terrain.py

@@ -7,36 +7,44 @@
 from lettuce import after, before, world
 from web_steps import *
 
+
 @before.all
 def set_browser():
     enable_selenium_specs_to_run_offline()
     world.browser = Browser()
 
+
 def enable_selenium_specs_to_run_offline():
     prefs = FirefoxProfile._get_webdriver_prefs()
     prefs['network.manage-offline-status'] = 'false'
+
     @staticmethod
     def prefs_func():
         return prefs
     FirefoxProfile._get_webdriver_prefs = prefs_func
 
+
 @before.each_scenario
 def clean_database(scenario):
     clean_data()
     create_admin()
     clean_images()
 
+
 def clean_data():
-   call_command('flush', interactive=False)
-   call_command('loaddata', 'all')
+    call_command('flush', interactive=False)
+    call_command('loaddata', 'all')
+
 
 def create_admin():
     User.objects.create_superuser('admin', '[email protected]', 'admin')
 
+
 def clean_images():
     images_dir = os.path.join(settings.MEDIA_ROOT, 'images')
     clean_all(images_dir)
 
+
 def clean_all(directory):
     for file_name in os.listdir(directory):
         absname = os.path.join(directory, file_name)
@@ -45,8 +53,8 @@ def clean_all(directory):
         elif not file_name.startswith('.'):
             os.unlink(absname)
 
+
 @after.all
 def finish_him(total_result):
     world.browser.quit()
     clean_images()
-

urls.py

@@ -17,4 +17,3 @@
 
     (r'^site_media/(.*)$', 'django.views.static.serve', {"document_root": settings.MEDIA_ROOT}),
 )
-

web_steps.py

@@ -2,30 +2,35 @@
 from should_dsl import should
 from paths import path_to
 
+
 @step(r'I fill in "(.*)" with "(.*)"')
 def fill_field(step, label, value):
     world.browser.fill_in(label, value)
 
+
 @step(r'I go to "(.+)"')
 def i_go_to(step, page_name):
     world.browser.visit(path_to(page_name))
 
+
 @step(r'I press "(.*)"')
 def press_button(step, name):
     world.browser.find_by_name(name.lower()).click()
 
+
 @step(r'I should see "(.*)"')
 def i_should_see(step, content):
     world.browser.html |should| contain(content)
 
+
 @step(u'I should have "(.*)" as HTML')
 def i_should_have_as_html(step, html_output):
     # different step descriptions for intention-revealing purposes
     step.then('I should see "%s"' % html_output)
 
+
 @step(u'I should see an image called "(.*)"')
 def and_i_should_see_an_image_called_group1(step, image_name):
     images = world.browser.find_by_css_selector('img')
     found_image = [image for image in images if image['src'].endswith(image_name)]
     found_image |should| have_at_least(1).image
-