Merge pull request #871 from PopAdi/pep8-code-indent

pep8 code indentation: core folder

wouso/core/__init__.py

@@ -1,16 +1,15 @@
 import warnings, logging, sys
 from functools import wraps
-
 from django.contrib import messages
 from django.contrib.auth import logout
 from django.contrib.auth.signals import user_logged_in
 from django.shortcuts import redirect
 from django.utils.translation import ugettext as _
-
 from wouso.core.config.models import BoolSetting
 
 logger = logging.getLogger('core')
 
+
 def deprecated(message):
     """ Mark function as deprecated.
 
@@ -27,6 +26,7 @@ def wrapper(*args, **kwargs):
         return wrapper
     return decorator
 
+
 def block_if_not_staff(sender, user, request, **kwargs):
     only_staff = not BoolSetting.get('login').get_value()
     if only_staff and not user.is_staff:

wouso/core/common.py

@@ -1,6 +1,7 @@
 from django.core.cache import cache
 import sys
 
+
 class App:
     """ Interface extended by Game and by Top and Qproposal Activity"""
 
@@ -78,7 +79,7 @@ def management_task(cls, datetime=lambda: datetime.now(), stdout=sys.stdout):
         """
         pass
 
-    management_task = None # Disable it by default
+    management_task = None  # Disable it by default
 
 
 class Item(object):
@@ -167,4 +168,4 @@ def get(cls, part):
         return obj
 
     def __str__(self):
-        return str(getattr(self, self.CACHE_PART))
+        return str(getattr(self, self.CACHE_PART))

wouso/core/config/admin.py

@@ -1,6 +1,7 @@
 from django.contrib import admin
 from models import Setting
 
+
 class SettingAdmin(admin.ModelAdmin):
     list_display = ('name', 'value')
 

wouso/core/config/tests.py

@@ -2,12 +2,13 @@
 from django.core.cache import cache
 from models import Setting, BoolSetting, HTMLSetting, ChoicesSetting
 
+
 class TestSettings(TestCase):
     def setUp(self):
         cache.clear()
 
     def test_setting_type(self):
-        a = BoolSetting.get('test-name') # automatically created
+        a = BoolSetting.get('test-name')  # automatically created
 
         self.assertTrue(a)
         self.assertIsInstance(a, Setting)
@@ -48,4 +49,4 @@ def test_setting_unicode(self):
         self.assertEqual(a.__unicode__(), 'test')
 
         a.set_value('e')
-        self.assertEqual(a.get_value(), 'e')
+        self.assertEqual(a.get_value(), 'e')

wouso/core/decorators.py

@@ -4,6 +4,7 @@
 import inspect
 import logging
 
+
 def staff_required(function=None, login_url=None):
     """
     Require current user to be logged in, have a profile, and be in staff group.
@@ -16,6 +17,7 @@ def staff_required(function=None, login_url=None):
         return actual_decorator(function)
     return actual_decorator
 
+
 def api_enabled_required(function=None):
 
     def _dec(function):
@@ -40,7 +42,7 @@ def _view(request, *args, **kwargs):
 def _get_cache_key(function, *args, **kwargs):
     params = inspect.getargspec(function)[0]
     cache_key = 'F-%s-' % function.__name__
-    for i,param_name in enumerate(params):
+    for i, param_name in enumerate(params):
         if i < len(args):
             value = args[i]
         else:

wouso/core/game/__init__.py

@@ -1,6 +1,7 @@
 from django.db.models import get_models
 from models import Game
 
+
 def get_games():
     """Get a list of available games. This needs to be updated each time
     a game is added."""

wouso/core/game/management/commands/wousocron.py

@@ -3,6 +3,7 @@
 from wouso.core.game import get_games
 from wouso.core.config.models import Setting
 
+
 class Command(BaseCommand):
     help = 'Wouso repetitive tasks (cron)'
 
@@ -26,4 +27,4 @@ def handle(self, *args, **options):
 
         now = datetime.now()
         Setting.get('wousocron_lastrun').set_value('%s' % now)
-        self.stdout.write('Finished at: %s\n' % now)
+        self.stdout.write('Finished at: %s\n' % now)

wouso/core/game/management/commands/wousoctl.py

@@ -22,47 +22,47 @@ class Command(BaseCommand):
     help = 'Wouso management tasks'
     option_list = DumpdataCommand.option_list + (
         make_option('--check-setup',
-            action='store_true',
-            dest='check_setup',
-            default=False,
-            help='Check the current instance for scoring, artifacts and other running requirements.'
-        ),
+                    action='store_true',
+                    dest='check_setup',
+                    default=False,
+                    help='Check the current instance for scoring, artifacts and other running requirements.'
+                    ),
         make_option('--setup',
-            action='store_true',
-            dest='setup',
-            default=False,
-            help='Setup the current instance, including a syncdb.'
-        ),
+                    action='store_true',
+                    dest='setup',
+                    default=False,
+                    help='Setup the current instance, including a syncdb.'
+                    ),
         make_option('--noinput',
-            action='store_true',
-            dest='noinput',
-            default=False,
-            help='Don\'t ask for input'
-        ),
+                    action='store_true',
+                    dest='noinput',
+                    default=False,
+                    help='Don\'t ask for input'
+                    ),
         make_option('--load',
-            action='store',
-            dest='load',
-            default=False,
-            help='Load game configuration.'
-        ),
+                    action='store',
+                    dest='load',
+                    default=False,
+                    help='Load game configuration.'
+                    ),
         make_option('--save',
-            action='store',
-            dest='save',
-            default=False,
-            help='Save game configuration to a file.'
-        ),
+                    action='store',
+                    dest='save',
+                    default=False,
+                    help='Save game configuration to a file.'
+                    ),
         make_option('--reset',
-            action='store_true',
-            dest='reset',
-            default=False,
-            help='Reset scoring and artifacts'
-        ),
+                    action='store_true',
+                    dest='reset',
+                    default=False,
+                    help='Reset scoring and artifacts'
+                    ),
         make_option('--update-display',
-            action='store_true',
-            dest='updatedisplay',
-            default=False,
-            help='Update display names according to config'
-        ),
+                    action='store_true',
+                    dest='updatedisplay',
+                    default=False,
+                    help='Update display names according to config'
+                    ),
     )
 
     def handle(self, *args, **options):

wouso/core/game/tests.py

@@ -2,10 +2,12 @@
 from django.test import TestCase
 from models import Game
 
+
 class TestGame(Game):
     class Meta:
         proxy = True
 
+
 class TestGameModule(TestCase):
     def test_game_instance(self):
         gi = TestGame.get_instance()

wouso/core/god/god.py

@@ -118,7 +118,8 @@ def get_all_modifiers(self):
               'curse',  # prevent cast of positive spells, or cure and dispell
               'immunity',  # prevent cast of any spells, or cure and dispell
               'top-disguise',  # allow showing another number of points in top
-        ]
+            ]
+
         for g in get_games():
             ms.extend(g.get_modifiers())
 

wouso/core/god/tests.py

@@ -1,13 +1,10 @@
 import unittest
-
 from django.contrib.auth.models import User
 from django.test import TestCase
-
 from wouso.core.config.models import IntegerListSetting
 from wouso.core.magic.models import NoArtifactLevel
 from wouso.core.user.models import PlayerGroup, Race
 from wouso.games.challenge.models import ChallengeGame
-
 from . import get_god
 
 
@@ -67,7 +64,6 @@ def test_users_are_elligible_for_challenge(self):
         self.player.save()
         self.assertTrue(god.user_is_eligible(self.player, ChallengeGame))
 
-
     def test_user_can_interact_with_users(self):
         user2 = User.objects.create(username='testgod2')
         player2 = user2.get_profile()
@@ -76,7 +72,6 @@ def test_user_can_interact_with_users(self):
 
         self.assertTrue(god.user_can_interact_with(self.player, player2))
 
-
     @unittest.expectedFailure
     def test_user_can_interact_with_unaffiliated(self):
         user2 = User.objects.create(username='testgod2')
@@ -87,4 +82,3 @@ def test_user_can_interact_with_unaffiliated(self):
         god = get_god()
 
         self.assertFalse(god.user_can_interact_with(self.player, player2))
-

wouso/core/magic/admin.py

@@ -1,6 +1,7 @@
 from django.contrib import admin
 from models import Artifact, ArtifactGroup, Spell
 
+
 class SpellAdmin(admin.ModelAdmin):
     list_display = ('name', 'title', 'type', 'percents', 'price', 'level_required', 'available', 'mass')
 admin.site.register(Artifact)

wouso/core/magic/default_setup.py

@@ -1,5 +1,6 @@
 import sys
-sys.path.append('..');sys.path.append('.')
+sys.path.append('..')
+sys.path.append('.')
 
 from django.core.management import setup_environ
 import settings
@@ -9,6 +10,7 @@
 from wouso.core.magic.models import *
 from wouso.core.user.models import Player
 
+
 if __name__ == '__main__':
     print 'Setting up the Artifacts...',
 
@@ -23,8 +25,8 @@
     # Create a default group
     default_group, new = ArtifactGroup.objects.get_or_create(name='Default')
     for i in range(7):
-        name='level-%d' % (i + 1)
-        title='Level %d' % (i + 1)
+        name = 'level-%d' % (i + 1)
+        title = 'Level %d' % (i + 1)
         for g in (default_group, ca, cb, cc):
             Artifact.objects.get_or_create(
                 name=name,

wouso/core/magic/manager.py

@@ -6,8 +6,14 @@
 from wouso.core.god import God
 from wouso.core.magic.models import PlayerSpellDue, PlayerSpellAmount, PlayerArtifactAmount
 
-class MagicException(Exception): pass
-class InsufficientAmount(MagicException): pass
+
+class MagicException(Exception):
+    pass
+
+
+class InsufficientAmount(MagicException):
+    pass
+
 
 class MagicManager(object):
     def __init__(self, player):
@@ -41,7 +47,7 @@ def spell_amounts(self):
 
     def filter_players_by_spell(self, players, spell):
         if spell.type == 's':
-            return [ self.player ]
+            return [self.player]
         elif spell.type == 'n':
             try:
                 players.remove(self.player)

wouso/core/magic/models.py

@@ -20,8 +20,8 @@ class Meta:
         abstract = True
 
     name = models.CharField(max_length=100)
-    title = models.CharField(max_length=100) # Maturator
-    description = models.TextField(max_length=2000, null=True, blank=True) # Extended description
+    title = models.CharField(max_length=100)  # Maturator
+    description = models.TextField(max_length=2000, null=True, blank=True)  # Extended description
     image = models.ImageField(upload_to=settings.MEDIA_ARTIFACTS_DIR, blank=True, null=True)
 
     percents = models.IntegerField(default=100)
@@ -34,7 +34,7 @@ def path(self):
             return os.path.join(settings.MEDIA_ARTIFACTS_URL, os.path.basename(str(self.image)))
 
         if hasattr(self, 'group'):
-            return ("%s-%s" %  (self.group if self.group else 'default', self.name)).lower()
+            return ("%s-%s" % (self.group if self.group else 'default', self.name)).lower()
 
         return self.name.lower()
 
@@ -48,6 +48,7 @@ class ArtifactGroup(CachedItem, models.Model):
     def __unicode__(self):
         return self.name
 
+
 class Artifact(CachedItem, Modifier):
     """ The generic artifact model. This should contain the name (identifier) and group,
     but also personalization such as: image (icon) and title
@@ -86,12 +87,12 @@ class Spell(Modifier):
     TYPES = (('o', 'neutral'), ('p', 'positive'), ('n', 'negative'), ('s', 'self'))
 
     type = models.CharField(max_length=1, choices=TYPES, default='o')
-    due_days = models.IntegerField(default=5) # How many days may the spell be active
-    mass = models.BooleanField(default=False) # Apply spell on many players at once
+    due_days = models.IntegerField(default=5)  # How many days may the spell be active
+    mass = models.BooleanField(default=False)  # Apply spell on many players at once
 
-    price = models.FloatField(default=10)       # Spell price in gold.
-    level_required = models.IntegerField(default=0) # Level required for buying this spell
-    available = models.BooleanField(default=True)   # Spell can be bought in Bazaar
+    price = models.FloatField(default=10)  # Spell price in gold.
+    level_required = models.IntegerField(default=0)  # Level required for buying this spell
+    available = models.BooleanField(default=True)  # Spell can be bought in Bazaar
 
     @property
     def group(self):
@@ -229,7 +230,7 @@ class Meta:
     source = models.ForeignKey('user.Player', related_name='spell_source')
     due = models.DateTimeField()
 
-    seen = models.BooleanField(default=False, blank=True) # if the target have seen it
+    seen = models.BooleanField(default=False, blank=True)  # if the target have seen it
 
     @staticmethod
     def get_expired(date):

wouso/core/magic/templatetags/__init__.py

@@ -1 +0,0 @@
-