@@ -11,7 +11,7 @@ eggs = [django] recipe = djangorecipe -version = 1.0.2 +version = 1.1 test = flatblocks project = test_project settings = settings buildout.cfg @@ -1,7 +0,0 @@ -VERSION = (0, 3, 2, 'final') - -def get_version(): - v = "%d.%d.%d" % VERSION[:3] - if VERSION[3] != 'final': - v = "%s%s%d" % (v, VERSION[3], VERSION[4]) - return v flatblocks/__init__.py @@ -22,8 +22,8 @@ class FlatBlock(models.Model): def __unicode__(self): return u"%s" % (self.slug,) - def save(self): - super(FlatBlock, self).save() + def save(self, *args, **kwargs): + super(FlatBlock, self).save(*args, **kwargs) # Now also invalidate the cache used in the templatetag cache.delete('%s%s' % (CACHE_PREFIX, self.slug, )) flatblocks/models.py @@ -4,6 +4,7 @@ from django import template from django.test import TestCase from django.core.cache import cache from django.contrib.auth.models import User +from django import db from flatblocks import models from flatblocks.settings import CACHE_PREFIX @@ -38,6 +39,13 @@ class BasicTests(TestCase): block.save() self.assertEquals(None, cache.get(name)) + def testSaveKwargs(self): + block = models.FlatBlock() + block.slug = 'missing' + self.assertRaises(ValueError, block.save, force_update=True) + block = models.FlatBlock.objects.get(slug='block') + self.assertRaises(db.IntegrityError, block.save, force_insert=True) + def tearDown(self): self.testblock.delete() flatblocks/tests.py @@ -5,11 +5,9 @@ except: use_setuptools() from setuptools import setup, find_packages -from flatblocks import get_version - setup( name = 'django-flatblocks', - version = get_version(), + version = '0.3.3', description = 'django-flatblocks acts like django.contrib.flatpages but ' 'for parts of a page; like an editable help box you want ' 'show alongside the main content.', setup.py 588d49c69e290ba7429559c64105102f88fb6fcd Horst Gutmann zerok@zerokspot.com http://github.com/zerok/django-flatblocks/commit/77c310727d5ec5a0f69cdeda2b71bea8613503f0 77c310727d5ec5a0f69cdeda2b71bea8613503f0 2009-09-26T08:54:35-07:00 2009-09-26T08:54:35-07:00 FlatBlock.save should also accept the optional kwargs from the base model. Closes #2 7178aa8e2cc48552f508fa339ae95aa4050a5734 Horst Gutmann zerok@zerokspot.com