Don't crash when feedurl is not given

Instead, give a proper error message as intended.

diff --git a/hamnadmin/hamnadmin/register/forms.py b/hamnadmin/hamnadmin/register/forms.py
index 07ff91300e0e5abd538fea4058894e3815342d3a..5bf38e0a9cf8b08a239c089e84a6fb5d5d5b69f3 100644 (file)
--- a/hamnadmin/hamnadmin/register/forms.py
+++ b/hamnadmin/hamnadmin/register/forms.py
@@ -27,8 +27,12 @@ class BlogEditForm(forms.ModelForm):
                def _trace(msg):
                        tracemessages.append(msg)
 
+               if not self.cleaned_data.has_key('feedurl'):
+                       # No feedurl present means error already thrown
+                       return self.cleaned_data
+
                # Create a fake instance to pass down. We'll just throw it away
-               feedobj = Blog(feedurl=self.cleaned_data['feedurl'], authorfilter=self.cleaned_data['authorfilter'])
+               feedobj = Blog(feedurl=self.cleaned_data.get('feedurl', None), authorfilter=self.cleaned_data['authorfilter'])
                fetcher = FeedFetcher(feedobj, _trace, False)
                try:
                        entries = list(fetcher.parse())