diff --git a/flatblocks/management/commands/createflatblock.py b/flatblocks/management/commands/createflatblock.py
index 25d92a6..47ceabd 100644
--- a/flatblocks/management/commands/createflatblock.py
+++ b/flatblocks/management/commands/createflatblock.py
@@ -9,12 +9,13 @@ class Command(BaseCommand):
def handle(self, *args, **options):
if len(args) != 1:
- raise CommandError, "This command requires the slug of the new " \
- "flatblock as its first argument"
+ raise CommandError("This command requires the slug of the new "
+ "flatblock as its first argument")
slug = args[0]
- block = FlatBlock(header="[%s]"%slug, content="Empty flatblock",
- slug=slug)
+ block = FlatBlock(header="[{0}]".format(slug),
+ content="Empty flatblock",
+ slug=slug)
try:
block.save()
- except IntegrityError, e:
- raise CommandError, "A flatblock with this name already exists"
+ except IntegrityError:
+ raise CommandError("A flatblock with this name already exists")
diff --git a/flatblocks/management/commands/deleteflatblock.py b/flatblocks/management/commands/deleteflatblock.py
index 732d4ee..ce61173 100644
--- a/flatblocks/management/commands/deleteflatblock.py
+++ b/flatblocks/management/commands/deleteflatblock.py
@@ -8,11 +8,10 @@ class Command(BaseCommand):
def handle(self, *args, **options):
if len(args) != 1:
- raise CommandError, "This command requires the slug of the " \
- "flatblock as its first argument"
+ raise CommandError("This command requires the slug of the "
+ "flatblock as its first argument")
slug = args[0]
try:
FlatBlock.objects.get(slug=slug).delete()
- except FlatBlock.DoesNotExist, e:
- raise CommandError, "The requested flatblock doesn't exist"
-
+ except FlatBlock.DoesNotExist:
+ raise CommandError("The requested flatblock doesn't exist")
diff --git a/flatblocks/models.py b/flatblocks/models.py
index fdea5d8..8b270ea 100644
--- a/flatblocks/models.py
+++ b/flatblocks/models.py
@@ -12,13 +12,15 @@ class FlatBlock(models.Model):
title (header) which you can, for example, use in a sidebar of a website.
"""
slug = models.CharField(max_length=255, unique=True,
- verbose_name=_('Slug'),
- help_text=_("A unique name used for reference in the templates"))
+ verbose_name=_('Slug'),
+ help_text=_("A unique name used for reference in "
+ "the templates"))
header = models.CharField(blank=True, null=True, max_length=255,
- verbose_name=_('Header'),
- help_text=_("An optional header for this content"))
+ verbose_name=_('Header'),
+ help_text=_("An optional header for this "
+ "content"))
content = models.TextField(verbose_name=_('Content'), blank=True,
- null=True)
+ null=True)
# Helper attributes used if content should be evaluated in order to
# represent the original content.
diff --git a/flatblocks/settings.py b/flatblocks/settings.py
index 75f8a9e..f2a2614 100644
--- a/flatblocks/settings.py
+++ b/flatblocks/settings.py
@@ -2,4 +2,5 @@
CACHE_PREFIX = getattr(settings, 'FLATBLOCKS_CACHE_PREFIX', 'flatblocks_')
AUTOCREATE_STATIC_BLOCKS = getattr(settings,
- 'FLATBLOCKS_AUTOCREATE_STATIC_BLOCKS', False)
+ 'FLATBLOCKS_AUTOCREATE_STATIC_BLOCKS',
+ False)
diff --git a/flatblocks/templatetags/flatblock_tags.py b/flatblocks/templatetags/flatblock_tags.py
index f0762ed..2b4e643 100644
--- a/flatblocks/templatetags/flatblock_tags.py
+++ b/flatblocks/templatetags/flatblock_tags.py
@@ -56,6 +56,7 @@
FlatBlock = models.get_model('flatblocks', 'flatblock')
+
class BasicFlatBlockWrapper(object):
def prepare(self, parser, token):
"""
@@ -92,7 +93,12 @@ def prepare(self, parser, token):
if args[0] != 'using':
# block, timeout, "evaluated"
if args[1] != 'evaluated':
- raise template.TemplateSyntaxError, "%r tag with two arguments has to include the cache timeout and the evaluated flag" % (tag_name,)
+ raise template.TemplateSyntaxError("{0!r} tag with two "
+ "arguments has to "
+ "include the cache "
+ "timeout and the "
+ "evaluated flag".format(
+ tag_name))
self.cache_time = args[0]
self.evaluated = True
else:
@@ -110,7 +116,9 @@ def prepare(self, parser, token):
self.evaluated = True
self.tpl_name = args[3]
else:
- raise template.TemplateSyntaxError, "%r tag should have between 1 and 5 arguments" % (tokens[0],)
+ raise template.TemplateSyntaxError("{0!r} tag should have between "
+ "1 and 5 arguments".format(
+ tokens[0]))
# Check to see if the slug is properly double/single quoted
if not (self.slug[0] == self.slug[-1] and self.slug[0] in ('"', "'")):
self.is_variable = True
@@ -118,7 +126,8 @@ def prepare(self, parser, token):
self.slug = self.slug[1:-1]
# Clean up the template name
if self.tpl_name is not None:
- if not(self.tpl_name[0] == self.tpl_name[-1] and self.tpl_name[0] in ('"', "'")):
+ if not(self.tpl_name[0] == self.tpl_name[-1] and
+ self.tpl_name[0] in ('"', "'")):
self.tpl_is_variable = True
else:
self.tpl_name = self.tpl_name[1:-1]
@@ -128,21 +137,25 @@ def prepare(self, parser, token):
def __call__(self, parser, token):
self.prepare(parser, token)
return FlatBlockNode(self.slug, self.is_variable, self.cache_time,
- template_name=self.tpl_name,
- tpl_is_variable=self.tpl_is_variable,
- evaluated=self.evaluated)
+ template_name=self.tpl_name,
+ tpl_is_variable=self.tpl_is_variable,
+ evaluated=self.evaluated)
+
class PlainFlatBlockWrapper(BasicFlatBlockWrapper):
def __call__(self, parser, token):
self.prepare(parser, token)
- return FlatBlockNode(self.slug, self.is_variable, self.cache_time, False, evaluated=self.evaluated)
+ return FlatBlockNode(self.slug, self.is_variable, self.cache_time,
+ False, evaluated=self.evaluated)
+
do_get_flatblock = BasicFlatBlockWrapper()
do_plain_flatblock = PlainFlatBlockWrapper()
+
class FlatBlockNode(template.Node):
def __init__(self, slug, is_variable, cache_time=0, with_template=True,
- template_name=None, tpl_is_variable=False, evaluated=False):
+ template_name=None, tpl_is_variable=False, evaluated=False):
if template_name is None:
self.template_name = 'flatblocks/flatblock.html'
else:
@@ -185,17 +198,17 @@ def render(self, context):
flatblock = FlatBlock.objects.get(slug=real_slug)
else:
flatblock, _ = FlatBlock.objects.get_or_create(
- slug=real_slug,
- defaults = {'content': real_slug}
- )
+ slug=real_slug,
+ defaults={'content': real_slug}
+ )
if self.cache_time != 0:
if self.cache_time is None or self.cache_time == 'None':
- logger.debug("Caching %s for the cache's default timeout"
- % (real_slug,))
+ logger.debug("Caching {0} for the cache's default "
+ "timeout".format(real_slug))
cache.set(cache_key, flatblock)
else:
- logger.debug("Caching %s for %s seconds" % (real_slug,
- str(self.cache_time)))
+ logger.debug("Caching {0} for {1} seconds".format(
+ real_slug, str(self.cache_time)))
cache.set(cache_key, flatblock, int(self.cache_time))
else:
logger.debug("Don't cache %s" % (real_slug,))
@@ -208,7 +221,7 @@ def render(self, context):
if self.with_template:
tmpl = loader.get_template(real_template)
- new_ctx.update({'flatblock':flatblock})
+ new_ctx.update({'flatblock': flatblock})
return tmpl.render(new_ctx)
else:
return flatblock.content
diff --git a/flatblocks/tests.py b/flatblocks/tests.py
index b90fa18..467c8d5 100644
--- a/flatblocks/tests.py
+++ b/flatblocks/tests.py
@@ -13,35 +13,41 @@ class BasicTests(TestCase):
urls = 'flatblocks.urls'
def setUp(self):
- self.testblock = FlatBlock.objects.create(
- slug='block',
- header='HEADER',
- content='CONTENT'
- )
- self.admin = User.objects.create_superuser('admin', 'admin@localhost', 'adminpwd')
+ self.testblock = FlatBlock.objects.create(slug='block',
+ header='HEADER',
+ content='CONTENT'
+ )
+ self.admin = User.objects.create_superuser('admin', 'admin@localhost',
+ 'adminpwd')
def testURLConf(self):
# We have to support two different APIs here (1.1 and 1.2)
def get_tmpl(resp):
- if isinstance(resp.template, list):
- return resp.template[0]
- return resp.template
- self.assertEquals(get_tmpl(self.client.get('/edit/1/')).name, 'admin/login.html')
+ if hasattr(resp, 'templates'):
+ return resp.templates[0]
+ else:
+ if isinstance(resp.template, list):
+ return resp.template[0]
+ return resp.template
+ self.assertEqual(get_tmpl(self.client.get('/edit/1/')).name,
+ 'admin/login.html')
self.client.login(username='admin', password='adminpwd')
- self.assertEquals(get_tmpl(self.client.get('/edit/1/')).name, 'flatblocks/edit.html')
+ self.assertEqual(get_tmpl(self.client.get('/edit/1/')).name,
+ 'flatblocks/edit.html')
def testCacheReset(self):
"""
Tests if FlatBlock.save() resets the cache.
"""
- tpl = template.Template('{% load flatblock_tags %}{% flatblock "block" 60 %}')
+ tpl = template.Template(
+ '{% load flatblock_tags %}{% flatblock "block" 60 %}')
tpl.render(template.Context({}))
name = '%sblock' % settings.CACHE_PREFIX
- self.assertNotEquals(None, cache.get(name))
+ self.assertNotEqual(None, cache.get(name))
block = FlatBlock.objects.get(slug='block')
block.header = 'UPDATED'
block.save()
- self.assertEquals(None, cache.get(name))
+ self.assertEqual(None, cache.get(name))
def testSaveKwargs(self):
block = FlatBlock(slug='missing')
@@ -56,22 +62,22 @@ def testCacheRemoval(self):
"""
block = FlatBlock(slug="test", content="CONTENT")
block.save()
- tpl = template.Template('{% load flatblock_tags %}{% flatblock "test" 100 %}')
+ tpl = template.Template(
+ '{% load flatblock_tags %}{% flatblock "test" 100 %}')
# We fill the cache by rendering the block
tpl.render(template.Context({}))
cache_key = "%stest" % settings.CACHE_PREFIX
- self.assertNotEquals(None, cache.get(cache_key))
+ self.assertNotEqual(None, cache.get(cache_key))
block.delete()
- self.assertEquals(None, cache.get(cache_key))
+ self.assertEqual(None, cache.get(cache_key))
class TagTests(TestCase):
def setUp(self):
- self.testblock = FlatBlock.objects.create(
- slug='block',
- header='HEADER',
- content='CONTENT'
- )
+ self.testblock = FlatBlock.objects.create(slug='block',
+ header='HEADER',
+ content='CONTENT'
+ )
def testLoadingTaglib(self):
"""Tests if the taglib defined in this app can be loaded"""
@@ -79,126 +85,167 @@ def testLoadingTaglib(self):
tpl.render(template.Context({}))
def testExistingPlain(self):
- tpl = template.Template('{% load flatblock_tags %}{% plain_flatblock "block" %}')
+ tpl = template.Template(
+ '{% load flatblock_tags %}{% plain_flatblock "block" %}')
self.assertEqual(u'CONTENT', tpl.render(template.Context({})).strip())
def testExistingTemplate(self):
expected = """
-
HEADER
+
HEADER
-
CONTENT
+
CONTENT