Permalink
Browse files

Merge branch 'release/0.9.2'

* release/0.9.2:
  Bumped version number and wrote release notes for 0.9.2 in preparation for release.
  Fixed an exception with JSONAttributes using DateField or DateTimeField as their field template when the stored value is None. Fixes #178.
  Updated copyright date range to end in 2012 instead of 2011.
  Added include_package_data option to setup.py to ensure MANIFEST.in is actually heeded.
  • Loading branch information...
2 parents 61b73fe + 6770bdd commit 8a772dd4761e3a4b926358d6ebf87c9fc7033ba5 @jspiros jspiros committed Feb 1, 2012
Showing with 15 additions and 9 deletions.
  1. +1 −1 LICENSE
  2. +1 −1 docs/conf.py
  3. +1 −1 docs/index.rst
  4. +4 −0 docs/releases/0.9.2.rst
  5. +1 −1 philo/__init__.py
  6. +5 −2 philo/models/fields/entities.py
  7. +2 −3 setup.py
View
@@ -1,4 +1,4 @@
-Copyright (c) 2009-2011, iThink Software.
+Copyright (c) 2009-2012, iThink Software.
Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
View
@@ -54,7 +54,7 @@
# General information about the project.
project = u'Philo'
-copyright = u'2009-2011, iThink Software'
+copyright = u'2009-2012, iThink Software'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
View
@@ -8,7 +8,7 @@
Welcome to Philo's documentation!
=================================
-Philo is a foundation for developing web content management systems. Please, read the :doc:`notes for our latest release <releases/0.9.1>`.
+Philo is a foundation for developing web content management systems. Please, read the :doc:`notes for our latest release <releases/0.9.2>`.
Prerequisites:
View
@@ -0,0 +1,4 @@
+Philo version 0.9.2 release notes
+=================================
+
+The primary focus of the 0.9.2 release was repairing the setuptools configuration so that Philo can be installed and updated reliably. In addition, a bug involving the use of :class:`DateTimeField` or :class:`DateField` as the field template for a :class:`JSONAttribute` has been fixed.
View
@@ -1 +1 @@
-VERSION = (0, 9, 1)
+VERSION = (0, 9, 2)
@@ -2,7 +2,7 @@
from itertools import tee
from django import forms
-from django.core.exceptions import FieldError
+from django.core.exceptions import FieldError, ValidationError
from django.db import models
from django.db.models.fields import NOT_PROVIDED
from django.utils.text import capfirst
@@ -193,7 +193,10 @@ def value_from_object(self, obj):
"""If the field template is a :class:`DateField` or a :class:`DateTimeField`, this will convert the default return value to a datetime instance."""
value = super(JSONAttribute, self).value_from_object(obj)
if isinstance(self.field_template, (models.DateField, models.DateTimeField)):
- value = self.field_template.to_python(value)
+ try:
+ value = self.field_template.to_python(value)
+ except ValidationError:
+ value = None
return value
def get_storage_value(self, value):
View
@@ -1,7 +1,5 @@
#!/usr/bin/env python
-
import os
-
from setuptools import setup, find_packages
@@ -17,6 +15,7 @@
maintainer = "iThink Software",
maintainer_email = "contact@ithinksw.com",
packages = find_packages(),
+ include_package_data=True,
classifiers = [
'Environment :: Web Environment',
@@ -47,4 +46,4 @@
dependency_links = [
'https://github.com/django-mptt/django-mptt/tarball/master#egg=django-mptt-dev'
]
-)
+)

0 comments on commit 8a772dd

Please sign in to comment.