Merge remote branch 'origin/master'

taggit/forms.py

@@ -5,7 +5,7 @@ from taggit.utils import parse_tags
 
 
 class TagWidget(forms.TextInput):
 class TagWidget(forms.TextInput):
     def render(self, name, value, attrs=None):
     def render(self, name, value, attrs=None):
-        if not isinstance(value, basestring):
+        if value is not None and not isinstance(value, basestring):
             value = ", ".join(o.tag.name for o in value.select_related("tag"))
             value = ", ".join(o.tag.name for o in value.select_related("tag"))
         return super(TagWidget, self).render(name, value, attrs)
         return super(TagWidget, self).render(name, value, attrs)